[Intel-gfx] [PATCH] drm/i915: Add primary plane to mask if it's visible

[Daniel Vetter]

On Tue, Sep 15, 2015 at 02:28:54PM +0200, Maarten Lankhorst wrote:
> This fixes the warnings like
> 
> "plane A assertion failure, should be disabled but not"
> 
> that on the initial modeset during boot. This can happen if
> the primary plane is enabled by the firmware, but inheriting
> it fails because the DMAR is active or for other reasons.
> 
> Reported-By: Andreas Reis <andreas.reis at gmail.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429
> Reported-and-Tested-by: Emil Renner Berthing <kernel at esmil.dk>

Tested-by: Andreas Reis <andreas.reis at gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Most likely caused by

commit 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d
Author: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Date:   Mon Jun 1 12:49:54 2015 +0200

    drm/i915: update plane state during init

which is in 4.3, so this of for Jani.
-Daniel

> ---
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ca9278be49f7..05c57e6a0e43 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15087,9 +15087,12 @@ static void readout_plane_state(struct intel_crtc *crtc,
>  
>  		plane_state = to_intel_plane_state(p->base.state);
>  
> -		if (p->base.type == DRM_PLANE_TYPE_PRIMARY)
> +		if (p->base.type == DRM_PLANE_TYPE_PRIMARY) {
>  			plane_state->visible = primary_get_hw_state(crtc);
> -		else {
> +			if (plane_state->visible)
> +				crtc->base.state->plane_mask |=
> +					1 << drm_plane_index(&p->base);
> +		} else {
>  			if (active)
>  				p->disable_plane(&p->base, &crtc->base);
>  
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch