Skip to contentSkip to conversation

drm/i915: add support for specifying DMC firmware override by module param

PATCH RESEND In review Jani Nikula 4 participants 10 messages Apr 24, 2018 – May 2, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND v2 1/1 drm/i915: add support for specifying DMC firmware override by module param

Use i915.dmc_firmware_path to override default firmware for the platform and bypassing version checks.

v2: add missing param struct member declaration (David)

---
 drivers/gpu/drm/i915/i915_params.c | 3 +++
 drivers/gpu/drm/i915/i915_params.h | 1 +
 drivers/gpu/drm/i915/intel_csr.c   | 9 +++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +3 -0
index 08108ce5be21..66ea3552c63e 100644
@@ -164,6 +164,9 @@ 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(enable_dp_mst, bool, 0600,
 	"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)");
 
drivers/gpu/drm/i915/i915_params.h +1 -0
index c96360398072..6684025b7af8 100644
@@ -51,6 +51,7 @@ struct drm_printer;
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
+	param(char *, dmc_firmware_path, NULL) \
 	param(int, mmio_debug, 0) \
 	param(int, edp_vswing, 0) \
 	param(int, reset, 2) \
drivers/gpu/drm/i915/intel_csr.c +7 -2
index 41e6c75a7f3c..d81673250d3b 100644
@@ -297,7 +297,10 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
 	csr->version = css_header->version;
 
