| Message ID | 20240510140532.112352-2-gustavo.sousa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/bmg: Load DMC | expand |
> -----Original Message----- > From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of > Gustavo Sousa > Sent: Friday, May 10, 2024 7:36 PM > To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org > Subject: [PATCH] drm/i915/bmg: Load DMC > > Load Battlemage's DMC. We re-use XELPDP_DMC_MAX_FW_SIZE since BMG's > display is a derivative of Xe_LPD+ and has the same MMIO offset limits. > > Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> > --- Some CI skips/failures are in the CI result and those are not related to this change. LGTM. Reviewed-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com> > drivers/gpu/drm/i915/display/intel_dmc.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c > b/drivers/gpu/drm/i915/display/intel_dmc.c > index cbd2ac5671b1..63fccdda56c0 100644 > --- a/drivers/gpu/drm/i915/display/intel_dmc.c > +++ b/drivers/gpu/drm/i915/display/intel_dmc.c > @@ -115,6 +115,9 @@ static bool dmc_firmware_param_disabled(struct > drm_i915_private *i915) > #define XE2LPD_DMC_PATH DMC_PATH(xe2lpd) > MODULE_FIRMWARE(XE2LPD_DMC_PATH); > > +#define BMG_DMC_PATH DMC_PATH(bmg) > +MODULE_FIRMWARE(BMG_DMC_PATH); > + > #define MTL_DMC_PATH DMC_PATH(mtl) > MODULE_FIRMWARE(MTL_DMC_PATH); > > @@ -166,6 +169,9 @@ static const char *dmc_firmware_default(struct > drm_i915_private *i915, u32 *size > if (DISPLAY_VER_FULL(i915) == IP_VER(20, 0)) { > fw_path = XE2LPD_DMC_PATH; > max_fw_size = XE2LPD_DMC_MAX_FW_SIZE; > + } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 1)) { > + fw_path = BMG_DMC_PATH; > + max_fw_size = XELPDP_DMC_MAX_FW_SIZE; > } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { > fw_path = MTL_DMC_PATH; > max_fw_size = XELPDP_DMC_MAX_FW_SIZE; > -- > 2.45.0
Quoting Bhadane, Dnyaneshwar (2024-05-13 08:21:31-03:00) > > >> -----Original Message----- >> From: Intel-xe <intel-xe-bounces@lists.freedesktop.org> On Behalf Of >> Gustavo Sousa >> Sent: Friday, May 10, 2024 7:36 PM >> To: intel-gfx@lists.freedesktop.org; intel-xe@lists.freedesktop.org >> Subject: [PATCH] drm/i915/bmg: Load DMC >> >> Load Battlemage's DMC. We re-use XELPDP_DMC_MAX_FW_SIZE since BMG's >> display is a derivative of Xe_LPD+ and has the same MMIO offset limits. >> >> Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> >> --- > >Some CI skips/failures are in the CI result and those are not related to this change. >LGTM. >Reviewed-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com> Yeah, CI failures are unrelated to this patch. Pushed to drm-intel-next. Thanks for the review. -- Gustavo Sousa > >> drivers/gpu/drm/i915/display/intel_dmc.c | 6 ++++++ >> 1 file changed, 6 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c >> b/drivers/gpu/drm/i915/display/intel_dmc.c >> index cbd2ac5671b1..63fccdda56c0 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dmc.c >> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c >> @@ -115,6 +115,9 @@ static bool dmc_firmware_param_disabled(struct >> drm_i915_private *i915) >> #define XE2LPD_DMC_PATH DMC_PATH(xe2lpd) >> MODULE_FIRMWARE(XE2LPD_DMC_PATH); >> >> +#define BMG_DMC_PATH DMC_PATH(bmg) >> +MODULE_FIRMWARE(BMG_DMC_PATH); >> + >> #define MTL_DMC_PATH DMC_PATH(mtl) >> MODULE_FIRMWARE(MTL_DMC_PATH); >> >> @@ -166,6 +169,9 @@ static const char *dmc_firmware_default(struct >> drm_i915_private *i915, u32 *size >> if (DISPLAY_VER_FULL(i915) == IP_VER(20, 0)) { >> fw_path = XE2LPD_DMC_PATH; >> max_fw_size = XE2LPD_DMC_MAX_FW_SIZE; >> + } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 1)) { >> + fw_path = BMG_DMC_PATH; >> + max_fw_size = XELPDP_DMC_MAX_FW_SIZE; >> } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { >> fw_path = MTL_DMC_PATH; >> max_fw_size = XELPDP_DMC_MAX_FW_SIZE; >> -- >> 2.45.0 >
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c index cbd2ac5671b1..63fccdda56c0 100644 --- a/drivers/gpu/drm/i915/display/intel_dmc.c +++ b/drivers/gpu/drm/i915/display/intel_dmc.c @@ -115,6 +115,9 @@ static bool dmc_firmware_param_disabled(struct drm_i915_private *i915) #define XE2LPD_DMC_PATH DMC_PATH(xe2lpd) MODULE_FIRMWARE(XE2LPD_DMC_PATH); +#define BMG_DMC_PATH DMC_PATH(bmg) +MODULE_FIRMWARE(BMG_DMC_PATH); + #define MTL_DMC_PATH DMC_PATH(mtl) MODULE_FIRMWARE(MTL_DMC_PATH); @@ -166,6 +169,9 @@ static const char *dmc_firmware_default(struct drm_i915_private *i915, u32 *size if (DISPLAY_VER_FULL(i915) == IP_VER(20, 0)) { fw_path = XE2LPD_DMC_PATH; max_fw_size = XE2LPD_DMC_MAX_FW_SIZE; + } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 1)) { + fw_path = BMG_DMC_PATH; + max_fw_size = XELPDP_DMC_MAX_FW_SIZE; } else if (DISPLAY_VER_FULL(i915) == IP_VER(14, 0)) { fw_path = MTL_DMC_PATH; max_fw_size = XELPDP_DMC_MAX_FW_SIZE;
Load Battlemage's DMC. We re-use XELPDP_DMC_MAX_FW_SIZE since BMG's display is a derivative of Xe_LPD+ and has the same MMIO offset limits. Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com> --- drivers/gpu/drm/i915/display/intel_dmc.c | 6 ++++++ 1 file changed, 6 insertions(+)