[Intel-gfx] [PATCH v2] drm/i915: Make g4x_fixup_plane() operational again

[Daniel Vetter]

On Fri, Jun 07, 2013 at 06:52:24PM +0300, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Don't enable the cursor until g4x_fixup_plane() had a chance to do
> cast its magic spell.
> 
> Egbert writes:
> "Today I had the chance to test this. First I tried
>  if I can still reproduce the blank with this patch
>  added when I disable my voodoo g4x_fixup_plane():
>  It turned out it still happens however very rarely
>  (like 1 out of 20 tries). When I reenabled my voodoo
>  the issue still occurred.
>  I had to switch two lines around, ie:
> 
>          intel_enable_plane(dev_priv, plane, pipe);
>          if (IS_G4X(dev))
>                  g4x_fixup_plane(dev_priv, pipe);
>  +       intel_crtc_update_cursor(crtc, true);
> 
>  to avoid the blank screen issue - which is it didn't
>  happen in ~75 tries."
> 
> v2: Add a comment to remind people of the ordering constraints
> 
> Acked-by: Egbert Eich <eich at suse.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel
> ---
>  drivers/gpu/drm/i915/intel_display.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 92fd0d4..338559b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3700,9 +3700,10 @@ static void i9xx_crtc_enable(struct drm_crtc *crtc)
>  	intel_enable_pipe(dev_priv, pipe, false);
>  	intel_enable_plane(dev_priv, plane, pipe);
>  	intel_enable_planes(crtc);
> -	intel_crtc_update_cursor(crtc, true);
> +	/* The fixup needs to happen before cursor is enabled */
>  	if (IS_G4X(dev))
>  		g4x_fixup_plane(dev_priv, pipe);
> +	intel_crtc_update_cursor(crtc, true);
>  
>  	/* Give the overlay scaler a chance to enable if it's on this pipe */
>  	intel_crtc_dpms_overlay(intel_crtc, true);
> -- 
> 1.8.1.5
> 
> _______________________________________________
> 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