[PATCH] drm/i915/display: move dmc_firmware_path to display params

[PATCH] drm/i915/display: move dmc_firmware_path to display params

[Jani Nikula]

The dmc_firmware_path parameter is clearly a display parameter. Move it
there. This also cleans up the ugly member in struct xe_device.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_params.c | 3 +++
 drivers/gpu/drm/i915/display/intel_display_params.h | 1 +
 drivers/gpu/drm/i915/display/intel_dmc.c            | 8 ++++----
 drivers/gpu/drm/i915/i915_params.c                  | 3 ---
 drivers/gpu/drm/i915/i915_params.h                  | 1 -
 drivers/gpu/drm/xe/xe_device_types.h                | 3 ---
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
index 11e03cfb774d..c8e3d6892e23 100644
--- a/drivers/gpu/drm/i915/display/intel_display_params.c
+++ b/drivers/gpu/drm/i915/display/intel_display_params.c
@@ -27,6 +27,9 @@ static struct intel_display_params intel_display_modparams __read_mostly = {
  * debugfs mode to 0.
  */
 
+intel_display_param_named_unsafe(dmc_firmware_path, charp, 0400,
+	"DMC firmware path to use instead of the default one");
+
 intel_display_param_named_unsafe(vbt_firmware, charp, 0400,
 	"Load VBT from specified file under /lib/firmware");
 
diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
index 6206cc51df04..f95a6f79904f 100644
--- a/drivers/gpu/drm/i915/display/intel_display_params.h
+++ b/drivers/gpu/drm/i915/display/intel_display_params.h
@@ -24,6 +24,7 @@ struct drm_i915_private;
  *       debugfs file
  */
 #define INTEL_DISPLAY_PARAMS_FOR_EACH(param) \
+	param(char *, dmc_firmware_path, NULL, 0400) \
 	param(char *, vbt_firmware, NULL, 0400) \
 	param(int, lvds_channel_mode, 0, 0400) \
 	param(int, panel_use_ssc, -1, 0600) \
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 3fa851b5c7a6..b4e730882ce2 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -927,7 +927,7 @@ static void dmc_load_work_fn(struct work_struct *work)
 
 	err = request_firmware(&fw, dmc->fw_path, i915->drm.dev);
 
-	if (err == -ENOENT && !i915->params.dmc_firmware_path) {
+	if (err == -ENOENT && !i915->display.params.dmc_firmware_path) {
 		fallback_path = dmc_fallback_path(i915);
 		if (fallback_path) {
 			drm_dbg_kms(&i915->drm, "%s not found, falling back to %s\n",
@@ -1034,14 +1034,14 @@ void intel_dmc_init(struct drm_i915_private *i915)
 		dmc->max_fw_size = BXT_DMC_MAX_FW_SIZE;
 	}
 
-	if (i915->params.dmc_firmware_path) {
-		if (strlen(i915->params.dmc_firmware_path) == 0) {
+	if (i915->display.params.dmc_firmware_path) {
+		if (strlen(i915->display.params.dmc_firmware_path) == 0) {
 			drm_info(&i915->drm,
 				 "Disabling DMC firmware and runtime PM\n");
 			goto out;
 		}
 
-		dmc->fw_path = i915->params.dmc_firmware_path;
+		dmc->fw_path = i915->display.params.dmc_firmware_path;
 	}
 
 	if (!dmc->fw_path) {
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index de43048543e8..8c00169e3ab7 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -108,9 +108,6 @@ i915_param_named_unsafe(guc_firmware_path, charp, 0400,
 i915_param_named_unsafe(huc_firmware_path, charp, 0400,
 	"HuC firmware path to use instead of the default one");
 
-i915_param_named_unsafe(dmc_firmware_path, charp, 0400,
-	"DMC firmware path to use instead of the default one");
-
 i915_param_named_unsafe(gsc_firmware_path, charp, 0400,
 	"GSC firmware path to use instead of the default one");
 
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 1315d7fac850..2eb3f2115ff2 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -51,7 +51,6 @@ struct drm_printer;
 	param(int, guc_log_level, -1, 0400) \
 	param(char *, guc_firmware_path, NULL, 0400) \
 	param(char *, huc_firmware_path, NULL, 0400) \
-	param(char *, dmc_firmware_path, NULL, 0400) \
 	param(char *, gsc_firmware_path, NULL, 0400) \
 	param(bool, memtest, false, 0400) \
 	param(int, mmio_debug, -IS_ENABLED(CONFIG_DRM_I915_DEBUG_MMIO), 0600) \
diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 9785eef2e5a4..eeab2002d6db 100644
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -524,9 +524,6 @@ struct xe_device {
 		unsigned int fsb_freq, mem_freq, is_ddr3;
 		u8 vblank_enabled;
 	};
-	struct {
-		const char *dmc_firmware_path;
-	} params;
 
 	void *pxp;
 #endif
-- 
2.39.2

Re: [PATCH] drm/i915/display: move dmc_firmware_path to display params

[Jani Nikula]

On Thu, 21 Mar 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> The dmc_firmware_path parameter is clearly a display parameter. Move it
> there. This also cleans up the ugly member in struct xe_device.

Hmm, does this actually fix the parameter on xe?!

>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_display_params.c | 3 +++
>  drivers/gpu/drm/i915/display/intel_display_params.h | 1 +
>  drivers/gpu/drm/i915/display/intel_dmc.c            | 8 ++++----
>  drivers/gpu/drm/i915/i915_params.c                  | 3 ---
>  drivers/gpu/drm/i915/i915_params.h                  | 1 -
>  drivers/gpu/drm/xe/xe_device_types.h                | 3 ---
>  6 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
> index 11e03cfb774d..c8e3d6892e23 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
> @@ -27,6 +27,9 @@ static struct intel_display_params intel_display_modparams __read_mostly = {
>   * debugfs mode to 0.
>   */
>  
> +intel_display_param_named_unsafe(dmc_firmware_path, charp, 0400,
> +	"DMC firmware path to use instead of the default one");
> +
>  intel_display_param_named_unsafe(vbt_firmware, charp, 0400,
>  	"Load VBT from specified file under /lib/firmware");
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
> index 6206cc51df04..f95a6f79904f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
> @@ -24,6 +24,7 @@ struct drm_i915_private;
>   *       debugfs file
>   */
>  #define INTEL_DISPLAY_PARAMS_FOR_EACH(param) \
> +	param(char *, dmc_firmware_path, NULL, 0400) \
>  	param(char *, vbt_firmware, NULL, 0400) \
>  	param(int, lvds_channel_mode, 0, 0400) \
>  	param(int, panel_use_ssc, -1, 0600) \
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
> index 3fa851b5c7a6..b4e730882ce2 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -927,7 +927,7 @@ static void dmc_load_work_fn(struct work_struct *work)
>  
>  	err = request_firmware(&fw, dmc->fw_path, i915->drm.dev);
>  
> -	if (err == -ENOENT && !i915->params.dmc_firmware_path) {
> +	if (err == -ENOENT && !i915->display.params.dmc_firmware_path) {
>  		fallback_path = dmc_fallback_path(i915);
>  		if (fallback_path) {
>  			drm_dbg_kms(&i915->drm, "%s not found, falling back to %s\n",
> @@ -1034,14 +1034,14 @@ void intel_dmc_init(struct drm_i915_private *i915)
>  		dmc->max_fw_size = BXT_DMC_MAX_FW_SIZE;
>  	}
>  
> -	if (i915->params.dmc_firmware_path) {
> -		if (strlen(i915->params.dmc_firmware_path) == 0) {
> +	if (i915->display.params.dmc_firmware_path) {
> +		if (strlen(i915->display.params.dmc_firmware_path) == 0) {
>  			drm_info(&i915->drm,
>  				 "Disabling DMC firmware and runtime PM\n");
>  			goto out;
>  		}
>  
> -		dmc->fw_path = i915->params.dmc_firmware_path;
> +		dmc->fw_path = i915->display.params.dmc_firmware_path;
>  	}
>  
>  	if (!dmc->fw_path) {
> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> index de43048543e8..8c00169e3ab7 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -108,9 +108,6 @@ i915_param_named_unsafe(guc_firmware_path, charp, 0400,
>  i915_param_named_unsafe(huc_firmware_path, charp, 0400,
>  	"HuC firmware path to use instead of the default one");
>  
> -i915_param_named_unsafe(dmc_firmware_path, charp, 0400,
> -	"DMC firmware path to use instead of the default one");
> -
>  i915_param_named_unsafe(gsc_firmware_path, charp, 0400,
>  	"GSC firmware path to use instead of the default one");
>  
> diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
> index 1315d7fac850..2eb3f2115ff2 100644
> --- a/drivers/gpu/drm/i915/i915_params.h
> +++ b/drivers/gpu/drm/i915/i915_params.h
> @@ -51,7 +51,6 @@ struct drm_printer;
>  	param(int, guc_log_level, -1, 0400) \
>  	param(char *, guc_firmware_path, NULL, 0400) \
>  	param(char *, huc_firmware_path, NULL, 0400) \
> -	param(char *, dmc_firmware_path, NULL, 0400) \
>  	param(char *, gsc_firmware_path, NULL, 0400) \
>  	param(bool, memtest, false, 0400) \
>  	param(int, mmio_debug, -IS_ENABLED(CONFIG_DRM_I915_DEBUG_MMIO), 0600) \
> diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
> index 9785eef2e5a4..eeab2002d6db 100644
> --- a/drivers/gpu/drm/xe/xe_device_types.h
> +++ b/drivers/gpu/drm/xe/xe_device_types.h
> @@ -524,9 +524,6 @@ struct xe_device {
>  		unsigned int fsb_freq, mem_freq, is_ddr3;
>  		u8 vblank_enabled;
>  	};
> -	struct {
> -		const char *dmc_firmware_path;
> -	} params;
>  
>  	void *pxp;
>  #endif

-- 
Jani Nikula, Intel

✗ Fi.CI.CHECKPATCH: warning for drm/i915/display: move dmc_firmware_path to display params

[Patchwork]

== Series Details ==

Series: drm/i915/display: move dmc_firmware_path to display params
URL   : https://patchwork.freedesktop.org/series/131443/
State : warning

== Summary ==

Error: dim checkpatch failed
dc34fc4bd4c3 drm/i915/display: move dmc_firmware_path to display params
-:20: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#20: FILE: drivers/gpu/drm/i915/display/intel_display_params.c:31:
+intel_display_param_named_unsafe(dmc_firmware_path, charp, 0400,
+	"DMC firmware path to use instead of the default one");

total: 0 errors, 0 warnings, 1 checks, 66 lines checked

✗ Fi.CI.SPARSE: warning for drm/i915/display: move dmc_firmware_path to display params

[Patchwork]

== Series Details ==

Series: drm/i915/display: move dmc_firmware_path to display params
URL   : https://patchwork.freedesktop.org/series/131443/
State : warning

== Summary ==

Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.

✗ Fi.CI.BAT: failure for drm/i915/display: move dmc_firmware_path to display params

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 12955 bytes --]

== Series Details ==

Series: drm/i915/display: move dmc_firmware_path to display params
URL   : https://patchwork.freedesktop.org/series/131443/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_14464 -> Patchwork_131443v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_131443v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_131443v1, 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_131443v1/index.html

Participating hosts (40 -> 36)
------------------------------

  Missing    (4): bat-mtlp-8 bat-dg1-7 bat-kbl-2 fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_131443v1:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_pm_rpm@module-reload:
    - bat-dg2-14:         [PASS][1] -> [SKIP][2] +2 other tests skip
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-dg2-14/igt@i915_pm_rpm@module-reload.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-dg2-14/igt@i915_pm_rpm@module-reload.html
    - bat-adlp-6:         [PASS][3] -> [SKIP][4] +2 other tests skip
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-adlp-6/igt@i915_pm_rpm@module-reload.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-adlp-6/igt@i915_pm_rpm@module-reload.html
    - bat-rplp-1:         [PASS][5] -> [SKIP][6] +2 other tests skip
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-rplp-1/igt@i915_pm_rpm@module-reload.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-rplp-1/igt@i915_pm_rpm@module-reload.html
    - fi-rkl-11600:       [PASS][7] -> [SKIP][8] +2 other tests skip
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-rkl-11600/igt@i915_pm_rpm@module-reload.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-rkl-11600/igt@i915_pm_rpm@module-reload.html
    - bat-adlp-11:        [PASS][9] -> [SKIP][10] +2 other tests skip
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-adlp-11/igt@i915_pm_rpm@module-reload.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-adlp-11/igt@i915_pm_rpm@module-reload.html
    - bat-adls-6:         [PASS][11] -> [SKIP][12] +2 other tests skip
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-adls-6/igt@i915_pm_rpm@module-reload.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-adls-6/igt@i915_pm_rpm@module-reload.html
    - bat-mtlp-6:         [PASS][13] -> [SKIP][14]
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-mtlp-6/igt@i915_pm_rpm@module-reload.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-mtlp-6/igt@i915_pm_rpm@module-reload.html

  * igt@kms_chamelium_hpd@common-hpd-after-suspend:
    - bat-dg2-13:         [PASS][15] -> [DMESG-WARN][16]
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-dg2-13/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-dg2-13/igt@kms_chamelium_hpd@common-hpd-after-suspend.html

  * igt@kms_pm_rpm@basic-pci-d3-state:
    - bat-adln-1:         [PASS][17] -> [SKIP][18] +2 other tests skip
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-adln-1/igt@kms_pm_rpm@basic-pci-d3-state.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-adln-1/igt@kms_pm_rpm@basic-pci-d3-state.html
    - bat-dg2-8:          [PASS][19] -> [SKIP][20] +2 other tests skip
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-dg2-8/igt@kms_pm_rpm@basic-pci-d3-state.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-dg2-8/igt@kms_pm_rpm@basic-pci-d3-state.html
    - bat-adlm-1:         [PASS][21] -> [SKIP][22] +2 other tests skip
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-adlm-1/igt@kms_pm_rpm@basic-pci-d3-state.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-adlm-1/igt@kms_pm_rpm@basic-pci-d3-state.html
    - fi-tgl-1115g4:      [PASS][23] -> [SKIP][24] +2 other tests skip
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-tgl-1115g4/igt@kms_pm_rpm@basic-pci-d3-state.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-tgl-1115g4/igt@kms_pm_rpm@basic-pci-d3-state.html
    - bat-arls-1:         [PASS][25] -> [SKIP][26] +2 other tests skip
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-arls-1/igt@kms_pm_rpm@basic-pci-d3-state.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-arls-1/igt@kms_pm_rpm@basic-pci-d3-state.html
    - bat-rpls-3:         [PASS][27] -> [SKIP][28] +2 other tests skip
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-rpls-3/igt@kms_pm_rpm@basic-pci-d3-state.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-rpls-3/igt@kms_pm_rpm@basic-pci-d3-state.html

  * igt@kms_pm_rpm@basic-rte:
    - bat-jsl-3:          [PASS][29] -> [SKIP][30] +2 other tests skip
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-jsl-3/igt@kms_pm_rpm@basic-rte.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-jsl-3/igt@kms_pm_rpm@basic-rte.html
    - bat-dg2-9:          [PASS][31] -> [SKIP][32] +2 other tests skip
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-dg2-9/igt@kms_pm_rpm@basic-rte.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-dg2-9/igt@kms_pm_rpm@basic-rte.html
    - bat-dg2-11:         [PASS][33] -> [SKIP][34] +2 other tests skip
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-dg2-11/igt@kms_pm_rpm@basic-rte.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-dg2-11/igt@kms_pm_rpm@basic-rte.html
    - bat-adlp-9:         [PASS][35] -> [SKIP][36] +2 other tests skip
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-adlp-9/igt@kms_pm_rpm@basic-rte.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-adlp-9/igt@kms_pm_rpm@basic-rte.html

  
#### Suppressed ####

  The following results come from untrusted machines, tests, or statuses.
  They do not affect the overall result.

  * igt@kms_pm_rpm@basic-pci-d3-state:
    - {bat-mtlp-9}:       [PASS][37] -> [SKIP][38] +2 other tests skip
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-mtlp-9/igt@kms_pm_rpm@basic-pci-d3-state.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-mtlp-9/igt@kms_pm_rpm@basic-pci-d3-state.html

  * igt@kms_pm_rpm@basic-rte:
    - {bat-arls-4}:       [PASS][39] -> [SKIP][40] +2 other tests skip
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-arls-4/igt@kms_pm_rpm@basic-rte.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-arls-4/igt@kms_pm_rpm@basic-rte.html

  
Known issues
------------

  Here are the changes found in Patchwork_131443v1 that come from known issues:

### CI changes ###

#### Issues hit ####

  * boot:
    - bat-jsl-1:          [PASS][41] -> [FAIL][42] ([i915#8293])
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-jsl-1/boot.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-jsl-1/boot.html

  

### IGT changes ###

#### Issues hit ####

  * igt@i915_pm_rpm@module-reload:
    - fi-apl-guc:         [PASS][43] -> [SKIP][44] +2 other tests skip
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-apl-guc/igt@i915_pm_rpm@module-reload.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-apl-guc/igt@i915_pm_rpm@module-reload.html

  * igt@i915_selftest@live@hangcheck:
    - bat-dg2-9:          [PASS][45] -> [ABORT][46] ([i915#10366])
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-dg2-9/igt@i915_selftest@live@hangcheck.html
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-dg2-9/igt@i915_selftest@live@hangcheck.html
    - bat-rpls-3:         [PASS][47] -> [DMESG-WARN][48] ([i915#5591])
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-rpls-3/igt@i915_selftest@live@hangcheck.html
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-rpls-3/igt@i915_selftest@live@hangcheck.html

  * igt@kms_pm_rpm@basic-pci-d3-state:
    - fi-kbl-7567u:       [PASS][49] -> [SKIP][50] +2 other tests skip
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-kbl-7567u/igt@kms_pm_rpm@basic-pci-d3-state.html
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-kbl-7567u/igt@kms_pm_rpm@basic-pci-d3-state.html
    - fi-kbl-8809g:       [PASS][51] -> [SKIP][52] +2 other tests skip
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-kbl-8809g/igt@kms_pm_rpm@basic-pci-d3-state.html
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-kbl-8809g/igt@kms_pm_rpm@basic-pci-d3-state.html
    - fi-kbl-guc:         [PASS][53] -> [SKIP][54] +2 other tests skip
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-kbl-guc/igt@kms_pm_rpm@basic-pci-d3-state.html
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-kbl-guc/igt@kms_pm_rpm@basic-pci-d3-state.html
    - fi-cfl-guc:         [PASS][55] -> [SKIP][56] +2 other tests skip
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-cfl-guc/igt@kms_pm_rpm@basic-pci-d3-state.html
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-cfl-guc/igt@kms_pm_rpm@basic-pci-d3-state.html
    - bat-mtlp-6:         [PASS][57] -> [SKIP][58] ([i915#9792]) +1 other test skip
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-mtlp-6/igt@kms_pm_rpm@basic-pci-d3-state.html
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-mtlp-6/igt@kms_pm_rpm@basic-pci-d3-state.html
    - fi-cfl-8700k:       [PASS][59] -> [SKIP][60] +2 other tests skip
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-cfl-8700k/igt@kms_pm_rpm@basic-pci-d3-state.html
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-cfl-8700k/igt@kms_pm_rpm@basic-pci-d3-state.html

  * igt@kms_pm_rpm@basic-rte:
    - fi-kbl-x1275:       [PASS][61] -> [SKIP][62] +2 other tests skip
   [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-kbl-x1275/igt@kms_pm_rpm@basic-rte.html
   [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-kbl-x1275/igt@kms_pm_rpm@basic-rte.html
    - fi-cfl-8109u:       [PASS][63] -> [SKIP][64] +2 other tests skip
   [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-cfl-8109u/igt@kms_pm_rpm@basic-rte.html
   [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-cfl-8109u/igt@kms_pm_rpm@basic-rte.html
    - fi-glk-j4005:       [PASS][65] -> [SKIP][66] +2 other tests skip
   [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/fi-glk-j4005/igt@kms_pm_rpm@basic-rte.html
   [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/fi-glk-j4005/igt@kms_pm_rpm@basic-rte.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@gt_mocs:
    - bat-dg2-14:         [ABORT][67] ([i915#10366]) -> [PASS][68]
   [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14464/bat-dg2-14/igt@i915_selftest@live@gt_mocs.html
   [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/bat-dg2-14/igt@i915_selftest@live@gt_mocs.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [i915#10366]: https://gitlab.freedesktop.org/drm/intel/issues/10366
  [i915#5591]: https://gitlab.freedesktop.org/drm/intel/issues/5591
  [i915#8293]: https://gitlab.freedesktop.org/drm/intel/issues/8293
  [i915#9792]: https://gitlab.freedesktop.org/drm/intel/issues/9792


Build changes
-------------

  * Linux: CI_DRM_14464 -> Patchwork_131443v1

  CI-20190529: 20190529
  CI_DRM_14464: ad4a10c6d0e21df4bd830c20c96b795ae2d03962 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_7775: 0ee4074685c1e184f2d3612ea6eb4d126f9a2e23 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_131443v1: ad4a10c6d0e21df4bd830c20c96b795ae2d03962 @ git://anongit.freedesktop.org/gfx-ci/linux


### Linux commits

f7639235a0fb drm/i915/display: move dmc_firmware_path to display params

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131443v1/index.html

[-- Attachment #2: Type: text/html, Size: 14062 bytes --]

Re: [PATCH] drm/i915/display: move dmc_firmware_path to display params

[Lucas De Marchi]

On Thu, Mar 21, 2024 at 06:20:57PM +0200, Jani Nikula wrote:
>On Thu, 21 Mar 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>> The dmc_firmware_path parameter is clearly a display parameter. Move it
>> there. This also cleans up the ugly member in struct xe_device.
>
>Hmm, does this actually fix the parameter on xe?!

not sure what you meant here. Patches makes sense to me.

Lucas De Marchi

>
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  drivers/gpu/drm/i915/display/intel_display_params.c | 3 +++
>>  drivers/gpu/drm/i915/display/intel_display_params.h | 1 +
>>  drivers/gpu/drm/i915/display/intel_dmc.c            | 8 ++++----
>>  drivers/gpu/drm/i915/i915_params.c                  | 3 ---
>>  drivers/gpu/drm/i915/i915_params.h                  | 1 -
>>  drivers/gpu/drm/xe/xe_device_types.h                | 3 ---
>>  6 files changed, 8 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
>> index 11e03cfb774d..c8e3d6892e23 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
>> @@ -27,6 +27,9 @@ static struct intel_display_params intel_display_modparams __read_mostly = {
>>   * debugfs mode to 0.
>>   */
>>
>> +intel_display_param_named_unsafe(dmc_firmware_path, charp, 0400,
>> +	"DMC firmware path to use instead of the default one");
>> +
>>  intel_display_param_named_unsafe(vbt_firmware, charp, 0400,
>>  	"Load VBT from specified file under /lib/firmware");
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
>> index 6206cc51df04..f95a6f79904f 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
>> @@ -24,6 +24,7 @@ struct drm_i915_private;
>>   *       debugfs file
>>   */
>>  #define INTEL_DISPLAY_PARAMS_FOR_EACH(param) \
>> +	param(char *, dmc_firmware_path, NULL, 0400) \
>>  	param(char *, vbt_firmware, NULL, 0400) \
>>  	param(int, lvds_channel_mode, 0, 0400) \
>>  	param(int, panel_use_ssc, -1, 0600) \
>> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
>> index 3fa851b5c7a6..b4e730882ce2 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
>> @@ -927,7 +927,7 @@ static void dmc_load_work_fn(struct work_struct *work)
>>
>>  	err = request_firmware(&fw, dmc->fw_path, i915->drm.dev);
>>
>> -	if (err == -ENOENT && !i915->params.dmc_firmware_path) {
>> +	if (err == -ENOENT && !i915->display.params.dmc_firmware_path) {
>>  		fallback_path = dmc_fallback_path(i915);
>>  		if (fallback_path) {
>>  			drm_dbg_kms(&i915->drm, "%s not found, falling back to %s\n",
>> @@ -1034,14 +1034,14 @@ void intel_dmc_init(struct drm_i915_private *i915)
>>  		dmc->max_fw_size = BXT_DMC_MAX_FW_SIZE;
>>  	}
>>
>> -	if (i915->params.dmc_firmware_path) {
>> -		if (strlen(i915->params.dmc_firmware_path) == 0) {
>> +	if (i915->display.params.dmc_firmware_path) {
>> +		if (strlen(i915->display.params.dmc_firmware_path) == 0) {
>>  			drm_info(&i915->drm,
>>  				 "Disabling DMC firmware and runtime PM\n");
>>  			goto out;
>>  		}
>>
>> -		dmc->fw_path = i915->params.dmc_firmware_path;
>> +		dmc->fw_path = i915->display.params.dmc_firmware_path;
>>  	}
>>
>>  	if (!dmc->fw_path) {
>> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
>> index de43048543e8..8c00169e3ab7 100644
>> --- a/drivers/gpu/drm/i915/i915_params.c
>> +++ b/drivers/gpu/drm/i915/i915_params.c
>> @@ -108,9 +108,6 @@ i915_param_named_unsafe(guc_firmware_path, charp, 0400,
>>  i915_param_named_unsafe(huc_firmware_path, charp, 0400,
>>  	"HuC firmware path to use instead of the default one");
>>
>> -i915_param_named_unsafe(dmc_firmware_path, charp, 0400,
>> -	"DMC firmware path to use instead of the default one");
>> -
>>  i915_param_named_unsafe(gsc_firmware_path, charp, 0400,
>>  	"GSC firmware path to use instead of the default one");
>>
>> diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
>> index 1315d7fac850..2eb3f2115ff2 100644
>> --- a/drivers/gpu/drm/i915/i915_params.h
>> +++ b/drivers/gpu/drm/i915/i915_params.h
>> @@ -51,7 +51,6 @@ struct drm_printer;
>>  	param(int, guc_log_level, -1, 0400) \
>>  	param(char *, guc_firmware_path, NULL, 0400) \
>>  	param(char *, huc_firmware_path, NULL, 0400) \
>> -	param(char *, dmc_firmware_path, NULL, 0400) \
>>  	param(char *, gsc_firmware_path, NULL, 0400) \
>>  	param(bool, memtest, false, 0400) \
>>  	param(int, mmio_debug, -IS_ENABLED(CONFIG_DRM_I915_DEBUG_MMIO), 0600) \
>> diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
>> index 9785eef2e5a4..eeab2002d6db 100644
>> --- a/drivers/gpu/drm/xe/xe_device_types.h
>> +++ b/drivers/gpu/drm/xe/xe_device_types.h
>> @@ -524,9 +524,6 @@ struct xe_device {
>>  		unsigned int fsb_freq, mem_freq, is_ddr3;
>>  		u8 vblank_enabled;
>>  	};
>> -	struct {
>> -		const char *dmc_firmware_path;
>> -	} params;
>>
>>  	void *pxp;
>>  #endif
>
>-- 
>Jani Nikula, Intel

Re: [PATCH] drm/i915/display: move dmc_firmware_path to display params

[Jani Nikula]

On Thu, 21 Mar 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> On Thu, Mar 21, 2024 at 06:20:57PM +0200, Jani Nikula wrote:
>>On Thu, 21 Mar 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>>> The dmc_firmware_path parameter is clearly a display parameter. Move it
>>> there. This also cleans up the ugly member in struct xe_device.
>>
>>Hmm, does this actually fix the parameter on xe?!
>
> not sure what you meant here. Patches makes sense to me.

Unless I'm mistaken, the parameter currently does not work on xe at
all. I only realized after posting the patch that this probably fixes
that issue too.

BR,
Jani.


>
> Lucas De Marchi
>
>>
>>>
>>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>> ---
>>>  drivers/gpu/drm/i915/display/intel_display_params.c | 3 +++
>>>  drivers/gpu/drm/i915/display/intel_display_params.h | 1 +
>>>  drivers/gpu/drm/i915/display/intel_dmc.c            | 8 ++++----
>>>  drivers/gpu/drm/i915/i915_params.c                  | 3 ---
>>>  drivers/gpu/drm/i915/i915_params.h                  | 1 -
>>>  drivers/gpu/drm/xe/xe_device_types.h                | 3 ---
>>>  6 files changed, 8 insertions(+), 11 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.c b/drivers/gpu/drm/i915/display/intel_display_params.c
>>> index 11e03cfb774d..c8e3d6892e23 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_display_params.c
>>> +++ b/drivers/gpu/drm/i915/display/intel_display_params.c
>>> @@ -27,6 +27,9 @@ static struct intel_display_params intel_display_modparams __read_mostly = {
>>>   * debugfs mode to 0.
>>>   */
>>>
>>> +intel_display_param_named_unsafe(dmc_firmware_path, charp, 0400,
>>> +	"DMC firmware path to use instead of the default one");
>>> +
>>>  intel_display_param_named_unsafe(vbt_firmware, charp, 0400,
>>>  	"Load VBT from specified file under /lib/firmware");
>>>
>>> diff --git a/drivers/gpu/drm/i915/display/intel_display_params.h b/drivers/gpu/drm/i915/display/intel_display_params.h
>>> index 6206cc51df04..f95a6f79904f 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_display_params.h
>>> +++ b/drivers/gpu/drm/i915/display/intel_display_params.h
>>> @@ -24,6 +24,7 @@ struct drm_i915_private;
>>>   *       debugfs file
>>>   */
>>>  #define INTEL_DISPLAY_PARAMS_FOR_EACH(param) \
>>> +	param(char *, dmc_firmware_path, NULL, 0400) \
>>>  	param(char *, vbt_firmware, NULL, 0400) \
>>>  	param(int, lvds_channel_mode, 0, 0400) \
>>>  	param(int, panel_use_ssc, -1, 0600) \
>>> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
>>> index 3fa851b5c7a6..b4e730882ce2 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
>>> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
>>> @@ -927,7 +927,7 @@ static void dmc_load_work_fn(struct work_struct *work)
>>>
>>>  	err = request_firmware(&fw, dmc->fw_path, i915->drm.dev);
>>>
>>> -	if (err == -ENOENT && !i915->params.dmc_firmware_path) {
>>> +	if (err == -ENOENT && !i915->display.params.dmc_firmware_path) {
>>>  		fallback_path = dmc_fallback_path(i915);
>>>  		if (fallback_path) {
>>>  			drm_dbg_kms(&i915->drm, "%s not found, falling back to %s\n",
>>> @@ -1034,14 +1034,14 @@ void intel_dmc_init(struct drm_i915_private *i915)
>>>  		dmc->max_fw_size = BXT_DMC_MAX_FW_SIZE;
>>>  	}
>>>
>>> -	if (i915->params.dmc_firmware_path) {
>>> -		if (strlen(i915->params.dmc_firmware_path) == 0) {
>>> +	if (i915->display.params.dmc_firmware_path) {
>>> +		if (strlen(i915->display.params.dmc_firmware_path) == 0) {
>>>  			drm_info(&i915->drm,
>>>  				 "Disabling DMC firmware and runtime PM\n");
>>>  			goto out;
>>>  		}
>>>
>>> -		dmc->fw_path = i915->params.dmc_firmware_path;
>>> +		dmc->fw_path = i915->display.params.dmc_firmware_path;
>>>  	}
>>>
>>>  	if (!dmc->fw_path) {
>>> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
>>> index de43048543e8..8c00169e3ab7 100644
>>> --- a/drivers/gpu/drm/i915/i915_params.c
>>> +++ b/drivers/gpu/drm/i915/i915_params.c
>>> @@ -108,9 +108,6 @@ i915_param_named_unsafe(guc_firmware_path, charp, 0400,
>>>  i915_param_named_unsafe(huc_firmware_path, charp, 0400,
>>>  	"HuC firmware path to use instead of the default one");
>>>
>>> -i915_param_named_unsafe(dmc_firmware_path, charp, 0400,
>>> -	"DMC firmware path to use instead of the default one");
>>> -
>>>  i915_param_named_unsafe(gsc_firmware_path, charp, 0400,
>>>  	"GSC firmware path to use instead of the default one");
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
>>> index 1315d7fac850..2eb3f2115ff2 100644
>>> --- a/drivers/gpu/drm/i915/i915_params.h
>>> +++ b/drivers/gpu/drm/i915/i915_params.h
>>> @@ -51,7 +51,6 @@ struct drm_printer;
>>>  	param(int, guc_log_level, -1, 0400) \
>>>  	param(char *, guc_firmware_path, NULL, 0400) \
>>>  	param(char *, huc_firmware_path, NULL, 0400) \
>>> -	param(char *, dmc_firmware_path, NULL, 0400) \
>>>  	param(char *, gsc_firmware_path, NULL, 0400) \
>>>  	param(bool, memtest, false, 0400) \
>>>  	param(int, mmio_debug, -IS_ENABLED(CONFIG_DRM_I915_DEBUG_MMIO), 0600) \
>>> diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
>>> index 9785eef2e5a4..eeab2002d6db 100644
>>> --- a/drivers/gpu/drm/xe/xe_device_types.h
>>> +++ b/drivers/gpu/drm/xe/xe_device_types.h
>>> @@ -524,9 +524,6 @@ struct xe_device {
>>>  		unsigned int fsb_freq, mem_freq, is_ddr3;
>>>  		u8 vblank_enabled;
>>>  	};
>>> -	struct {
>>> -		const char *dmc_firmware_path;
>>> -	} params;
>>>
>>>  	void *pxp;
>>>  #endif
>>
>>-- 
>>Jani Nikula, Intel

-- 
Jani Nikula, Intel

Re: [PATCH] drm/i915/display: move dmc_firmware_path to display params

[Lucas De Marchi]

On Fri, Mar 22, 2024 at 10:48:43AM +0200, Jani Nikula wrote:
>On Thu, 21 Mar 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>> On Thu, Mar 21, 2024 at 06:20:57PM +0200, Jani Nikula wrote:
>>>On Thu, 21 Mar 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>>>> The dmc_firmware_path parameter is clearly a display parameter. Move it
>>>> there. This also cleans up the ugly member in struct xe_device.
>>>
>>>Hmm, does this actually fix the parameter on xe?!
>>
>> not sure what you meant here. Patches makes sense to me.
>
>Unless I'm mistaken, the parameter currently does not work on xe at
>all. I only realized after posting the patch that this probably fixes
>that issue too.

+Gustavo

I never really tried the dmc_firmware_path param, but current code
contains:

drivers/gpu/drm/i915/display/intel_dmc.c:       if (err == -ENOENT && !i915->params.dmc_firmware_path) {
drivers/gpu/drm/i915/display/intel_dmc.c:       if (i915->params.dmc_firmware_path) {
drivers/gpu/drm/i915/display/intel_dmc.c:               if (strlen(i915->params.dmc_firmware_path) == 0) {
drivers/gpu/drm/i915/display/intel_dmc.c:               dmc->fw_path = i915->params.dmc_firmware_path;
drivers/gpu/drm/i915/i915_params.c:i915_param_named_unsafe(dmc_firmware_path, charp, 0400,
drivers/gpu/drm/i915/i915_params.h:     param(char *, dmc_firmware_path, NULL, 0400) \
drivers/gpu/drm/xe/xe_device_types.h:           const char *dmc_firmware_path;

So dmc_firmware_path is only dealt with inside display... it would be
odd if it was not working. I'll double check.

Lucas De Marchi

Re: [PATCH] drm/i915/display: move dmc_firmware_path to display params

[Lucas De Marchi]

On Fri, Mar 22, 2024 at 11:06:20AM -0500, Lucas De Marchi wrote:
>On Fri, Mar 22, 2024 at 10:48:43AM +0200, Jani Nikula wrote:
>>On Thu, 21 Mar 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
>>>On Thu, Mar 21, 2024 at 06:20:57PM +0200, Jani Nikula wrote:
>>>>On Thu, 21 Mar 2024, Jani Nikula <jani.nikula@intel.com> wrote:
>>>>>The dmc_firmware_path parameter is clearly a display parameter. Move it
>>>>>there. This also cleans up the ugly member in struct xe_device.
>>>>
>>>>Hmm, does this actually fix the parameter on xe?!
>>>
>>>not sure what you meant here. Patches makes sense to me.
>>
>>Unless I'm mistaken, the parameter currently does not work on xe at
>>all. I only realized after posting the patch that this probably fixes
>>that issue too.
>
>+Gustavo
>
>I never really tried the dmc_firmware_path param, but current code
>contains:
>
>drivers/gpu/drm/i915/display/intel_dmc.c:       if (err == -ENOENT && !i915->params.dmc_firmware_path) {
>drivers/gpu/drm/i915/display/intel_dmc.c:       if (i915->params.dmc_firmware_path) {
>drivers/gpu/drm/i915/display/intel_dmc.c:               if (strlen(i915->params.dmc_firmware_path) == 0) {
>drivers/gpu/drm/i915/display/intel_dmc.c:               dmc->fw_path = i915->params.dmc_firmware_path;
>drivers/gpu/drm/i915/i915_params.c:i915_param_named_unsafe(dmc_firmware_path, charp, 0400,
>drivers/gpu/drm/i915/i915_params.h:     param(char *, dmc_firmware_path, NULL, 0400) \
>drivers/gpu/drm/xe/xe_device_types.h:           const char *dmc_firmware_path;
>
>So dmc_firmware_path is only dealt with inside display... it would be
>odd if it was not working. I'll double check.


oh, now I understand. You mean that xe module doesn't have the param
because it's only declared in drivers/gpu/drm/i915/i915_params.c.

Could you extend the commit message with something like this?

	The dmc_firmware_path parameter is clearly a display parameter. Move it
	there so it's available to both i915 and xe modules ....

thanks
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

Lucas De Marchi

>
>Lucas De Marchi

Re: [PATCH] drm/i915/display: move dmc_firmware_path to display params

[Jani Nikula]

On Fri, 22 Mar 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote:
> oh, now I understand. You mean that xe module doesn't have the param
> because it's only declared in drivers/gpu/drm/i915/i915_params.c.
>
> Could you extend the commit message with something like this?
>
> 	The dmc_firmware_path parameter is clearly a display parameter. Move it
> 	there so it's available to both i915 and xe modules ....
>
> thanks
> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

Thanks for the review, pushed to drm-intel-next with an amended commit
message.

BR,
Jani.


-- 
Jani Nikula, Intel