From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915: Wait for vblank between disabling a sprite and unpinning the fb Date: Wed, 27 Mar 2013 17:48:33 +0100 Message-ID: <20130327164833.GD2228@phenom.ffwll.local> References: <1364399353-24486-1-git-send-email-ville.syrjala@linux.intel.com> <20130327092903.1fe30906@jbarnes-desktop> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f47.google.com (mail-ee0-f47.google.com [74.125.83.47]) by gabe.freedesktop.org (Postfix) with ESMTP id B536EE642F for ; Wed, 27 Mar 2013 09:45:44 -0700 (PDT) Received: by mail-ee0-f47.google.com with SMTP id t10so1419462eei.20 for ; Wed, 27 Mar 2013 09:45:44 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20130327092903.1fe30906@jbarnes-desktop> 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: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, Mar 27, 2013 at 09:29:03AM -0700, Jesse Barnes wrote: > On Wed, 27 Mar 2013 17:49:13 +0200 > ville.syrjala@linux.intel.com wrote: > = > > From: Ville Syrj=E4l=E4 > > = > > When disabling a sprite, wait for the sprite to stop fetching data > > from memory before unpinning the fb. > > = > > Signed-off-by: Ville Syrj=E4l=E4 > > --- > > drivers/gpu/drm/i915/intel_sprite.c | 2 ++ > > 1 file changed, 2 insertions(+) > > = > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915= /intel_sprite.c > > index 414d325..27df5b8 100644 > > --- a/drivers/gpu/drm/i915/intel_sprite.c > > +++ b/drivers/gpu/drm/i915/intel_sprite.c > > @@ -582,6 +582,8 @@ intel_disable_plane(struct drm_plane *plane) > > if (!intel_plane->obj) > > goto out; > > = > > + intel_wait_for_vblank(dev, intel_plane->pipe); > > + > > mutex_lock(&dev->struct_mutex); > > intel_unpin_fb_obj(intel_plane->obj); > > intel_plane->obj =3D NULL; > = > Reviewed-by: Jesse Barnes Queued for -next, thanks for the patch. -Daniel -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch