[PATCH] drm/i915: Wait for vblank between disabling a sprite and unpinning the fb

[PATCH] drm/i915: Wait for vblank between disabling a sprite and unpinning the fb

[ville.syrjala]

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

When disabling a sprite, wait for the sprite to stop fetching data
from memory before unpinning the fb.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 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 = NULL;
-- 
1.8.1.5

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Wait for vblank between disabling a sprite and unpinning the fb

[Jesse Barnes]

On Wed, 27 Mar 2013 17:49:13 +0200
ville.syrjala@linux.intel.com wrote:

> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> When disabling a sprite, wait for the sprite to stop fetching data
> from memory before unpinning the fb.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
>  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 = NULL;

Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>

-- 
Jesse Barnes, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915: Wait for vblank between disabling a sprite and unpinning the fb

[Daniel Vetter]

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älä <ville.syrjala@linux.intel.com>
> > 
> > When disabling a sprite, wait for the sprite to stop fetching data
> > from memory before unpinning the fb.
> > 
> > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> > ---
> >  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 = NULL;
> 
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch