diff mbox series

drm/i915/xe3lpd: Load DMC

Message ID 20241022155115.50989-1-gustavo.sousa@intel.com (mailing list archive)
State New
Headers show
Series drm/i915/xe3lpd: Load DMC | expand

Commit Message

Gustavo Sousa Oct. 22, 2024, 3:50 p.m. UTC 
Load the DMC for Xe3LPD.

Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dmc.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Comments

Clint Taylor Oct. 22, 2024, 5:43 p.m. UTC | #1 
Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com>

-Clint

On Tue, 2024-10-22 at 12:50 -0300, Gustavo Sousa wrote:
> Load the DMC for Xe3LPD.
> 
> Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_dmc.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c
> b/drivers/gpu/drm/i915/display/intel_dmc.c
> index 48bbbf8f312c..5392b68627ae 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -113,6 +113,9 @@ static bool dmc_firmware_param_disabled(struct intel_display
> *display)
>  #define DISPLAY_VER13_DMC_MAX_FW_SIZE	0x20000
>  #define DISPLAY_VER12_DMC_MAX_FW_SIZE	ICL_DMC_MAX_FW_SIZE
>  
> +#define XE3LPD_DMC_PATH			DMC_PATH(xe3lpd)
> +MODULE_FIRMWARE(XE3LPD_DMC_PATH);
> +
>  #define XE2LPD_DMC_PATH			DMC_PATH(xe2lpd)
>  MODULE_FIRMWARE(XE2LPD_DMC_PATH);
>  
> @@ -168,7 +171,10 @@ static const char *dmc_firmware_default(struct intel_display
> *display, u32 *size
>  	const char *fw_path = NULL;
>  	u32 max_fw_size = 0;
>  
> -	if (DISPLAY_VER_FULL(display) == IP_VER(20, 0)) {
> +	if (DISPLAY_VER_FULL(display) == IP_VER(30, 0)) {
> +		fw_path = XE3LPD_DMC_PATH;
> +		max_fw_size = XE2LPD_DMC_MAX_FW_SIZE;
> +	} else if (DISPLAY_VER_FULL(display) == IP_VER(20, 0)) {
>  		fw_path = XE2LPD_DMC_PATH;
>  		max_fw_size = XE2LPD_DMC_MAX_FW_SIZE;
>  	} else if (DISPLAY_VER_FULL(display) == IP_VER(14, 1)) {
Gustavo Sousa Oct. 22, 2024, 5:59 p.m. UTC | #2 
Quoting Patchwork (2024-10-22 13:53:20-03:00)
>== Series Details ==
>
>Series: drm/i915/xe3lpd: Load DMC
>URL   : https://patchwork.freedesktop.org/series/140321/
>State : failure
>
>== Summary ==
>
>CI Bug Log - changes from CI_DRM_15579 -> Patchwork_140321v1
>====================================================
>
>Summary
>-------
>
>  **FAILURE**
>
>  Serious unknown changes coming with Patchwork_140321v1 absolutely need to be
>  verified manually.
>  
>  If you think the reported changes have nothing to do with the changes
>  introduced in Patchwork_140321v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
>  to document this new failure mode, which will reduce false positives in CI.
>
>  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/index.html
>
>Participating hosts (45 -> 44)
>------------------------------
>
>  Missing    (1): fi-snb-2520m 
>
>Possible new issues
>-------------------
>
>  Here are the unknown changes that may have been introduced in Patchwork_140321v1:
>
>### IGT changes ###
>
>#### Possible regressions ####
>
>  * igt@i915_module_load@reload:
>    - bat-mtlp-8:         [PASS][1] -> [INCOMPLETE][2]
>   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-mtlp-8/igt@i915_module_load@reload.html
>   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/bat-mtlp-8/igt@i915_module_load@reload.html
>

This is unrelated to this series, which applies only to PTL.

Please re-report.

--
Gustavo Sousa

>  
>Known issues
>------------
>
>  Here are the changes found in Patchwork_140321v1 that come from known issues:
>
>### IGT changes ###
>
>#### Issues hit ####
>
>  * igt@i915_selftest@live:
>    - bat-dg2-8:          [PASS][3] -> [ABORT][4] ([i915#12133])
>   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-dg2-8/igt@i915_selftest@live.html
>   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/bat-dg2-8/igt@i915_selftest@live.html
>    - bat-dg2-11:         [PASS][5] -> [ABORT][6] ([i915#12133])
>   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-dg2-11/igt@i915_selftest@live.html
>   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/bat-dg2-11/igt@i915_selftest@live.html
>
>  * igt@i915_selftest@live@active:
>    - bat-dg2-11:         [PASS][7] -> [ABORT][8] ([i915#12305])
>   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-dg2-11/igt@i915_selftest@live@active.html
>   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/bat-dg2-11/igt@i915_selftest@live@active.html
>    - bat-dg2-8:          [PASS][9] -> [ABORT][10] ([i915#12305])
>   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-dg2-8/igt@i915_selftest@live@active.html
>   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/bat-dg2-8/igt@i915_selftest@live@active.html
>
>  * igt@kms_chamelium_edid@hdmi-edid-read:
>    - bat-dg2-13:         [PASS][11] -> [DMESG-WARN][12] ([i915#12253])
>   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-dg2-13/igt@kms_chamelium_edid@hdmi-edid-read.html
>   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/bat-dg2-13/igt@kms_chamelium_edid@hdmi-edid-read.html
>
>  
>#### Possible fixes ####
>
>  * igt@i915_selftest@live:
>    - fi-bsw-nick:        [DMESG-FAIL][13] ([i915#12172]) -> [PASS][14]
>   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/fi-bsw-nick/igt@i915_selftest@live.html
>   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/fi-bsw-nick/igt@i915_selftest@live.html
>
>  * igt@i915_selftest@live@active:
>    - fi-bsw-nick:        [DMESG-FAIL][15] ([i915#12435]) -> [PASS][16]
>   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/fi-bsw-nick/igt@i915_selftest@live@active.html
>   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/fi-bsw-nick/igt@i915_selftest@live@active.html
>
>  * igt@i915_selftest@live@late_gt_pm:
>    - bat-atsm-1:         [ABORT][17] ([i915#12133]) -> [PASS][18] +1 other test pass
>   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15579/bat-atsm-1/igt@i915_selftest@live@late_gt_pm.html
>   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/bat-atsm-1/igt@i915_selftest@live@late_gt_pm.html
>
>  
>  [i915#12133]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12133
>  [i915#12172]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12172
>  [i915#12253]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12253
>  [i915#12305]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12305
>  [i915#12435]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12435
>
>
>Build changes
>-------------
>
>  * Linux: CI_DRM_15579 -> Patchwork_140321v1
>
>  CI-20190529: 20190529
>  CI_DRM_15579: 2d11d2602dc35b03fd68309c96fedeea423beb42 @ git://anongit.freedesktop.org/gfx-ci/linux
>  IGT_8082: c8379ec8b26f3c21bae5473706b23da78bd26ffa @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
>  Patchwork_140321v1: 2d11d2602dc35b03fd68309c96fedeea423beb42 @ git://anongit.freedesktop.org/gfx-ci/linux
>
>== Logs ==
>
>For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_140321v1/index.html
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 48bbbf8f312c..5392b68627ae 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -113,6 +113,9 @@  static bool dmc_firmware_param_disabled(struct intel_display *display)
 #define DISPLAY_VER13_DMC_MAX_FW_SIZE	0x20000
 #define DISPLAY_VER12_DMC_MAX_FW_SIZE	ICL_DMC_MAX_FW_SIZE
 
+#define XE3LPD_DMC_PATH			DMC_PATH(xe3lpd)
+MODULE_FIRMWARE(XE3LPD_DMC_PATH);
+
 #define XE2LPD_DMC_PATH			DMC_PATH(xe2lpd)
 MODULE_FIRMWARE(XE2LPD_DMC_PATH);
 
@@ -168,7 +171,10 @@  static const char *dmc_firmware_default(struct intel_display *display, u32 *size
 	const char *fw_path = NULL;
 	u32 max_fw_size = 0;
 
-	if (DISPLAY_VER_FULL(display) == IP_VER(20, 0)) {
+	if (DISPLAY_VER_FULL(display) == IP_VER(30, 0)) {
+		fw_path = XE3LPD_DMC_PATH;
+		max_fw_size = XE2LPD_DMC_MAX_FW_SIZE;
+	} else if (DISPLAY_VER_FULL(display) == IP_VER(20, 0)) {
 		fw_path = XE2LPD_DMC_PATH;
 		max_fw_size = XE2LPD_DMC_MAX_FW_SIZE;
 	} else if (DISPLAY_VER_FULL(display) == IP_VER(14, 1)) {