Skip to content

Commit 87aaea1

Browse files
committed
drm/i915: s/gen12/tgl/ in the universal plane code
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ä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Juha-Pekka Heikkila <[email protected]>
1 parent e6b72ba commit 87aaea1

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

drivers/gpu/drm/i915/display/skl_universal_plane.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2383,8 +2383,8 @@ static bool icl_plane_format_mod_supported(struct drm_plane *_plane,
23832383
}
23842384
}
23852385

2386-
static bool gen12_plane_format_mod_supported(struct drm_plane *_plane,
2387-
u32 format, u64 modifier)
2386+
static bool tgl_plane_format_mod_supported(struct drm_plane *_plane,
2387+
u32 format, u64 modifier)
23882388
{
23892389
struct intel_plane *plane = to_intel_plane(_plane);
23902390

@@ -2453,13 +2453,13 @@ static const struct drm_plane_funcs icl_plane_funcs = {
24532453
.format_mod_supported = icl_plane_format_mod_supported,
24542454
};
24552455

2456-
static const struct drm_plane_funcs gen12_plane_funcs = {
2456+
static const struct drm_plane_funcs tgl_plane_funcs = {
24572457
.update_plane = drm_atomic_helper_update_plane,
24582458
.disable_plane = drm_atomic_helper_disable_plane,
24592459
.destroy = intel_plane_destroy,
24602460
.atomic_duplicate_state = intel_plane_duplicate_state,
24612461
.atomic_destroy_state = intel_plane_destroy_state,
2462-
.format_mod_supported = gen12_plane_format_mod_supported,
2462+
.format_mod_supported = tgl_plane_format_mod_supported,
24632463
};
24642464

24652465
static void
@@ -2501,8 +2501,8 @@ static bool skl_plane_has_rc_ccs(struct drm_i915_private *i915,
25012501
(plane_id == PLANE_1 || plane_id == PLANE_2);
25022502
}
25032503

2504-
static bool gen12_plane_has_mc_ccs(struct drm_i915_private *i915,
2505-
enum plane_id plane_id)
2504+
static bool tgl_plane_has_mc_ccs(struct drm_i915_private *i915,
2505+
enum plane_id plane_id)
25062506
{
25072507
if (DISPLAY_VER(i915) < 12)
25082508
return false;
@@ -2540,7 +2540,7 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
25402540
caps |= INTEL_PLANE_CAP_CCS_RC_CC;
25412541
}
25422542

2543-
if (gen12_plane_has_mc_ccs(i915, plane_id))
2543+
if (tgl_plane_has_mc_ccs(i915, plane_id))
25442544
caps |= INTEL_PLANE_CAP_CCS_MC;
25452545

25462546
if (DISPLAY_VER(i915) >= 14 && IS_DGFX(i915))
@@ -2631,7 +2631,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
26312631
plane_id, &num_formats);
26322632

26332633
if (DISPLAY_VER(dev_priv) >= 12)
2634-
plane_funcs = &gen12_plane_funcs;
2634+
plane_funcs = &tgl_plane_funcs;
26352635
else if (DISPLAY_VER(dev_priv) == 11)
26362636
plane_funcs = &icl_plane_funcs;
26372637
else

0 commit comments

Comments
 (0)