[Intel-gfx] [PATCH 1/3] drm/i915: Use & instead if == to check for rotations

[Daniel Vetter]

On Mon, Nov 14, 2016 at 06:53:58PM +0200, ville.syrjala at linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> 
> Using == to check for 180 degree rotation only works as long as the
> reflection bits aren't set. That will change soon enough for CHV, so
> let's stop doing things the wrong way.
> 
> v2: Drop the BIT()
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Link: http://patchwork.freedesktop.org/patch/msgid/1477077768-4274-5-git-send-email-ville.syrjala@linux.intel.com

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 8 ++++----
>  drivers/gpu/drm/i915/intel_sprite.c  | 6 +++---
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 072a0b1bc9da..16b6978662e8 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3078,7 +3078,7 @@ static void i9xx_update_primary_plane(struct drm_plane *primary,
>  		intel_crtc->dspaddr_offset =
>  			intel_compute_tile_offset(&x, &y, plane_state, 0);
>  
> -	if (rotation == DRM_ROTATE_180) {
> +	if (rotation & DRM_ROTATE_180) {
>  		dspcntr |= DISPPLANE_ROTATE_180;
>  
>  		x += (crtc_state->pipe_src_w - 1);
> @@ -3182,7 +3182,7 @@ static void ironlake_update_primary_plane(struct drm_plane *primary,
>  	intel_crtc->dspaddr_offset =
>  		intel_compute_tile_offset(&x, &y, plane_state, 0);
>  
> -	if (rotation == DRM_ROTATE_180) {
> +	if (rotation & DRM_ROTATE_180) {
>  		dspcntr |= DISPPLANE_ROTATE_180;
>  
>  		if (!IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv)) {
> @@ -10875,7 +10875,7 @@ static void i9xx_update_cursor(struct drm_crtc *crtc, u32 base,
>  		if (HAS_DDI(dev_priv))
>  			cntl |= CURSOR_PIPE_CSC_ENABLE;
>  
> -		if (plane_state->base.rotation == DRM_ROTATE_180)
> +		if (plane_state->base.rotation & DRM_ROTATE_180)
>  			cntl |= CURSOR_ROTATE_180;
>  	}
>  
> @@ -10921,7 +10921,7 @@ static void intel_crtc_update_cursor(struct drm_crtc *crtc,
>  
>  		/* ILK+ do this automagically */
>  		if (HAS_GMCH_DISPLAY(dev_priv) &&
> -		    plane_state->base.rotation == DRM_ROTATE_180) {
> +		    plane_state->base.rotation & DRM_ROTATE_180) {
>  			base += (plane_state->base.crtc_h *
>  				 plane_state->base.crtc_w - 1) * 4;
>  		}
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 04af4393db5c..37ff13b838ce 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -436,7 +436,7 @@ vlv_update_plane(struct drm_plane *dplane,
>  	intel_add_fb_offsets(&x, &y, plane_state, 0);
>  	sprsurf_offset = intel_compute_tile_offset(&x, &y, plane_state, 0);
>  
> -	if (rotation == DRM_ROTATE_180) {
> +	if (rotation & DRM_ROTATE_180) {
>  		sprctl |= SP_ROTATE_180;
>  
>  		x += src_w;
> @@ -566,7 +566,7 @@ ivb_update_plane(struct drm_plane *plane,
>  	intel_add_fb_offsets(&x, &y, plane_state, 0);
>  	sprsurf_offset = intel_compute_tile_offset(&x, &y, plane_state, 0);
>  
> -	if (rotation == DRM_ROTATE_180) {
> +	if (rotation & DRM_ROTATE_180) {
>  		sprctl |= SPRITE_ROTATE_180;
>  
>  		/* HSW and BDW does this automagically in hardware */
> @@ -700,7 +700,7 @@ ilk_update_plane(struct drm_plane *plane,
>  	intel_add_fb_offsets(&x, &y, plane_state, 0);
>  	dvssurf_offset = intel_compute_tile_offset(&x, &y, plane_state, 0);
>  
> -	if (rotation == DRM_ROTATE_180) {
> +	if (rotation & DRM_ROTATE_180) {
>  		dvscntr |= DVS_ROTATE_180;
>  
>  		x += src_w;
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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