From: Daniel Vetter <daniel@ffwll.ch>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: intel-gfx@lists.freedesktop.org, Ben Widawsky <ben@bwidawsk.net>
Subject: Re: [PATCH] drm/i915: Restore global mappings upon resume
Date: Thu, 26 Sep 2013 23:59:37 +0200 [thread overview]
Message-ID: <20130926215937.GA26592@phenom.ffwll.local> (raw)
In-Reply-To: <1380183765-5719-1-git-send-email-chris@chris-wilson.co.uk>
On Thu, Sep 26, 2013 at 09:22:45AM +0100, Chris Wilson wrote:
> commit c6916417c8575637659686ff0e4f744babf0cb4e
> Author: Ben Widawsky <ben@bwidawsk.net>
> Date: Tue Sep 24 09:58:00 2013 -0700
>
> drm/i915: Use the new vm [un]bind functions
>
> changes the interpretation of the bind routines, and in particular we
> only bind into the global GTT if we pass a flag to the routine. So upon
> resume, we need to ask for whatever we thing is bound into the global
> GTT (cursors, fences, scanouts) to be rebound or else glorious
> corruption ensues.
>
> v2.1: Clear the is-bound flags before attempting to rebind.
>
> Fixes: i-g-t/gem_suspend
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69834
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Ben Widawsky <ben@bwidawsk.net>
Merged with the aliasing clearing dropped as discussed on irc.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index e053f14..55a8d87 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -508,8 +508,14 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)
> list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) {
> struct i915_vma *vma = i915_gem_obj_to_vma(obj,
> &dev_priv->gtt.base);
> + unsigned flags = obj->has_global_gtt_mapping ? GLOBAL_BIND : 0;
> +
> i915_gem_clflush_object(obj, obj->pin_display);
> - vma->vm->bind_vma(vma, obj->cache_level, 0);
> +
> + obj->has_global_gtt_mapping = false;
> + obj->has_aliasing_ppgtt_mapping = false;
> +
> + vma->vm->bind_vma(vma, obj->cache_level, flags);
> }
>
> i915_gem_chipset_flush(dev);
> --
> 1.8.4.rc3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2013-09-26 21:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 8:22 [PATCH] drm/i915: Restore global mappings upon resume Chris Wilson
2013-09-26 16:04 ` Ben Widawsky
2013-09-26 16:16 ` Chris Wilson
2013-09-26 16:38 ` Ben Widawsky
2013-09-26 20:08 ` Chris Wilson
2013-09-26 21:59 ` Daniel Vetter [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-09-26 8:20 Chris Wilson
2013-09-26 8:04 Chris Wilson
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=20130926215937.GA26592@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=ben@bwidawsk.net \
--cc=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
/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