]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/i915: s/gen12/tgl/ in the universal plane code
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 18 Sep 2024 14:44:45 +0000 (17:44 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 9 Oct 2024 16:18:56 +0000 (19:18 +0300)
Using "gen12" in display code is not desirable. Replace
it with "tgl" to match how we talk about other platforms
in the same code.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240918144445.5716-8-ville.syrjala@linux.intel.com
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
drivers/gpu/drm/i915/display/skl_universal_plane.c

index 7bf2eee87072557301261c2bb39d767445a76b50..9557b08ca2e296317e1835c1bb4c0b213558068b 100644 (file)
@@ -2383,8 +2383,8 @@ static bool icl_plane_format_mod_supported(struct drm_plane *_plane,
        }
 }
 
-static bool gen12_plane_format_mod_supported(struct drm_plane *_plane,
-                                            u32 format, u64 modifier)
+static bool tgl_plane_format_mod_supported(struct drm_plane *_plane,
+                                          u32 format, u64 modifier)
 {
        struct intel_plane *plane = to_intel_plane(_plane);
 
@@ -2453,13 +2453,13 @@ static const struct drm_plane_funcs icl_plane_funcs = {
        .format_mod_supported = icl_plane_format_mod_supported,
 };
 
-static const struct drm_plane_funcs gen12_plane_funcs = {
+static const struct drm_plane_funcs tgl_plane_funcs = {
        .update_plane = drm_atomic_helper_update_plane,
        .disable_plane = drm_atomic_helper_disable_plane,
        .destroy = intel_plane_destroy,
        .atomic_duplicate_state = intel_plane_duplicate_state,
        .atomic_destroy_state = intel_plane_destroy_state,
-       .format_mod_supported = gen12_plane_format_mod_supported,
+       .format_mod_supported = tgl_plane_format_mod_supported,
 };
 
 static void
@@ -2501,8 +2501,8 @@ static bool skl_plane_has_rc_ccs(struct drm_i915_private *i915,
                (plane_id == PLANE_1 || plane_id == PLANE_2);
 }
 
-static bool gen12_plane_has_mc_ccs(struct drm_i915_private *i915,
-                                  enum plane_id plane_id)
+static bool tgl_plane_has_mc_ccs(struct drm_i915_private *i915,
+                                enum plane_id plane_id)
 {
        if (DISPLAY_VER(i915) < 12)
                return false;
@@ -2540,7 +2540,7 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
                        caps |= INTEL_PLANE_CAP_CCS_RC_CC;
        }
 
-       if (gen12_plane_has_mc_ccs(i915, plane_id))
+       if (tgl_plane_has_mc_ccs(i915, plane_id))
                caps |= INTEL_PLANE_CAP_CCS_MC;
 
        if (DISPLAY_VER(i915) >= 14 && IS_DGFX(i915))
@@ -2631,7 +2631,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
                                                plane_id, &num_formats);
 
        if (DISPLAY_VER(dev_priv) >= 12)
-               plane_funcs = &gen12_plane_funcs;
+               plane_funcs = &tgl_plane_funcs;
        else if (DISPLAY_VER(dev_priv) == 11)
                plane_funcs = &icl_plane_funcs;
        else