-	if (IS_CANNONLAKE(dev_priv)) {
+	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
+		/* Bypass version check for firmware override. */
+		required_version = csr->version;
+	} else if (IS_CANNONLAKE(dev_priv)) {
 		required_version = CNL_CSR_VERSION_REQUIRED;
 	} else if (IS_GEMINILAKE(dev_priv)) {
 		required_version = GLK_CSR_VERSION_REQUIRED;
@@ -452,7 +455,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 	if (!HAS_CSR(dev_priv))
 		return;
 
-	if (IS_CANNONLAKE(dev_priv))
+	if (i915_modparams.dmc_firmware_path)
+		csr->fw_path = i915_modparams.dmc_firmware_path;
+	else if (IS_CANNONLAKE(dev_priv))
 		csr->fw_path = I915_CSR_CNL;
 	else if (IS_GEMINILAKE(dev_priv))
 		csr->fw_path = I915_CSR_GLK;
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.CHECKPATCH: warning for drm/i915: add support for specifying DMC firmware override by module param (rev3)

== Series Details ==

== Series Details ==

Series: drm/i915: add support for specifying DMC firmware override by module param (rev3)
URL : https://patchwork.freedesktop.org/series/34157/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
c62c2ab8334b drm/i915: add support for specifying DMC firmware override by module param
-:27: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis
#27: FILE: drivers/gpu/drm/i915/i915_params.c:168:
+i915_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, 37 lines checked

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✓ Fi.CI.BAT: success for drm/i915: add support for specifying DMC firmware override by module param (rev3)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: add support for specifying DMC firmware override by module param (rev3)
URL : https://patchwork.freedesktop.org/series/34157/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4086 -> Patchwork_8787 =

== Summary - SUCCESS ==

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/34157/revisions/3/mbox/

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@gem_exec_suspend@basic-s4-devices:
      fi-kbl-7500u:       PASS -> DMESG-WARN (fdo#105128)

    igt@gem_mmap_gtt@basic-small-bo-tiledx:
      fi-gdg-551:         PASS -> FAIL (fdo#102575)

    igt@kms_chamelium@dp-crc-fast:
      fi-kbl-7500u:       PASS -> DMESG-FAIL (fdo#103841)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-ivb-3520m:       PASS -> DMESG-WARN (fdo#106084)
      fi-cnl-psr:         PASS -> DMESG-WARN (fdo#104951)

    igt@prime_vgem@basic-fence-flip:
      fi-ilk-650:         PASS -> FAIL (fdo#104008)

    
    ==== Possible fixes ====

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-bxt-dsi:         INCOMPLETE (fdo#103927) -> PASS

fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103841 https://bugs.freedesktop.org/show_bug.cgi?id=103841
fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#105128 https://bugs.freedesktop.org/show_bug.cgi?id=105128
fdo#106084 https://bugs.freedesktop.org/show_bug.cgi?id=106084

== Participating hosts (36 -> 33) ==

Missing (3): fi-ctg-p8600 fi-ilk-m540 fi-skl-6700hq

== Build changes ==

* Linux: CI_DRM_4086 -> Patchwork_8787

CI_DRM_4086: 10d9666c9a49d47bcb5be8fa4116ef6508155aff @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4446: e5e8dafc991ee922ec159491c680caff0cfe9235 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8787: c62c2ab8334b83edcdda4c0f0d2672cd916c27b1 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4446: a2f486679f467cd6e82578384f56d4aabaa8cf2e @ git://anongit.freedesktop.org/piglit

== Linux commits ==

c62c2ab8334b drm/i915: add support for specifying DMC firmware override by module param

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8787/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

✓ Fi.CI.IGT: success for drm/i915: add support for specifying DMC firmware override by module param (rev3)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: add support for specifying DMC firmware override by module param (rev3)
URL : https://patchwork.freedesktop.org/series/34157/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4086_full -> Patchwork_8787_full =

== Summary - WARNING ==

Minor unknown changes coming with Patchwork_8787_full need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_8787_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://patchwork.freedesktop.org/api/1.0/series/34157/revisions/3/mbox/

== Possible new issues ==

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

=== IGT changes ===

    ==== Warnings ====

    igt@gem_exec_schedule@deep-vebox:
      shard-kbl:          PASS -> SKIP +2

    igt@gem_mocs_settings@mocs-rc6-blt:
      shard-kbl:          SKIP -> PASS +1

    igt@kms_plane@plane-panning-bottom-right-pipe-a-planes:
      shard-glk:          SKIP -> PASS +106

    igt@kms_plane@plane-panning-top-left-pipe-a-planes:
      shard-snb:          PASS -> SKIP

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@gem_eio@suspend:
      shard-hsw:          PASS -> DMESG-WARN (fdo#106086)

    igt@kms_cursor_legacy@flip-vs-cursor-varying-size:
      shard-hsw:          PASS -> FAIL (fdo#102670)

    igt@kms_flip@blocking-wf_vblank:
      shard-apl:          PASS -> FAIL (fdo#100368)

    igt@kms_flip@plain-flip-fb-recreate-interruptible:
      shard-glk:          SKIP -> FAIL (fdo#100368)

    
    ==== Possible fixes ====

    igt@kms_flip@flip-vs-absolute-wf_vblank-interruptible:
      shard-glk:          FAIL (fdo#100368) -> PASS

    igt@kms_flip@flip-vs-expired-vblank:
      shard-glk:          FAIL (fdo#102887, fdo#105363) -> PASS

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff:
      shard-apl:          FAIL (fdo#103167) -> PASS

    igt@kms_mmio_vs_cs_flip@setcrtc_vs_cs_flip:
      shard-kbl:          DMESG-WARN (fdo#105602, fdo#103558) -> PASS +9

fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
fdo#106086 https://bugs.freedesktop.org/show_bug.cgi?id=106086

== Participating hosts (6 -> 5) ==

Missing (1): shard-glkb

== Build changes ==

* Linux: CI_DRM_4086 -> Patchwork_8787

CI_DRM_4086: 10d9666c9a49d47bcb5be8fa4116ef6508155aff @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4446: e5e8dafc991ee922ec159491c680caff0cfe9235 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8787: c62c2ab8334b83edcdda4c0f0d2672cd916c27b1 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4446: a2f486679f467cd6e82578384f56d4aabaa8cf2e @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8787/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
In reply to Jani Nikula
Quoted 7 lines · Jani Nikula

Use i915.dmc_firmware_path to override default firmware for the platform and bypassing version checks.

v2: add missing param struct member declaration (David)

Re-tested against latest drm-tip; still works fine.

Quoted 65 lines
Cc Anusha Srivatsa <[email protected]>
Cc David Weinehall <[email protected]>
---
 drivers/gpu/drm/i915/i915_params.c | 3 +++
 drivers/gpu/drm/i915/i915_params.h | 1 +
 drivers/gpu/drm/i915/intel_csr.c   | 9 +++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +3 -0
index 08108ce5be21..66ea3552c63e 100644
@@ -164,6 +164,9 @@ 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(enable_dp_mst, bool, 0600,
 	"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)");
 
drivers/gpu/drm/i915/i915_params.h +1 -0
index c96360398072..6684025b7af8 100644
@@ -51,6 +51,7 @@ struct drm_printer;
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
+	param(char *, dmc_firmware_path, NULL) \
 	param(int, mmio_debug, 0) \
 	param(int, edp_vswing, 0) \
 	param(int, reset, 2) \
drivers/gpu/drm/i915/intel_csr.c +7 -2
index 41e6c75a7f3c..d81673250d3b 100644
@@ -297,7 +297,10 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
 	csr->version = css_header->version;
 
-	if (IS_CANNONLAKE(dev_priv)) {
+	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
+		/* Bypass version check for firmware override. */
+		required_version = csr->version;
+	} else if (IS_CANNONLAKE(dev_priv)) {
 		required_version = CNL_CSR_VERSION_REQUIRED;
 	} else if (IS_GEMINILAKE(dev_priv)) {
 		required_version = GLK_CSR_VERSION_REQUIRED;
@@ -452,7 +455,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 	if (!HAS_CSR(dev_priv))
 		return;
 
-	if (IS_CANNONLAKE(dev_priv))
+	if (i915_modparams.dmc_firmware_path)
+		csr->fw_path = i915_modparams.dmc_firmware_path;
+	else if (IS_CANNONLAKE(dev_priv))
 		csr->fw_path = I915_CSR_CNL;
 	else if (IS_GEMINILAKE(dev_priv))
 		csr->fw_path = I915_CSR_GLK;
Signature · 1 line
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
In reply to Jani Nikula
Quoted 10 lines · Jani Nikula

Use i915.dmc_firmware_path to override default firmware for the platform and bypassing version checks.

v2: add missing param struct member declaration (David)

So *I* don't need this patch. Please someone tell me this is useful to you, and I'll merge.

Thanks,
Jani.

Quoted 59 lines
---
 drivers/gpu/drm/i915/i915_params.c | 3 +++
 drivers/gpu/drm/i915/i915_params.h | 1 +
 drivers/gpu/drm/i915/intel_csr.c   | 9 +++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +3 -0
index 08108ce5be21..66ea3552c63e 100644
@@ -164,6 +164,9 @@ 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(enable_dp_mst, bool, 0600,
 	"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)");
 
drivers/gpu/drm/i915/i915_params.h +1 -0
index c96360398072..6684025b7af8 100644
@@ -51,6 +51,7 @@ struct drm_printer;
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
+	param(char *, dmc_firmware_path, NULL) \
 	param(int, mmio_debug, 0) \
 	param(int, edp_vswing, 0) \
 	param(int, reset, 2) \
drivers/gpu/drm/i915/intel_csr.c +7 -2
index 41e6c75a7f3c..d81673250d3b 100644
@@ -297,7 +297,10 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
 	csr->version = css_header->version;
 
-	if (IS_CANNONLAKE(dev_priv)) {
+	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
+		/* Bypass version check for firmware override. */
+		required_version = csr->version;
+	} else if (IS_CANNONLAKE(dev_priv)) {
 		required_version = CNL_CSR_VERSION_REQUIRED;
 	} else if (IS_GEMINILAKE(dev_priv)) {
 		required_version = GLK_CSR_VERSION_REQUIRED;
@@ -452,7 +455,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 	if (!HAS_CSR(dev_priv))
 		return;
 
-	if (IS_CANNONLAKE(dev_priv))
+	if (i915_modparams.dmc_firmware_path)
+		csr->fw_path = i915_modparams.dmc_firmware_path;
+	else if (IS_CANNONLAKE(dev_priv))
 		csr->fw_path = I915_CSR_CNL;
 	else if (IS_GEMINILAKE(dev_priv))
 		csr->fw_path = I915_CSR_GLK;
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw
Quoted 6 lines · Jani Nikula
Quoted 5 lines · Jani Nikula

Use i915.dmc_firmware_path to override default firmware for the platform and bypassing version checks.

v2: add missing param struct member declaration (David)

Quoted 8 lines
Quoted 5 lines

So *I* don't need this patch. Please someone tell me this is useful to you, and I'll merge.

It's useful for us (PnP team), and I believe Anusha has expressed interest too, correct?

Kind regards, David

Quoted 57 lines

Thanks,
Jani.

Quoted 52 lines
---
 drivers/gpu/drm/i915/i915_params.c | 3 +++
 drivers/gpu/drm/i915/i915_params.h | 1 +
 drivers/gpu/drm/i915/intel_csr.c   | 9 +++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +3 -0
index 08108ce5be21..66ea3552c63e 100644
@@ -164,6 +164,9 @@ 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(enable_dp_mst, bool, 0600,
 	"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)");
 
drivers/gpu/drm/i915/i915_params.h +1 -0
index c96360398072..6684025b7af8 100644
@@ -51,6 +51,7 @@ struct drm_printer;
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
+	param(char *, dmc_firmware_path, NULL) \
 	param(int, mmio_debug, 0) \
 	param(int, edp_vswing, 0) \
 	param(int, reset, 2) \
drivers/gpu/drm/i915/intel_csr.c +4 -1
index 41e6c75a7f3c..d81673250d3b 100644
@@ -297,7 +297,10 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
 	csr->version = css_header->version;
 
-	if (IS_CANNONLAKE(dev_priv)) {
+	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
+		/* Bypass version check for firmware override. */
+		required_version = csr->version;
+	} else if (IS_CANNONLAKE(dev_priv)) {
 		required_version = CNL_CSR_VERSION_REQUIRED;
 	} else if (IS_GEMINILAKE(dev_priv)) {
 		required_version = GLK_CSR_VERSION_REQUIRED;
@@ -452,7 +455,9 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 	if (!HAS_CSR(dev_priv))
 		return;
 
Quoted 10 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_csr.c +3 -1
-	if (IS_CANNONLAKE(dev_priv))
+	if (i915_modparams.dmc_firmware_path)
+		csr->fw_path = i915_modparams.dmc_firmware_path;
+	else if (IS_CANNONLAKE(dev_priv))
 		csr->fw_path = I915_CSR_CNL;
 	else if (IS_GEMINILAKE(dev_priv))
 		csr->fw_path = I915_CSR_GLK;
Signature · 1 line
Jani Nikula, Intel Open Source Technology Center

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw
In reply to Jani Nikula
Quoted 17 lines

-----Original Message-----
From: Nikula, Jani
Sent: Monday, April 30, 2018 3:47 AM
To: [email protected]
Cc: Srivatsa, Anusha <[email protected]>; David Weinehall <[email protected]>
Subject: Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param

Quoted 5 lines · Jani Nikula

Use i915.dmc_firmware_path to override default firmware for the platform and bypassing version checks.

v2: add missing param struct member declaration (David)

Quoted 8 lines
Quoted 5 lines

So *I* don't need this patch. Please someone tell me this is useful to you, and I'll merge.

Jani, we need this patch!. This will be very useful. I am glad it made back to the ML.

Anusha

Quoted 63 lines

Thanks,
Jani.

drivers/gpu/drm/i915/i915_params.c i915_param_named_unsafe(guc_firmware_path,

Quoted 12 lines
---
 drivers/gpu/drm/i915/i915_params.c | 3 +++
drivers/gpu/drm/i915/i915_params.h | 1 +
 drivers/gpu/drm/i915/intel_csr.c   | 9 +++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +0 -0
index 08108ce5be21..66ea3552c63e 100644
@@ -164,6 +164,9 @@ i915_param_named_unsafe(guc_firmware_path,

charp,

Quoted 40 lines
drivers/gpu/drm/i915/i915_params.c +3 -0
 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(enable_dp_mst, bool, 0600,
 	"Enable multi-stream transport (MST) for new DisplayPort sinks.
 (default: true)");
drivers/gpu/drm/i915/i915_params.h +1 -0
index c96360398072..6684025b7af8 100644
@@ -51,6 +51,7 @@ struct drm_printer;
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
+	param(char *, dmc_firmware_path, NULL) \
 	param(int, mmio_debug, 0) \
 	param(int, edp_vswing, 0) \
 	param(int, reset, 2) \
drivers/gpu/drm/i915/intel_csr.c +4 -1
index 41e6c75a7f3c..d81673250d3b 100644
@@ -297,7 +297,10 @@ static uint32_t *parse_csr_fw(struct
 drm_i915_private *dev_priv,
 
 	csr->version = css_header->version;
 
-	if (IS_CANNONLAKE(dev_priv)) {
+	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
+		/* Bypass version check for firmware override. */
+		required_version = csr->version;
+	} else if (IS_CANNONLAKE(dev_priv)) {
 		required_version = CNL_CSR_VERSION_REQUIRED;
 	} else if (IS_GEMINILAKE(dev_priv)) {
Quoted 1 line

required_version = GLK_CSR_VERSION_REQUIRED; @@ -452,7

+455,9 @@

Quoted 4 lines

void intel_csr_ucode_init(struct drm_i915_private *dev_priv)

drivers/gpu/drm/i915/intel_csr.c +0 -0
 	if (!HAS_CSR(dev_priv))
 		return;
Quoted 10 lines

drivers/gpu/drm/i915/intel_csr.c void intel_csr_ucode_init(struct drm_i915_private *dev_priv) · line 463

Quoted 7 lines
drivers/gpu/drm/i915/intel_csr.c +3 -1
-	if (IS_CANNONLAKE(dev_priv))
+	if (i915_modparams.dmc_firmware_path)
+		csr->fw_path = i915_modparams.dmc_firmware_path;
+	else if (IS_CANNONLAKE(dev_priv))
 		csr->fw_path = I915_CSR_CNL;
 	else if (IS_GEMINILAKE(dev_priv))
 		csr->fw_path = I915_CSR_GLK;

--
Jani Nikula, Intel Open Source Technology Center

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw
In reply to Jani Nikula
Quoted 11 lines

-----Original Message-----
From: Nikula, Jani
Sent: Monday, April 30, 2018 3:47 AM
To: [email protected]
Cc: Srivatsa, Anusha <[email protected]>; David Weinehall <[email protected]>
Subject: Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param

Quoted 11 lines
Quoted 10 lines · Jani Nikula

Use i915.dmc_firmware_path to override default firmware for the platform and bypassing version checks.

v2: add missing param struct member declaration (David)

Quoted 66 lines

So *I* don't need this patch. Please someone tell me this is useful to you, and I'll merge.

Thanks,
Jani.

drivers/gpu/drm/i915/i915_params.c i915_param_named_unsafe(guc_firmware_path,

Quoted 12 lines
---
 drivers/gpu/drm/i915/i915_params.c | 3 +++
drivers/gpu/drm/i915/i915_params.h | 1 +
 drivers/gpu/drm/i915/intel_csr.c   | 9 +++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +0 -0
index 08108ce5be21..66ea3552c63e 100644
@@ -164,6 +164,9 @@ i915_param_named_unsafe(guc_firmware_path,

charp,

Quoted 40 lines
drivers/gpu/drm/i915/i915_params.c +3 -0
 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(enable_dp_mst, bool, 0600,
 	"Enable multi-stream transport (MST) for new DisplayPort sinks.
 (default: true)");
drivers/gpu/drm/i915/i915_params.h +1 -0
index c96360398072..6684025b7af8 100644
@@ -51,6 +51,7 @@ struct drm_printer;
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
+	param(char *, dmc_firmware_path, NULL) \
 	param(int, mmio_debug, 0) \
 	param(int, edp_vswing, 0) \
 	param(int, reset, 2) \
drivers/gpu/drm/i915/intel_csr.c +4 -1
index 41e6c75a7f3c..d81673250d3b 100644
@@ -297,7 +297,10 @@ static uint32_t *parse_csr_fw(struct
 drm_i915_private *dev_priv,
 
 	csr->version = css_header->version;
 
-	if (IS_CANNONLAKE(dev_priv)) {
+	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
+		/* Bypass version check for firmware override. */
+		required_version = csr->version;
+	} else if (IS_CANNONLAKE(dev_priv)) {
 		required_version = CNL_CSR_VERSION_REQUIRED;
 	} else if (IS_GEMINILAKE(dev_priv)) {
Quoted 1 line

required_version = GLK_CSR_VERSION_REQUIRED; @@ -452,7

+455,9 @@

Quoted 4 lines

void intel_csr_ucode_init(struct drm_i915_private *dev_priv)

drivers/gpu/drm/i915/intel_csr.c +0 -0
 	if (!HAS_CSR(dev_priv))
 		return;
Quoted 10 lines

drivers/gpu/drm/i915/intel_csr.c void intel_csr_ucode_init(struct drm_i915_private *dev_priv) · line 463

Quoted 7 lines
drivers/gpu/drm/i915/intel_csr.c +3 -1
-	if (IS_CANNONLAKE(dev_priv))
+	if (i915_modparams.dmc_firmware_path)
+		csr->fw_path = i915_modparams.dmc_firmware_path;
+	else if (IS_CANNONLAKE(dev_priv))
 		csr->fw_path = I915_CSR_CNL;
 	else if (IS_GEMINILAKE(dev_priv))
 		csr->fw_path = I915_CSR_GLK;

--
Jani Nikula, Intel Open Source Technology Center

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw
Quoted 13 lines · Anusha
Quoted 13 lines

-----Original Message-----
From: Nikula, Jani
Sent: Monday, April 30, 2018 3:47 AM
To: [email protected]
Cc: Srivatsa, Anusha <[email protected]>; David Weinehall <[email protected]>
Subject: Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param

Quoted 3 lines · Jani Nikula

Use i915.dmc_firmware_path to override default firmware for the platform and bypassing version checks.

Quoted 8 lines
Quoted 7 lines
Quoted 7 lines

v2: add missing param struct member declaration (David)

Usually written Acked-by. But thanks, and thanks to David for testing and review, pushed to dinq.

BR,
Jani.

Quoted 77 lines
Quoted 77 lines

So *I* don't need this patch. Please someone tell me this is useful to you, and I'll merge.

Thanks,
Jani.

drivers/gpu/drm/i915/i915_params.c i915_param_named_unsafe(guc_firmware_path,

Quoted 12 lines
---
 drivers/gpu/drm/i915/i915_params.c | 3 +++
drivers/gpu/drm/i915/i915_params.h | 1 +
 drivers/gpu/drm/i915/intel_csr.c   | 9 +++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +0 -0
index 08108ce5be21..66ea3552c63e 100644
@@ -164,6 +164,9 @@ i915_param_named_unsafe(guc_firmware_path,

charp,

Quoted 40 lines
drivers/gpu/drm/i915/i915_params.c +3 -0
 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(enable_dp_mst, bool, 0600,
 	"Enable multi-stream transport (MST) for new DisplayPort sinks.
 (default: true)");
drivers/gpu/drm/i915/i915_params.h +1 -0
index c96360398072..6684025b7af8 100644
@@ -51,6 +51,7 @@ struct drm_printer;
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
+	param(char *, dmc_firmware_path, NULL) \
 	param(int, mmio_debug, 0) \
 	param(int, edp_vswing, 0) \
 	param(int, reset, 2) \
drivers/gpu/drm/i915/intel_csr.c +4 -1
index 41e6c75a7f3c..d81673250d3b 100644
@@ -297,7 +297,10 @@ static uint32_t *parse_csr_fw(struct
 drm_i915_private *dev_priv,
 
 	csr->version = css_header->version;
 
-	if (IS_CANNONLAKE(dev_priv)) {
+	if (csr->fw_path == i915_modparams.dmc_firmware_path) {
+		/* Bypass version check for firmware override. */
+		required_version = csr->version;
+	} else if (IS_CANNONLAKE(dev_priv)) {
 		required_version = CNL_CSR_VERSION_REQUIRED;
 	} else if (IS_GEMINILAKE(dev_priv)) {
Quoted 1 line

required_version = GLK_CSR_VERSION_REQUIRED; @@ -452,7

+455,9 @@

drivers/gpu/drm/i915/intel_csr.c void intel_csr_ucode_init(struct drm_i915_private *dev_priv) · line 463

Quoted 11 lines

void intel_csr_ucode_init(struct drm_i915_private *dev_priv)

drivers/gpu/drm/i915/intel_csr.c +3 -1
 	if (!HAS_CSR(dev_priv))
 		return;
 
-	if (IS_CANNONLAKE(dev_priv))
+	if (i915_modparams.dmc_firmware_path)
+		csr->fw_path = i915_modparams.dmc_firmware_path;
+	else if (IS_CANNONLAKE(dev_priv))
 		csr->fw_path = I915_CSR_CNL;
 	else if (IS_GEMINILAKE(dev_priv))
 		csr->fw_path = I915_CSR_GLK;

--
Jani Nikula, Intel Open Source Technology Center

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx