drm/i915: Rename PLANE_CUS_CTL Y plane bits

Rename the PLANE_CUS_CTL Y plane selection bits to actually
say "Y plane".

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211201152552.7821-6-ville.syrjala@linux.intel.com
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 4e17f82739496f7bcd008a3b34f99911f27a13e6..514e7a328676cdbb6584451b6771c9f7e6856457 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5167,13 +5167,13 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
 
                if (icl_is_hdr_plane(dev_priv, plane->id)) {
                        if (linked->id == PLANE_SPRITE5)
-                               plane_state->cus_ctl |= PLANE_CUS_PLANE_7;
+                               plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_7_ICL;
                        else if (linked->id == PLANE_SPRITE4)
-                               plane_state->cus_ctl |= PLANE_CUS_PLANE_6;
+                               plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_6_ICL;
                        else if (linked->id == PLANE_SPRITE3)
-                               plane_state->cus_ctl |= PLANE_CUS_PLANE_5_RKL;
+                               plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_5_RKL;
                        else if (linked->id == PLANE_SPRITE2)
-                               plane_state->cus_ctl |= PLANE_CUS_PLANE_4_RKL;
+                               plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_4_RKL;
                        else
                                MISSING_CASE(linked->id);
                }

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 7498abb0c966ae79bf5b32106f91cba24176c952..b0f5865482a0535bf90a605145c7b2b5b9be4e45 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -7254,10 +7254,10 @@ enum {
 #define _PLANE_CUS_CTL_1_A                     0x701c8
 #define _PLANE_CUS_CTL_2_A                     0x702c8
 #define  PLANE_CUS_ENABLE                      (1 << 31)
-#define  PLANE_CUS_PLANE_4_RKL                 (0 << 30)
-#define  PLANE_CUS_PLANE_5_RKL                 (1 << 30)
-#define  PLANE_CUS_PLANE_6                     (0 << 30)
-#define  PLANE_CUS_PLANE_7                     (1 << 30)
+#define  PLANE_CUS_Y_PLANE_4_RKL               (0 << 30)
+#define  PLANE_CUS_Y_PLANE_5_RKL               (1 << 30)
+#define  PLANE_CUS_Y_PLANE_6_ICL               (0 << 30)
+#define  PLANE_CUS_Y_PLANE_7_ICL               (1 << 30)
 #define  PLANE_CUS_HPHASE_SIGN_NEGATIVE                (1 << 19)
 #define  PLANE_CUS_HPHASE_0                    (0 << 16)
 #define  PLANE_CUS_HPHASE_0_25                 (1 << 16)