From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Vivi Subject: Re: [PATCH 2/3] drm/i915: release the GTT mmaps when going into D3 Date: Fri, 13 Dec 2013 16:22:40 -0200 Message-ID: References: <1386955352-2262-1-git-send-email-przanoni@gmail.com> <1386955352-2262-2-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by gabe.freedesktop.org (Postfix) with ESMTP id 865D2FB505 for ; Fri, 13 Dec 2013 10:22:40 -0800 (PST) Received: by mail-ve0-f173.google.com with SMTP id oz11so1660027veb.32 for ; Fri, 13 Dec 2013 10:22:40 -0800 (PST) In-Reply-To: <1386955352-2262-2-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Paulo Zanoni Cc: intel-gfx , Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org When I saw this I was afraid this force could break userspace somehow, but Paulo explained me the release with pagefault mechanism. Thanks Paulo. Reviewed-by: Rodrigo Vivi On Fri, Dec 13, 2013 at 3:22 PM, Paulo Zanoni wrote: > From: Paulo Zanoni > > So we'll get a fault when someone tries to access the mmap, then we'll > wake up from D3. > > v2: - Rebase > v3: - Use gtt active/inactive > > Testcase: igt/pm_pc8/gem-mmap-gtt > Signed-off-by: Paulo Zanoni > --- > drivers/gpu/drm/i915/i915_drv.c | 2 ++ > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/i915_gem.c | 10 ++++++++++ > 3 files changed, 13 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 70590b0..23f8217 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -920,6 +920,8 @@ static int i915_runtime_suspend(struct device *device) > > DRM_DEBUG_KMS("Suspending device\n"); > > + i915_gem_release_all_mmaps(dev_priv); > + > del_timer_sync(&dev_priv->gpu_error.hangcheck_timer); > 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 fca2eb6..5e036be 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -2013,6 +2013,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 66f8133..0d7c061 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1465,6 +1465,16 @@ out: > return ret; > } > > +void i915_gem_release_all_mmaps(struct drm_i915_private *dev_priv) > +{ > + struct i915_vma *vma; > + > + list_for_each_entry(vma, &dev_priv->gtt.base.active_list, mm_list) > + i915_gem_release_mmap(vma->obj); > + list_for_each_entry(vma, &dev_priv->gtt.base.inactive_list, mm_list) > + i915_gem_release_mmap(vma->obj); > +} > + > /** > * i915_gem_release_mmap - remove physical page mappings > * @obj: obj in question > -- > 1.8.3.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Rodrigo Vivi Blog: http://blog.vivi.eng.br