Re: [PATCH 7/8] drm/i915/xe2lpd: Load DMC
Quoting Lucas De Marchi (2024-03-04 16:50:49-03:00) >On Mon, Mar 04, 2024 at 03:30:26PM -0300, Gustavo Sousa wrote: >>From: Balasubramani Vivekanandan >> >>Load DMC for Xe2LPD. The value 0x8000 is the maximum payload size for >>any Xe2LPD DMC firmware. >> >>Signed-off-by: Balasubramani Vivekanandan >> >>Signed-off-by: Dnyaneshwar Bhadane >>Signed-off-by: Gustavo Sousa >>--- >> drivers/gpu/drm/i915/display/intel_dmc.c | 9 - >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >>diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c >>b/drivers/gpu/drm/i915/display/intel_dmc.c >>index 835781624482..54c5909de293 100644 >>--- a/drivers/gpu/drm/i915/display/intel_dmc.c >>+++ b/drivers/gpu/drm/i915/display/intel_dmc.c >>@@ -89,10 +89,14 @@ static struct intel_dmc *i915_to_dmc(struct >>drm_i915_private *i915) >> __stringify(major) "_"\ >> __stringify(minor) ".bin" >> >>+#define XE2LPD_MAX_FW_SIZE0x8000 > > ^ missing DMC_ here to be like the other macros below? Oh, yeah. That went unnoticed. Thanks! -- Gustavo > >other than that, Reviewed-by: Lucas De Marchi > >Lucas De Marchi > >> #define XELPDP_DMC_MAX_FW_SIZE0x7000 >> #define DISPLAY_VER13_DMC_MAX_FW_SIZE0x2 >> #define DISPLAY_VER12_DMC_MAX_FW_SIZEICL_DMC_MAX_FW_SIZE >> >>+#define XE2LPD_DMC_PATHDMC_PATH(xe2lpd) >>+MODULE_FIRMWARE(XE2LPD_DMC_PATH); >>+ >> #define MTL_DMC_PATHDMC_PATH(mtl) >> MODULE_FIRMWARE(MTL_DMC_PATH); >> >>@@ -987,7 +991,10 @@ void intel_dmc_init(struct drm_i915_private *i915) >> >> INIT_WORK(&dmc->work, dmc_load_work_fn); >> >>-if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { >>+if (DISPLAY_VER_FULL(i915) == IP_VER(20, 0)) { >>+dmc->fw_path = XE2LPD_DMC_PATH; >>+dmc->max_fw_size = XE2LPD_MAX_FW_SIZE; >>+} else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { >> dmc->fw_path = MTL_DMC_PATH; >> dmc->max_fw_size = XELPDP_DMC_MAX_FW_SIZE; >> } else if (IS_DG2(i915)) { >>-- >>2.44.0 >>
Re: [PATCH 7/8] drm/i915/xe2lpd: Load DMC
On Mon, Mar 04, 2024 at 03:30:26PM -0300, Gustavo Sousa wrote: From: Balasubramani Vivekanandan Load DMC for Xe2LPD. The value 0x8000 is the maximum payload size for any Xe2LPD DMC firmware. Signed-off-by: Balasubramani Vivekanandan Signed-off-by: Dnyaneshwar Bhadane Signed-off-by: Gustavo Sousa --- drivers/gpu/drm/i915/display/intel_dmc.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 835781624482..54c5909de293 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -89,10 +89,14 @@ static struct intel_dmc *i915_to_dmc(struct drm_i915_private *i915) __stringify(major) "_"\ __stringify(minor) ".bin" +#define XE2LPD_MAX_FW_SIZE 0x8000 ^ missing DMC_ here to be like the other macros below? other than that, Reviewed-by: Lucas De Marchi Lucas De Marchi #define XELPDP_DMC_MAX_FW_SIZE 0x7000 #define DISPLAY_VER13_DMC_MAX_FW_SIZE 0x2 #define DISPLAY_VER12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZE +#define XE2LPD_DMC_PATHDMC_PATH(xe2lpd) +MODULE_FIRMWARE(XE2LPD_DMC_PATH); + #define MTL_DMC_PATHDMC_PATH(mtl) MODULE_FIRMWARE(MTL_DMC_PATH); @@ -987,7 +991,10 @@ void intel_dmc_init(struct drm_i915_private *i915) INIT_WORK(&dmc->work, dmc_load_work_fn); - if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { + if (DISPLAY_VER_FULL(i915) == IP_VER(20, 0)) { + dmc->fw_path = XE2LPD_DMC_PATH; + dmc->max_fw_size = XE2LPD_MAX_FW_SIZE; + } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { dmc->fw_path = MTL_DMC_PATH; dmc->max_fw_size = XELPDP_DMC_MAX_FW_SIZE; } else if (IS_DG2(i915)) { -- 2.44.0
[PATCH 7/8] drm/i915/xe2lpd: Load DMC
From: Balasubramani Vivekanandan Load DMC for Xe2LPD. The value 0x8000 is the maximum payload size for any Xe2LPD DMC firmware. Signed-off-by: Balasubramani Vivekanandan Signed-off-by: Dnyaneshwar Bhadane Signed-off-by: Gustavo Sousa --- drivers/gpu/drm/i915/display/intel_dmc.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index 835781624482..54c5909de293 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -89,10 +89,14 @@ static struct intel_dmc *i915_to_dmc(struct drm_i915_private *i915) __stringify(major) "_" \ __stringify(minor) ".bin" +#define XE2LPD_MAX_FW_SIZE 0x8000 #define XELPDP_DMC_MAX_FW_SIZE 0x7000 #define DISPLAY_VER13_DMC_MAX_FW_SIZE 0x2 #define DISPLAY_VER12_DMC_MAX_FW_SIZE ICL_DMC_MAX_FW_SIZE +#define XE2LPD_DMC_PATHDMC_PATH(xe2lpd) +MODULE_FIRMWARE(XE2LPD_DMC_PATH); + #define MTL_DMC_PATH DMC_PATH(mtl) MODULE_FIRMWARE(MTL_DMC_PATH); @@ -987,7 +991,10 @@ void intel_dmc_init(struct drm_i915_private *i915) INIT_WORK(&dmc->work, dmc_load_work_fn); - if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { + if (DISPLAY_VER_FULL(i915) == IP_VER(20, 0)) { + dmc->fw_path = XE2LPD_DMC_PATH; + dmc->max_fw_size = XE2LPD_MAX_FW_SIZE; + } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { dmc->fw_path = MTL_DMC_PATH; dmc->max_fw_size = XELPDP_DMC_MAX_FW_SIZE; } else if (IS_DG2(i915)) { -- 2.44.0