> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Ville
> Syrjala
> Sent: Saturday, July 18, 2020 2:44 AM
> To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> Subject: [PATCH 07/20] drm/i915: Relocate CHV CGM gamma masks
>
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> CGM_PIPE_GAMMA_RED_MASK & co. are misplaced. Move then below the
> relevant register. And while at it add the degamma counterparts.
Reviewed-by: Uma Shankar <uma.shankar@xxxxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index b9607ac3620d..428ef06b8084 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -10999,14 +10999,17 @@ enum skl_power_gate {
> #define _CGM_PIPE_A_CSC_COEFF67 (VLV_DISPLAY_BASE + 0x6790C)
> #define _CGM_PIPE_A_CSC_COEFF8 (VLV_DISPLAY_BASE + 0x67910)
> #define _CGM_PIPE_A_DEGAMMA (VLV_DISPLAY_BASE + 0x66000)
> +#define CGM_PIPE_DEGAMMA_RED_MASK REG_GENMASK(13, 0)
> +#define CGM_PIPE_DEGAMMA_GREEN_MASK REG_GENMASK(29, 16)
> +#define CGM_PIPE_DEGAMMA_BLUE_MASK REG_GENMASK(13, 0)
> #define _CGM_PIPE_A_GAMMA (VLV_DISPLAY_BASE + 0x67000)
> +#define CGM_PIPE_GAMMA_RED_MASK REG_GENMASK(9, 0)
> +#define CGM_PIPE_GAMMA_GREEN_MASK REG_GENMASK(25, 16)
> +#define CGM_PIPE_GAMMA_BLUE_MASK REG_GENMASK(9, 0)
> #define _CGM_PIPE_A_MODE (VLV_DISPLAY_BASE + 0x67A00)
> #define CGM_PIPE_MODE_GAMMA (1 << 2)
> #define CGM_PIPE_MODE_CSC (1 << 1)
> #define CGM_PIPE_MODE_DEGAMMA (1 << 0)
> -#define CGM_PIPE_GAMMA_RED_MASK REG_GENMASK(9, 0)
> -#define CGM_PIPE_GAMMA_GREEN_MASK REG_GENMASK(25, 16)
> -#define CGM_PIPE_GAMMA_BLUE_MASK REG_GENMASK(9, 0)
>
> #define _CGM_PIPE_B_CSC_COEFF01 (VLV_DISPLAY_BASE + 0x69900)
> #define _CGM_PIPE_B_CSC_COEFF23 (VLV_DISPLAY_BASE + 0x69904)
> --
> 2.26.2
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
