[Intel-gfx] [PATCH 2/2] drm/i915: Rename PLANE_CTL_DECOMPRESSION_ENABLE

[Ville Syrjälä]

On Tue, Aug 21, 2018 at 06:50:53PM -0700, Dhinakaran Pandiyan wrote:
> Rename PLANE_CTL_DECOMPRESSION_ENABLE to resemble the bpsec name -
> PLANE_CTL_RENDER_DECOMPRESSION_ENABLE
> 
> Suggested-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_reg.h      | 2 +-
>  drivers/gpu/drm/i915/intel_display.c | 8 ++++----
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 59d06d0055bb..a338aaa2b313 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -6515,7 +6515,7 @@ enum {
>  #define   PLANE_CTL_YUV422_UYVY			(1 << 16)
>  #define   PLANE_CTL_YUV422_YVYU			(2 << 16)
>  #define   PLANE_CTL_YUV422_VYUY			(3 << 16)
> -#define   PLANE_CTL_DECOMPRESSION_ENABLE	(1 << 15)
> +#define   PLANE_CTL_RENDER_DECOMPRESSION_ENABLE	(1 << 15)
>  #define   PLANE_CTL_TRICKLE_FEED_DISABLE	(1 << 14)
>  #define   PLANE_CTL_PLANE_GAMMA_DISABLE		(1 << 13) /* Pre-GLK */
>  #define   PLANE_CTL_TILED_MASK			(0x7 << 10)
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index b98eab113330..ea2bf9c22ade 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -3554,11 +3554,11 @@ static u32 skl_plane_ctl_tiling(uint64_t fb_modifier)
>  	case I915_FORMAT_MOD_Y_TILED:
>  		return PLANE_CTL_TILED_Y;
>  	case I915_FORMAT_MOD_Y_TILED_CCS:
> -		return PLANE_CTL_TILED_Y | PLANE_CTL_DECOMPRESSION_ENABLE;
> +		return PLANE_CTL_TILED_Y | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE;
>  	case I915_FORMAT_MOD_Yf_TILED:
>  		return PLANE_CTL_TILED_YF;
>  	case I915_FORMAT_MOD_Yf_TILED_CCS:
> -		return PLANE_CTL_TILED_YF | PLANE_CTL_DECOMPRESSION_ENABLE;
> +		return PLANE_CTL_TILED_YF | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE;
>  	default:
>  		MISSING_CASE(fb_modifier);
>  	}
> @@ -8801,13 +8801,13 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
>  		fb->modifier = I915_FORMAT_MOD_X_TILED;
>  		break;
>  	case PLANE_CTL_TILED_Y:
> -		if (val & PLANE_CTL_DECOMPRESSION_ENABLE)
> +		if (val & PLANE_CTL_RENDER_DECOMPRESSION_ENABLE)
>  			fb->modifier = I915_FORMAT_MOD_Y_TILED_CCS;
>  		else
>  			fb->modifier = I915_FORMAT_MOD_Y_TILED;
>  		break;
>  	case PLANE_CTL_TILED_YF:
> -		if (val & PLANE_CTL_DECOMPRESSION_ENABLE)
> +		if (val & PLANE_CTL_RENDER_DECOMPRESSION_ENABLE)
>  			fb->modifier = I915_FORMAT_MOD_Yf_TILED_CCS;
>  		else
>  			fb->modifier = I915_FORMAT_MOD_Yf_TILED;
> -- 
> 2.17.1

-- 
Ville Syrjälä
Intel