[Intel-gfx] [PATCH] drm/i915: Track the primary plane correctly when reassigning planes

[Paul Bolle]

On Mon, 2014-07-14 at 19:39 +0200, Daniel Vetter wrote:
> commit 98ec77397a5c68ce753dc283aaa6f4742328bcdd
> Author: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Date:   Wed Apr 30 17:43:01 2014 +0300
> 
>     drm/i915: Make primary_enabled match the actual hardware state
> 
> introduced more accurate tracking of the primary plane and some
> checks. It missed the plane->pipe reassignement code for gen2/3
> though, which the checks caught and resulted in WARNING backtraces.
> 
> Since we only use this path if the plane is on and on the wrong pipe
> we can just always set the tracking bit to "enabled".
> 
> Reported-and-tested-by: Paul Bolle <pebolle at tiscali.nl>

Maybe that should be something like:
    Reported-bisected-and-tested-by: Paul Bolle <pebolle at tiscali.nl>

> Cc: Paul Bolle <pebolle at tiscali.nl>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 82e7d57f0a8a..f0be855ddf45 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -11914,6 +11914,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc)
>  		 * ...  */
>  		plane = crtc->plane;
>  		crtc->plane = !plane;
> +		crtc->primary_enabled = true;
>  		dev_priv->display.crtc_disable(&crtc->base);
>  		crtc->plane = plane;
>  

(I don't do smilies. This is a joke!)


Paul Bolle