On Wed, Nov 26, 2014 at 05:07:29PM +0200, ville.syrjala@xxxxxxxxxxxxxxx wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> 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.
>
> v2: Ass a locking check into intel_overlay_release_old_vid() (Daniel)
>
> Cc: Daniel Vetter <daniel@xxxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_drv.c | 2 ++
> drivers/gpu/drm/i915/intel_drv.h | 1 +
> drivers/gpu/drm/i915/intel_overlay.c | 18 ++++++++++++++++++
> 3 files changed, 21 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..2a72892 100644
> --- a/drivers/gpu/drm/i915/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/intel_overlay.c
> @@ -392,6 +392,8 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay)
> struct intel_engine_cs *ring = &dev_priv->ring[RCS];
> int ret;
>
> + WARN_ON(!mutex_is_locked(&dev->struct_mutex));
> +
> /* Only wait if there is actually an old frame to release to
> * guarantee forward progress.
> */
> @@ -422,6 +424,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;
> +
> + 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
>
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
