From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 12/19] drm/i915: release the GTT mmaps when going into D3
Date: Thu, 21 Nov 2013 13:47:26 -0200 [thread overview]
Message-ID: <1385048853-1579-13-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1385048853-1579-1-git-send-email-przanoni@gmail.com>
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
So we'll get a fault when someone tries to access the mmap, then we'll
wake up from D3.
This fixes the gem-mmap-gtt subtest from pm_pc8 from intel-gpu-tools.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 2 ++
drivers/gpu/drm/i915/i915_drv.h | 1 +
drivers/gpu/drm/i915/i915_gem.c | 8 ++++++++
3 files changed, 11 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index b133836..6510483 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -912,6 +912,8 @@ static int i915_runtime_suspend(struct device *device)
DRM_DEBUG_KMS("Suspending device\n");
+ i915_gem_release_all_mmaps(dev_priv);
+
dev_priv->pm.suspended = true;
intel_opregion_notify_adapter(dev, PCI_D3cold);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 3877a68..3702746 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2003,6 +2003,7 @@ void i915_gem_object_unpin(struct drm_i915_gem_object *obj);
int __must_check i915_vma_unbind(struct i915_vma *vma);
int __must_check i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj);
int i915_gem_object_put_pages(struct drm_i915_gem_object *obj);
+void i915_gem_release_all_mmaps(struct drm_i915_private *dev_priv);
void i915_gem_release_mmap(struct drm_i915_gem_object *obj);
void i915_gem_lastclose(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 94c2a38..68fa7c7 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1465,6 +1465,14 @@ out:
return ret;
}
+void i915_gem_release_all_mmaps(struct drm_i915_private *dev_priv)
+{
+ struct drm_i915_gem_object *obj;
+
+ list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list)
+ i915_gem_release_mmap(obj);
+}
+
/**
* i915_gem_release_mmap - remove physical page mappings
* @obj: obj in question
--
1.8.3.1
next prev parent reply other threads:[~2013-11-21 15:48 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-21 15:47 [PATCH 00/19] Haswell runtime PM support + D3 Paulo Zanoni
2013-11-21 15:47 ` [PATCH 01/19] drm/i915: WARN if !HAS_PC8 when enabling/disabling PC8 Paulo Zanoni
2013-11-29 11:11 ` Rodrigo Vivi
2013-11-29 12:55 ` Paulo Zanoni
2013-11-29 13:31 ` Rodrigo Vivi
2013-11-21 15:47 ` [PATCH 02/19] drm/i915: use the correct force_wake function at the PC8 code Paulo Zanoni
2013-11-27 19:57 ` Paulo Zanoni
2013-11-29 11:14 ` [Intel-gfx] " Rodrigo Vivi
2013-11-29 13:23 ` Daniel Vetter
2013-11-21 15:47 ` [PATCH 03/19] drm/i915: get a PC8 reference when enabling the power well Paulo Zanoni
2013-11-27 19:59 ` Paulo Zanoni
2013-11-29 12:35 ` Rodrigo Vivi
2013-11-29 13:34 ` Rodrigo Vivi
2013-12-10 21:29 ` Daniel Vetter
2013-11-21 15:47 ` [PATCH 04/19] drm/i915: get/put PC8 when we get/put a CRTC Paulo Zanoni
2013-11-21 16:12 ` Chris Wilson
2013-11-27 20:01 ` Paulo Zanoni
2013-11-29 12:38 ` Rodrigo Vivi
2013-11-29 13:34 ` Rodrigo Vivi
2013-12-04 9:01 ` Daniel Vetter
2013-12-04 13:44 ` Paulo Zanoni
2013-12-04 14:07 ` Daniel Vetter
2013-12-05 13:43 ` Paulo Zanoni
2013-12-05 14:40 ` Daniel Vetter
2013-12-06 22:29 ` [PATCH] drm/i915: change CRTC assertion on LCPLL disable Paulo Zanoni
2013-12-06 22:37 ` Daniel Vetter
2013-11-21 15:47 ` [PATCH 05/19] drm/i915: add initial Runtime PM functions Paulo Zanoni
2013-11-27 20:10 ` Paulo Zanoni
2013-11-29 12:54 ` Rodrigo Vivi
2013-11-29 13:33 ` Rodrigo Vivi
2013-11-29 14:05 ` Takashi Iwai
2013-12-06 22:31 ` Paulo Zanoni
2013-12-06 22:32 ` Paulo Zanoni
2013-12-08 9:06 ` Takashi Iwai
2013-12-02 12:23 ` Imre Deak
2013-11-21 15:47 ` [PATCH 06/19] drm/i915: do adapter power state notification at runtime PM Paulo Zanoni
2013-11-21 16:14 ` Chris Wilson
2013-11-27 20:13 ` Paulo Zanoni
2013-11-29 12:56 ` Rodrigo Vivi
2013-11-29 13:33 ` Rodrigo Vivi
2013-12-06 22:34 ` Paulo Zanoni
2013-11-21 15:47 ` [PATCH 07/19] drm/i915: add runtime put/get calls at the basic places Paulo Zanoni
2013-11-21 16:07 ` Chris Wilson
2013-11-25 20:55 ` Paulo Zanoni
2013-11-25 21:21 ` Chris Wilson
2013-11-27 20:20 ` Paulo Zanoni
2013-11-29 13:03 ` Rodrigo Vivi
2013-11-29 13:32 ` Rodrigo Vivi
2013-12-10 21:49 ` Daniel Vetter
2013-12-12 20:07 ` Paulo Zanoni
2013-12-12 20:54 ` Daniel Vetter
2013-11-21 15:47 ` [PATCH 08/19] drm/i915: add some runtime PM get/put calls Paulo Zanoni
2013-11-27 20:21 ` Paulo Zanoni
2013-11-29 13:05 ` Rodrigo Vivi
2013-11-29 13:31 ` Rodrigo Vivi
2013-11-29 13:42 ` Daniel Vetter
2013-11-29 13:56 ` Paulo Zanoni
2013-11-21 15:47 ` [PATCH 09/19] drm/i915: get a runtime PM reference when the panel VDD is on Paulo Zanoni
2013-11-29 13:50 ` Rodrigo Vivi
2013-11-29 13:59 ` Paulo Zanoni
2013-11-29 14:37 ` Rodrigo Vivi
2013-12-06 22:23 ` Paulo Zanoni
2013-11-21 15:47 ` [PATCH 10/19] drm/i915: do not assert DE_PCH_EVENT_IVB enabled Paulo Zanoni
2013-11-29 14:30 ` Rodrigo Vivi
2013-12-10 21:54 ` Daniel Vetter
2013-11-21 15:47 ` [PATCH 11/19] drm/i915: disable interrupts when enabling PC8 Paulo Zanoni
2013-12-02 13:33 ` Rodrigo Vivi
2013-12-10 21:59 ` Daniel Vetter
2013-12-11 21:33 ` Paulo Zanoni
2013-11-21 15:47 ` Paulo Zanoni [this message]
2013-11-21 16:02 ` [PATCH 12/19] drm/i915: release the GTT mmaps when going into D3 Chris Wilson
2013-11-21 16:27 ` Paulo Zanoni
2013-12-10 22:03 ` Daniel Vetter
2013-11-21 15:47 ` [PATCH 13/19] drm: do not steal the display if we have a master Paulo Zanoni
2013-11-21 16:04 ` Chris Wilson
2013-11-27 20:24 ` Paulo Zanoni
2013-11-29 13:37 ` Daniel Vetter
2013-11-30 11:19 ` David Herrmann
2013-11-21 15:47 ` [PATCH 14/19] drm/i915: add runtime PM support on Haswell Paulo Zanoni
2013-12-02 13:37 ` Rodrigo Vivi
2013-12-10 22:10 ` Daniel Vetter
2013-12-10 22:06 ` Daniel Vetter
2013-11-21 15:47 ` [PATCH 15/19] drm/i915: don't enable VDD just to enable the panel Paulo Zanoni
2013-11-29 14:40 ` Rodrigo Vivi
2013-11-21 15:47 ` [PATCH 16/19] drm/i915: don't touch the VDD when disabling " Paulo Zanoni
2013-11-29 14:41 ` Rodrigo Vivi
2013-11-21 15:47 ` [PATCH 17/19] drm/i915: fix VDD override off wait Paulo Zanoni
2013-11-21 15:47 ` [PATCH 18/19] drm/i915: save some time when waiting the eDP timings Paulo Zanoni
2013-11-21 16:00 ` Chris Wilson
2013-11-25 22:17 ` Ben Widawsky
2013-11-25 23:25 ` Chris Wilson
2013-11-26 2:38 ` Ben Widawsky
2013-11-26 9:14 ` Chris Wilson
2013-11-26 15:53 ` Paulo Zanoni
2013-11-21 15:47 ` [PATCH 19/19] drm/i915: init the DP panel power seq regs earlier Paulo Zanoni
2013-12-05 15:00 ` Jani Nikula
2013-12-06 18:39 ` Paulo Zanoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1385048853-1579-13-git-send-email-przanoni@gmail.com \
--to=przanoni@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox