[Intel-xe] [PATCH 6/7] drm/xe/display: Rename GEN13_DISPLAY

Lucas De Marchi lucas.demarchi at intel.com
Thu Mar 2 01:34:10 UTC 2023


There is no such thing as GEN13 display. With the IP disaggregation the
"gen" stopped being used. The display IP used in DG2 should be using
XE_LPD as short name. For Meterlake, it's XE_LPDP, so go ahead and
define that macro for it.

Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
---
 drivers/gpu/drm/xe/xe_display.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_display.c b/drivers/gpu/drm/xe/xe_display.c
index 76e4fb6bd67c..97c77d175539 100644
--- a/drivers/gpu/drm/xe/xe_display.c
+++ b/drivers/gpu/drm/xe/xe_display.c
@@ -430,7 +430,7 @@ __diag_ignore_all("-Woverride-init", "Allow field overrides in table");
 	.has_psr_hw_tracking = 1,					\
 	.color = { .degamma_lut_size = 33, .gamma_lut_size = 262145 }
 
-#define GEN13_DISPLAY							\
+#define XE_LPD								\
 	__DISPLAY_DEFAULTS,						\
 	.ver = 13,							\
 	.abox_mask = GENMASK(1, 0),					\
@@ -452,6 +452,13 @@ __diag_ignore_all("-Woverride-init", "Allow field overrides in table");
 	.has_ipc = 1,							\
 	.has_psr = 1
 
+#define XE_LPDP								\
+	XE_LPD,								\
+	.ver = 14,							\
+	.has_cdclk_crawl = 1,						\
+	.has_cdclk_squash = 1
+
+
 void xe_display_info_init(struct xe_device *xe)
 {
 	if (!xe->info.enable_display)
@@ -472,19 +479,14 @@ void xe_display_info_init(struct xe_device *xe)
 		break;
 	case XE_DG2:
 		xe->info.display = (struct xe_device_display_info) {
-			GEN13_DISPLAY,
+			XE_LPD,
 			.cpu_transcoder_mask =
 				BIT(TRANSCODER_A) | BIT(TRANSCODER_B) |
 				BIT(TRANSCODER_C) | BIT(TRANSCODER_D),
 		};
 		break;
 	case XE_METEORLAKE:
-		xe->info.display = (struct xe_device_display_info) {
-			GEN13_DISPLAY,
-			.ver = 14,
-			.has_cdclk_crawl = 1,
-			.has_cdclk_squash = 1,
-		};
+		xe->info.display = (struct xe_device_display_info) { XE_LPDP };
 		break;
 	default:
 		/*
-- 
2.39.0



More information about the Intel-xe mailing list