From mboxrd@z Thu Jan 1 00:00:00 1970 From: Keith Packard 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 10:09:53 -0700 Message-ID: References: <1302771827-26112-1-git-send-email-chris@chris-wilson.co.uk> <1302771827-26112-8-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0689451106==" Return-path: Received: from keithp.com (home.keithp.com [63.227.221.253]) by gabe.freedesktop.org (Postfix) with ESMTP id 645BA9E92C for ; Wed, 4 May 2011 10:09:57 -0700 (PDT) In-Reply-To: <1302771827-26112-8-git-send-email-chris@chris-wilson.co.uk> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Chris Wilson , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============0689451106== Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" --=-=-= Content-Transfer-Encoding: quoted-printable On Thu, 14 Apr 2011 10:03:41 +0100, Chris Wilson = 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 *c= rtc, > goto fail_locked; > } >=20=20 > - ret =3D i915_gem_object_set_to_gtt_domain(obj, 0); > + ret =3D 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_ov= erlay *overlay, > if (ret !=3D 0) > return ret; >=20=20 > - ret =3D i915_gem_object_set_to_gtt_domain(new_bo, 0); > + ret =3D 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? =2D-=20 keith.packard@intel.com --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQFNwYhiQp8BWwlsTdMRAq2jAJ9hxBXO5zkPmxaTicKbtnC00OlI3ACfbd60 SDpCpFR5lwessV0w88dyEig= =A5jB -----END PGP SIGNATURE----- --=-=-=-- --===============0689451106== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============0689451106==--