[Intel-gfx] [PATCH 7/6] drm/i915: Deal with video overlay on GPU reset

[Daniel Vetter]

On Mon, Nov 24, 2014 at 06:28:49PM +0200, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Clear the video overlay state on GPU reset. Any pending overlay request
> in the ring has been nuked, and the display itself gets reset. So we
> pretty much lose all state here. Adjust the software state to match so
> that the next "putimage" will restore things to working order.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.c      |  2 ++
>  drivers/gpu/drm/i915/intel_drv.h     |  1 +
>  drivers/gpu/drm/i915/intel_overlay.c | 16 ++++++++++++++++
>  3 files changed, 19 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 1e9c136..71be3c9 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -838,6 +838,8 @@ int i915_reset(struct drm_device *dev)
>  		return ret;
>  	}
>  
> +	intel_overlay_reset(dev_priv);
> +
>  	/* Ok, now get things going again... */
>  
>  	/*
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index 25fdbb1..1c38c88 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1083,6 +1083,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
>  			    struct drm_file *file_priv);
>  int intel_overlay_attrs(struct drm_device *dev, void *data,
>  			struct drm_file *file_priv);
> +void intel_overlay_reset(struct drm_i915_private *dev_priv);
>  
>  
>  /* intel_panel.c */
> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
> index dc2f4f2..24501eb 100644
> --- a/drivers/gpu/drm/i915/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/intel_overlay.c
> @@ -422,6 +422,22 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay)
>  	return 0;
>  }
>  
> +void intel_overlay_reset(struct drm_i915_private *dev_priv)
> +{
> +	struct intel_overlay *overlay = dev_priv->overlay;
> +
> +	if (!overlay)
> +		return;

Some locking checks here would be nice. Since the overlay code currently
holds both dev->struct_mutex and all the modeset locks just a check for
dev->struct_mutex should be good enough. Maybe even add that to
intel_overlay_release_old_vid.
-Daniel

> +
> +	intel_overlay_release_old_vid(overlay);
> +
> +	overlay->last_flip_req = 0;
> +	overlay->old_xscale = 0;
> +	overlay->old_yscale = 0;
> +	overlay->crtc = NULL;
> +	overlay->active = false;
> +}
> +
>  struct put_image_params {
>  	int format;
>  	short dst_x;
> -- 
> 2.0.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at 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