From: Chris Wilson <chris@chris-wilson.co.uk>
To: Keith Packard <keithp@keithp.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 07/13] drm/i915: Mark the cursor and the overlay as being part of the display planes
Date: Wed, 04 May 2011 19:28:35 +0100 [thread overview]
Message-ID: <b7da2f$rbg1cb@fmsmga001.fm.intel.com> (raw)
In-Reply-To: <yunvcxq4cke.fsf@aiko.keithp.com>
On Wed, 04 May 2011 10:09:53 -0700, Keith Packard <keithp@keithp.com> wrote:
> On Thu, 14 Apr 2011 10:03:41 +0100, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -5360,7 +5360,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
> > goto fail_locked;
> > }
> >
> > - ret = i915_gem_object_set_to_gtt_domain(obj, 0);
> > + ret = i915_gem_object_set_to_display_plane(obj, NULL);
> > if (ret) {
> > DRM_ERROR("failed to move cursor bo into the GTT\n");
> > goto fail_unpin;
> > diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
> > index a670c00..e0903c5 100644
> > --- a/drivers/gpu/drm/i915/intel_overlay.c
> > +++ b/drivers/gpu/drm/i915/intel_overlay.c
> > @@ -777,7 +777,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay,
> > if (ret != 0)
> > return ret;
> >
> > - ret = i915_gem_object_set_to_gtt_domain(new_bo, 0);
> > + ret = i915_gem_object_set_to_display_plane(new_bo, NULL);
>
> set_to_display_plane has a comment stating that it is always called from
> a non - interruptible context and uses a non-interruptible flush wait as
> a result.
>
> I think we would want these new code paths to allow for interrupting the
> operation?
The comment is very stale, I believe I remove it in one of the patches.
There were some fun bugs when rebinding the scanout under an
uninterruptible modeswitch that convinced me that we had a choice between
threading the interruptible flag through the entire unbind callchain, or
to simply mark the device as uninterruptible for the duration.
The code now does the latter.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
next prev parent reply other threads:[~2011-05-04 18:28 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-14 9:03 i915 llc for -next Chris Wilson
2011-04-14 9:03 ` [PATCH 01/13] drm/i915: Rename agp_type to cache_level Chris Wilson
2011-04-14 12:39 ` Keith Packard
2011-04-14 20:57 ` [PATCH] " Chris Wilson
2011-04-14 9:03 ` [PATCH 02/13] drm/i915: Do not clflush snooped objects Chris Wilson
2011-04-14 9:03 ` [PATCH 03/13] drm/i915: Introduce i915_gem_object_finish_gpu() Chris Wilson
2011-04-14 16:01 ` Daniel Vetter
2011-04-14 9:03 ` [PATCH 04/13] drm/i915: Introduce i915_gem_object_finish_gtt() Chris Wilson
2011-04-14 16:12 ` Daniel Vetter
2011-04-14 20:20 ` Chris Wilson
2011-05-04 16:47 ` Keith Packard
2011-04-14 9:03 ` [PATCH 05/13] drm/i915/gtt: Split out i915_gem_gtt_rebind_object() Chris Wilson
2011-04-14 16:52 ` Daniel Vetter
2011-04-14 9:03 ` [PATCH 06/13] drm/i915: Add an interface to dynamically change the cache level Chris Wilson
2011-04-14 16:54 ` Daniel Vetter
2011-04-14 9:03 ` [PATCH 07/13] drm/i915: Mark the cursor and the overlay as being part of the display planes Chris Wilson
2011-05-04 17:09 ` Keith Packard
2011-05-04 18:28 ` Chris Wilson [this message]
2011-05-04 18:46 ` Keith Packard
2011-05-04 19:47 ` Chris Wilson
2011-04-14 9:03 ` [PATCH 08/13] drm/i915: Pin after setting to the display plane Chris Wilson
2011-04-14 17:34 ` Daniel Vetter
2011-04-14 21:31 ` Chris Wilson
2011-04-15 6:04 ` [PATCH 1/2] drm/i915: Combine pinning " Chris Wilson
2011-04-15 6:04 ` [PATCH 2/2] drm/i915: Use the uncached domain for the display planes Chris Wilson
2011-04-16 10:54 ` Daniel Vetter
2011-04-15 12:11 ` [PATCH 1/2] drm/i915: Combine pinning after setting to the display plane Daniel Vetter
2011-04-16 6:26 ` Chris Wilson
2011-04-16 6:27 ` [PATCH] drm/i915: Combine pinning with " Chris Wilson
2011-04-16 10:52 ` Daniel Vetter
2011-04-16 11:00 ` Chris Wilson
2011-04-14 9:03 ` [PATCH 09/13] drm/i915: Use the uncached domain for the display planes Chris Wilson
2011-04-14 9:03 ` [PATCH 10/13] drm/i915: Use the CPU domain for snooped pwrites Chris Wilson
2011-04-14 17:40 ` Daniel Vetter
2011-04-14 9:03 ` [PATCH 11/13] drm/i915: Prevent mmap access through the GTT of snooped pages Chris Wilson
2011-05-04 17:30 ` Keith Packard
2011-04-14 9:03 ` [PATCH 12/13] drm/i915: Prevent mixing of snooped and tiling modes for old chipsets Chris Wilson
2011-04-14 17:43 ` Daniel Vetter
2011-04-14 20:26 ` Chris Wilson
2011-05-04 17:32 ` Keith Packard
2011-04-14 9:03 ` [PATCH 13/13] drm/i915: Use the LLC mode on gen6 for everything but display Chris Wilson
2011-04-15 6:12 ` i915 llc for -next 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='b7da2f$rbg1cb@fmsmga001.fm.intel.com' \
--to=chris@chris-wilson.co.uk \
--cc=intel-gfx@lists.freedesktop.org \
--cc=keithp@keithp.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;
as well as URLs for NNTP newsgroup(s).