diff mbox series

[7/7] drm/i915: s/gen12/tgl/ in the universal plane code

Message ID 20240918144445.5716-8-ville.syrjala@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: 10bpc/fp16 + CCS support | expand

Commit Message

Ville Syrjälä Sept. 18, 2024, 2:44 p.m. UTC 
From: Ville Syrjälä <ville.syrjala@linux.intel.com>

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>
---
 .../gpu/drm/i915/display/skl_universal_plane.c   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Juha-Pekka Heikkila Oct. 4, 2024, 1:54 p.m. UTC | #1 
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>

On 18.9.2024 17.44, Ville Syrjala wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> 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>
> ---
>   .../gpu/drm/i915/display/skl_universal_plane.c   | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index f56d679b0143..a82297fb4213 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -2355,8 +2355,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);
>   
> @@ -2425,13 +2425,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
> @@ -2473,8 +2473,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;
> @@ -2512,7 +2512,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))
> @@ -2603,7 +2603,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
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index f56d679b0143..a82297fb4213 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -2355,8 +2355,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);
 
@@ -2425,13 +2425,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
@@ -2473,8 +2473,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;
@@ -2512,7 +2512,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))
@@ -2603,7 +2603,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