drm/i915: Add skl+ plane name aliases to enum plane_id

Using PLANE_PRIMARY + PLANE_SPRITE? on skl+ results in a bunch
of unnecessary head scratching. Add aliases using the skl+ plane
names.
And for pre-skl we only need to keep PRIMARY,SPRITE0,SPRITE1
as we only ever have 0-2 sprites per pipe on those platforms.

v2: Don't break icl_nv12_y_plane_mask() (Jani)

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240517171208.21313-1-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index 339010384b86df64ee33588ad8cd6086312ebeda..ca6dc1dc56c870eff93de8df249f205bcc9e0ab4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -310,8 +310,7 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
        crtc->num_scalers = DISPLAY_RUNTIME_INFO(dev_priv)->num_scalers[pipe];
 
        if (DISPLAY_VER(dev_priv) >= 9)
-               primary = skl_universal_plane_create(dev_priv, pipe,
-                                                    PLANE_PRIMARY);
+               primary = skl_universal_plane_create(dev_priv, pipe, PLANE_1);
        else
                primary = intel_primary_plane_create(dev_priv, pipe);
        if (IS_ERR(primary)) {
@@ -326,8 +325,7 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
                struct intel_plane *plane;
 
                if (DISPLAY_VER(dev_priv) >= 9)
-                       plane = skl_universal_plane_create(dev_priv, pipe,
-                                                          PLANE_SPRITE0 + sprite);
+                       plane = skl_universal_plane_create(dev_priv, pipe, PLANE_2 + sprite);
                else
                        plane = intel_sprite_plane_create(dev_priv, pipe, sprite);
                if (IS_ERR(plane)) {

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index cce1420fb5417f10fdce9ccad158c6da45293b8b..ee2df655b0ab930d474bb97e40302e1faefc24db 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4121,13 +4121,13 @@ static int icl_check_nv12_planes(struct intel_crtc_state *crtc_state)
                linked_state->uapi.dst = plane_state->uapi.dst;
 
                if (icl_is_hdr_plane(dev_priv, plane->id)) {
-                       if (linked->id == PLANE_SPRITE5)
+                       if (linked->id == PLANE_7)
                                plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_7_ICL;
-                       else if (linked->id == PLANE_SPRITE4)
+                       else if (linked->id == PLANE_6)
                                plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_6_ICL;
-                       else if (linked->id == PLANE_SPRITE3)
+                       else if (linked->id == PLANE_5)
                                plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_5_RKL;
-                       else if (linked->id == PLANE_SPRITE2)
+                       else if (linked->id == PLANE_4)
                                plane_state->cus_ctl |= PLANE_CUS_Y_PLANE_4_RKL;
                        else
                                MISSING_CASE(linked->id);

diff --git a/drivers/gpu/drm/i915/display/intel_display_limits.h b/drivers/gpu/drm/i915/display/intel_display_limits.h
index 5126d0b5ae5dc3045e9a7aa04f7f56f2414eb241..c4775c99dc830a9aa690116320479dd1cb9f3fe6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_limits.h
+++ b/drivers/gpu/drm/i915/display/intel_display_limits.h
@@ -60,16 +60,23 @@ enum transcoder {
  * (eg. PLANE_CTL(), PS_PLANE_SEL(), etc.) so adjust with care.
  */
 enum plane_id {
-       PLANE_PRIMARY,
-       PLANE_SPRITE0,
-       PLANE_SPRITE1,
-       PLANE_SPRITE2,
-       PLANE_SPRITE3,
-       PLANE_SPRITE4,
-       PLANE_SPRITE5,
+       /* skl+ universal plane names */
+       PLANE_1,
+       PLANE_2,
+       PLANE_3,
+       PLANE_4,
+       PLANE_5,
+       PLANE_6,
+       PLANE_7,
+
        PLANE_CURSOR,
 
        I915_MAX_PLANES,
+
+       /* pre-skl plane names */
+       PLANE_PRIMARY = PLANE_1,
+       PLANE_SPRITE0,
+       PLANE_SPRITE1,
 };
 
 enum port {

diff --git a/drivers/gpu/drm/i915/display/intel_sprite_uapi.c b/drivers/gpu/drm/i915/display/intel_sprite_uapi.c
index a76b48ebc2d31e437ff73869456681f9ffe6f8be..4853c480600426490d3c4ea0465f29441d64a53c 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_sprite_uapi.c
+++ b/drivers/gpu/drm/i915/display/intel_sprite_uapi.c
@@ -74,7 +74,7 @@ int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data,
         * pipe simultaneously.
         */
        if (DISPLAY_VER(dev_priv) >= 9 &&
-           to_intel_plane(plane)->id >= PLANE_SPRITE1 &&
+           to_intel_plane(plane)->id >= PLANE_3 &&
            set->flags & I915_SET_COLORKEY_DESTINATION)
                return -EINVAL;
 

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 32d10e62b2b9adf14934f38e532f98a40e21838e..d99fec8e5233bc4a64b6df438e583bf16dcff3e4 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -238,9 +238,9 @@ int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)
 static u8 icl_nv12_y_plane_mask(struct drm_i915_private *i915)
 {
        if (DISPLAY_VER(i915) >= 13 || HAS_D12_PLANE_MINIMIZATION(i915))
-               return BIT(PLANE_SPRITE2) | BIT(PLANE_SPRITE3);
+               return BIT(PLANE_4) | BIT(PLANE_5);
        else
-               return BIT(PLANE_SPRITE4) | BIT(PLANE_SPRITE5);
+               return BIT(PLANE_6) | BIT(PLANE_7);
 }
 
 bool icl_is_nv12_y_plane(struct drm_i915_private *dev_priv,
@@ -252,7 +252,7 @@ bool icl_is_nv12_y_plane(struct drm_i915_private *dev_priv,
 
 u8 icl_hdr_plane_mask(void)
 {
-       return BIT(PLANE_PRIMARY) | BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
+       return BIT(PLANE_1) | BIT(PLANE_2) | BIT(PLANE_3);
 }
 
 bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, enum plane_id plane_id)
@@ -2099,7 +2099,7 @@ static bool skl_plane_has_fbc(struct drm_i915_private *i915,
        if (DISPLAY_VER(i915) >= 20)
                return icl_is_hdr_plane(i915, plane_id);
        else
-               return plane_id == PLANE_PRIMARY;
+               return plane_id == PLANE_1;
 }
 
 static struct intel_fbc *skl_plane_fbc(struct drm_i915_private *dev_priv,
@@ -2123,7 +2123,7 @@ static bool skl_plane_has_planar(struct drm_i915_private *dev_priv,
        if (DISPLAY_VER(dev_priv) == 9 && pipe == PIPE_C)
                return false;
 
-       if (plane_id != PLANE_PRIMARY && plane_id != PLANE_SPRITE0)
+       if (plane_id != PLANE_1 && plane_id != PLANE_2)
                return false;
 
        return true;
@@ -2331,8 +2331,7 @@ static bool skl_plane_has_rc_ccs(struct drm_i915_private *i915,
                return pipe != PIPE_C;
 
        return pipe != PIPE_C &&
-               (plane_id == PLANE_PRIMARY ||
-                plane_id == PLANE_SPRITE0);
+               (plane_id == PLANE_1 || plane_id == PLANE_2);
 }
 
 static bool gen12_plane_has_mc_ccs(struct drm_i915_private *i915,
@@ -2350,7 +2349,7 @@ static bool gen12_plane_has_mc_ccs(struct drm_i915_private *i915,
        if (IS_ALDERLAKE_P(i915) && IS_DISPLAY_STEP(i915, STEP_A0, STEP_B0))
                return false;
 
-       return plane_id < PLANE_SPRITE4;
+       return plane_id < PLANE_6;
 }
 
 static u8 skl_get_plane_caps(struct drm_i915_private *i915,
@@ -2439,7 +2438,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
        plane->get_hw_state = skl_plane_get_hw_state;
        plane->check_plane = skl_plane_check;
 
-       if (plane_id == PLANE_PRIMARY) {
+       if (plane_id == PLANE_1) {
                plane->need_async_flip_toggle_wa = IS_DISPLAY_VER(dev_priv, 9, 10);
                plane->async_flip = skl_plane_async_flip;
                plane->enable_flip_done = skl_plane_enable_flip_done;
@@ -2461,7 +2460,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
        else
                plane_funcs = &skl_plane_funcs;
 
-       if (plane_id == PLANE_PRIMARY)
+       if (plane_id == PLANE_1)
                plane_type = DRM_PLANE_TYPE_PRIMARY;
        else
                plane_type = DRM_PLANE_TYPE_OVERLAY;