* [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param
@ 2018-04-24 12:20 Jani Nikula
2018-04-24 13:46 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: add support for specifying DMC firmware override by module param (rev3) Patchwork
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Jani Nikula @ 2018-04-24 12:20 UTC (permalink / raw)
To: intel-gfx; +Cc: 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)
Tested-by: David Weinehall <david.weinehall@linux.intel.com>
Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Cc: David Weinehall <david.weinehall@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
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(-)
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
index 08108ce5be21..66ea3552c63e 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
@@ -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)");
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index c96360398072..6684025b7af8 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -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) \
diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
index 41e6c75a7f3c..d81673250d3b 100644
--- a/drivers/gpu/drm/i915/intel_csr.c
+++ b/drivers/gpu/drm/i915/intel_csr.c
@@ -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;
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 10+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: add support for specifying DMC firmware override by module param (rev3)
2018-04-24 12:20 [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param Jani Nikula
@ 2018-04-24 13:46 ` Patchwork
2018-04-24 14:01 ` ✓ Fi.CI.BAT: success " Patchwork
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2018-04-24 13:46 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: add support for specifying DMC firmware override by module param (rev3)
2018-04-24 12:20 [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param Jani Nikula
2018-04-24 13:46 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: add support for specifying DMC firmware override by module param (rev3) Patchwork
@ 2018-04-24 14:01 ` Patchwork
2018-04-24 17:44 ` ✓ Fi.CI.IGT: " Patchwork
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2018-04-24 14:01 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* ✓ Fi.CI.IGT: success for drm/i915: add support for specifying DMC firmware override by module param (rev3)
2018-04-24 12:20 [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param Jani Nikula
2018-04-24 13:46 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: add support for specifying DMC firmware override by module param (rev3) Patchwork
2018-04-24 14:01 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2018-04-24 17:44 ` Patchwork
2018-04-27 14:08 ` [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param David Weinehall
2018-04-30 10:47 ` Jani Nikula
4 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2018-04-24 17:44 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param
2018-04-24 12:20 [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param Jani Nikula
` (2 preceding siblings ...)
2018-04-24 17:44 ` ✓ Fi.CI.IGT: " Patchwork
@ 2018-04-27 14:08 ` David Weinehall
2018-04-30 10:47 ` Jani Nikula
4 siblings, 0 replies; 10+ messages in thread
From: David Weinehall @ 2018-04-27 14:08 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Tue, Apr 24, 2018 at 03:20:16PM +0300, Jani Nikula wrote:
> Use i915.dmc_firmware_path to override default firmware for the platform
> and bypassing version checks.
>
> v2: add missing param struct member declaration (David)
>
> Tested-by: David Weinehall <david.weinehall@linux.intel.com>
> Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
Re-tested against latest drm-tip; still works fine.
> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> Cc: David Weinehall <david.weinehall@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> index 08108ce5be21..66ea3552c63e 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -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)");
>
> diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
> index c96360398072..6684025b7af8 100644
> --- a/drivers/gpu/drm/i915/i915_params.h
> +++ b/drivers/gpu/drm/i915/i915_params.h
> @@ -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) \
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index 41e6c75a7f3c..d81673250d3b 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -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;
> --
> 2.11.0
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param
2018-04-24 12:20 [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param Jani Nikula
` (3 preceding siblings ...)
2018-04-27 14:08 ` [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param David Weinehall
@ 2018-04-30 10:47 ` Jani Nikula
2018-04-30 12:45 ` David Weinehall
` (2 more replies)
4 siblings, 3 replies; 10+ messages in thread
From: Jani Nikula @ 2018-04-30 10:47 UTC (permalink / raw)
To: intel-gfx
On Tue, 24 Apr 2018, Jani Nikula <jani.nikula@intel.com> wrote:
> Use i915.dmc_firmware_path to override default firmware for the platform
> and bypassing version checks.
>
> v2: add missing param struct member declaration (David)
>
> Tested-by: David Weinehall <david.weinehall@linux.intel.com>
> Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> Cc: David Weinehall <david.weinehall@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
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 | 3 +++
> drivers/gpu/drm/i915/i915_params.h | 1 +
> drivers/gpu/drm/i915/intel_csr.c | 9 +++++++--
> 3 files changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> index 08108ce5be21..66ea3552c63e 100644
> --- a/drivers/gpu/drm/i915/i915_params.c
> +++ b/drivers/gpu/drm/i915/i915_params.c
> @@ -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)");
>
> diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
> index c96360398072..6684025b7af8 100644
> --- a/drivers/gpu/drm/i915/i915_params.h
> +++ b/drivers/gpu/drm/i915/i915_params.h
> @@ -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) \
> diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> index 41e6c75a7f3c..d81673250d3b 100644
> --- a/drivers/gpu/drm/i915/intel_csr.c
> +++ b/drivers/gpu/drm/i915/intel_csr.c
> @@ -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;
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param
2018-04-30 10:47 ` Jani Nikula
@ 2018-04-30 12:45 ` David Weinehall
2018-04-30 18:00 ` Srivatsa, Anusha
2018-04-30 18:14 ` Srivatsa, Anusha
2 siblings, 0 replies; 10+ messages in thread
From: David Weinehall @ 2018-04-30 12:45 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Mon, Apr 30, 2018 at 01:47:15PM +0300, Jani Nikula wrote:
> On Tue, 24 Apr 2018, Jani Nikula <jani.nikula@intel.com> wrote:
> > Use i915.dmc_firmware_path to override default firmware for the platform
> > and bypassing version checks.
> >
> > v2: add missing param struct member declaration (David)
> >
> > Tested-by: David Weinehall <david.weinehall@linux.intel.com>
> > Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
> > Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> > Cc: David Weinehall <david.weinehall@linux.intel.com>
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> 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
>
> Thanks,
> Jani.
>
>
> > ---
> > 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(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
> > index 08108ce5be21..66ea3552c63e 100644
> > --- a/drivers/gpu/drm/i915/i915_params.c
> > +++ b/drivers/gpu/drm/i915/i915_params.c
> > @@ -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)");
> >
> > diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
> > index c96360398072..6684025b7af8 100644
> > --- a/drivers/gpu/drm/i915/i915_params.h
> > +++ b/drivers/gpu/drm/i915/i915_params.h
> > @@ -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) \
> > diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c
> > index 41e6c75a7f3c..d81673250d3b 100644
> > --- a/drivers/gpu/drm/i915/intel_csr.c
> > +++ b/drivers/gpu/drm/i915/intel_csr.c
> > @@ -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;
>
> --
> Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param
2018-04-30 10:47 ` Jani Nikula
2018-04-30 12:45 ` David Weinehall
@ 2018-04-30 18:00 ` Srivatsa, Anusha
2018-04-30 18:14 ` Srivatsa, Anusha
2 siblings, 0 replies; 10+ messages in thread
From: Srivatsa, Anusha @ 2018-04-30 18:00 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx
>-----Original Message-----
>From: Nikula, Jani
>Sent: Monday, April 30, 2018 3:47 AM
>To: intel-gfx@lists.freedesktop.org
>Cc: Srivatsa, Anusha <anusha.srivatsa@intel.com>; David Weinehall
><david.weinehall@linux.intel.com>
>Subject: Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC
>firmware override by module param
>
>On Tue, 24 Apr 2018, Jani Nikula <jani.nikula@intel.com> wrote:
>> Use i915.dmc_firmware_path to override default firmware for the
>> platform and bypassing version checks.
>>
>> v2: add missing param struct member declaration (David)
>>
>> Tested-by: David Weinehall <david.weinehall@linux.intel.com>
>> Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
>> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> Cc: David Weinehall <david.weinehall@linux.intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
>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
>Thanks,
>Jani.
>
>
>> ---
>> 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(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_params.c
>> b/drivers/gpu/drm/i915/i915_params.c
>> index 08108ce5be21..66ea3552c63e 100644
>> --- a/drivers/gpu/drm/i915/i915_params.c
>> +++ b/drivers/gpu/drm/i915/i915_params.c
>> @@ -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)");
>>
>> diff --git a/drivers/gpu/drm/i915/i915_params.h
>> b/drivers/gpu/drm/i915/i915_params.h
>> index c96360398072..6684025b7af8 100644
>> --- a/drivers/gpu/drm/i915/i915_params.h
>> +++ b/drivers/gpu/drm/i915/i915_params.h
>> @@ -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) \
>> diff --git a/drivers/gpu/drm/i915/intel_csr.c
>> b/drivers/gpu/drm/i915/intel_csr.c
>> index 41e6c75a7f3c..d81673250d3b 100644
>> --- a/drivers/gpu/drm/i915/intel_csr.c
>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>> @@ -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;
>
>--
>Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param
2018-04-30 10:47 ` Jani Nikula
2018-04-30 12:45 ` David Weinehall
2018-04-30 18:00 ` Srivatsa, Anusha
@ 2018-04-30 18:14 ` Srivatsa, Anusha
2018-05-02 10:13 ` Jani Nikula
2 siblings, 1 reply; 10+ messages in thread
From: Srivatsa, Anusha @ 2018-04-30 18:14 UTC (permalink / raw)
To: Nikula, Jani, intel-gfx
>-----Original Message-----
>From: Nikula, Jani
>Sent: Monday, April 30, 2018 3:47 AM
>To: intel-gfx@lists.freedesktop.org
>Cc: Srivatsa, Anusha <anusha.srivatsa@intel.com>; David Weinehall
><david.weinehall@linux.intel.com>
>Subject: Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC
>firmware override by module param
>
>On Tue, 24 Apr 2018, Jani Nikula <jani.nikula@intel.com> wrote:
>> Use i915.dmc_firmware_path to override default firmware for the
>> platform and bypassing version checks.
>>
>> v2: add missing param struct member declaration (David)
>>
>> Tested-by: David Weinehall <david.weinehall@linux.intel.com>
>> Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
>> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> Cc: David Weinehall <david.weinehall@linux.intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Ack-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>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 | 3 +++
>> drivers/gpu/drm/i915/i915_params.h | 1 +
>> drivers/gpu/drm/i915/intel_csr.c | 9 +++++++--
>> 3 files changed, 11 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_params.c
>> b/drivers/gpu/drm/i915/i915_params.c
>> index 08108ce5be21..66ea3552c63e 100644
>> --- a/drivers/gpu/drm/i915/i915_params.c
>> +++ b/drivers/gpu/drm/i915/i915_params.c
>> @@ -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)");
>>
>> diff --git a/drivers/gpu/drm/i915/i915_params.h
>> b/drivers/gpu/drm/i915/i915_params.h
>> index c96360398072..6684025b7af8 100644
>> --- a/drivers/gpu/drm/i915/i915_params.h
>> +++ b/drivers/gpu/drm/i915/i915_params.h
>> @@ -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) \
>> diff --git a/drivers/gpu/drm/i915/intel_csr.c
>> b/drivers/gpu/drm/i915/intel_csr.c
>> index 41e6c75a7f3c..d81673250d3b 100644
>> --- a/drivers/gpu/drm/i915/intel_csr.c
>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>> @@ -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;
>
>--
>Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param
2018-04-30 18:14 ` Srivatsa, Anusha
@ 2018-05-02 10:13 ` Jani Nikula
0 siblings, 0 replies; 10+ messages in thread
From: Jani Nikula @ 2018-05-02 10:13 UTC (permalink / raw)
To: Srivatsa, Anusha, intel-gfx
On Mon, 30 Apr 2018, "Srivatsa, Anusha" <anusha.srivatsa@intel.com> wrote:
>>-----Original Message-----
>>From: Nikula, Jani
>>Sent: Monday, April 30, 2018 3:47 AM
>>To: intel-gfx@lists.freedesktop.org
>>Cc: Srivatsa, Anusha <anusha.srivatsa@intel.com>; David Weinehall
>><david.weinehall@linux.intel.com>
>>Subject: Re: [PATCH v2 RESEND] drm/i915: add support for specifying DMC
>>firmware override by module param
>>
>>On Tue, 24 Apr 2018, Jani Nikula <jani.nikula@intel.com> wrote:
>>> Use i915.dmc_firmware_path to override default firmware for the
>>> platform and bypassing version checks.
>>>
>>> v2: add missing param struct member declaration (David)
>>>
>>> Tested-by: David Weinehall <david.weinehall@linux.intel.com>
>>> Reviewed-by: David Weinehall <david.weinehall@linux.intel.com>
>>> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
>>> Cc: David Weinehall <david.weinehall@linux.intel.com>
>>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> Ack-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Usually written Acked-by. But thanks, and thanks to David for testing
and review, pushed to dinq.
BR,
Jani.
>
>>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 | 3 +++
>>> drivers/gpu/drm/i915/i915_params.h | 1 +
>>> drivers/gpu/drm/i915/intel_csr.c | 9 +++++++--
>>> 3 files changed, 11 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_params.c
>>> b/drivers/gpu/drm/i915/i915_params.c
>>> index 08108ce5be21..66ea3552c63e 100644
>>> --- a/drivers/gpu/drm/i915/i915_params.c
>>> +++ b/drivers/gpu/drm/i915/i915_params.c
>>> @@ -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)");
>>>
>>> diff --git a/drivers/gpu/drm/i915/i915_params.h
>>> b/drivers/gpu/drm/i915/i915_params.h
>>> index c96360398072..6684025b7af8 100644
>>> --- a/drivers/gpu/drm/i915/i915_params.h
>>> +++ b/drivers/gpu/drm/i915/i915_params.h
>>> @@ -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) \
>>> diff --git a/drivers/gpu/drm/i915/intel_csr.c
>>> b/drivers/gpu/drm/i915/intel_csr.c
>>> index 41e6c75a7f3c..d81673250d3b 100644
>>> --- a/drivers/gpu/drm/i915/intel_csr.c
>>> +++ b/drivers/gpu/drm/i915/intel_csr.c
>>> @@ -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;
>>
>>--
>>Jani Nikula, Intel Open Source Technology Center
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-05-02 10:10 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-24 12:20 [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param Jani Nikula
2018-04-24 13:46 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: add support for specifying DMC firmware override by module param (rev3) Patchwork
2018-04-24 14:01 ` ✓ Fi.CI.BAT: success " Patchwork
2018-04-24 17:44 ` ✓ Fi.CI.IGT: " Patchwork
2018-04-27 14:08 ` [PATCH v2 RESEND] drm/i915: add support for specifying DMC firmware override by module param David Weinehall
2018-04-30 10:47 ` Jani Nikula
2018-04-30 12:45 ` David Weinehall
2018-04-30 18:00 ` Srivatsa, Anusha
2018-04-30 18:14 ` Srivatsa, Anusha
2018-05-02 10:13 ` Jani Nikula
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.