[Intel-gfx] [PATCH 3/3] drm/i915: Don't set cursor rotate bits when cursor is disabled

[Daniel Vetter]

On Wed, Jun 24, 2015 at 09:59:36PM +0300, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Let's keep the cursor control register at 0 when the cursor is disabled.
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

All merged, with the slight naming bikeshed we discussed on irc squashed
into patch 1.

Thanks, Daniel

> ---
>  drivers/gpu/drm/i915/intel_display.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index cd8fa05..29c584c 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9896,10 +9896,10 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base)
>  
>  		if (IS_HASWELL(dev) || IS_BROADWELL(dev))
>  			cntl |= CURSOR_PIPE_CSC_ENABLE;
> -	}
>  
> -	if (crtc->cursor->state->rotation == BIT(DRM_ROTATE_180))
> -		cntl |= CURSOR_ROTATE_180;
> +		if (crtc->cursor->state->rotation == BIT(DRM_ROTATE_180))
> +			cntl |= CURSOR_ROTATE_180;
> +	}
>  
>  	if (intel_crtc->cursor_cntl != cntl) {
>  		I915_WRITE(CURCNTR(pipe), cntl);
> -- 
> 2.3.6
> 
> _______________________________________________
> 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