Skip to contentSkip to conversation

drm/i915/csr: keep firmware name and required version together

PATCH In review Jani Nikula 3 participants 8 messages Sep 26, 2018 – Sep 27, 2018

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

PATCH v3 1/3 drm/i915/csr: keep firmware name and required version together

Having two separate if ladders gets increasingly hard to maintain. Put them together.

v2: Rebase

---
 drivers/gpu/drm/i915/i915_drv.h  |  1 +
 drivers/gpu/drm/i915/intel_csr.c | 59 ++++++++++++++++------------------------
 2 files changed, 25 insertions(+), 35 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 8624b4bdc242..37f5fcf1644d 100644
@@ -465,6 +465,7 @@ struct drm_i915_display_funcs {
 struct intel_csr {
 	struct work_struct work;
 	const char *fw_path;
+	uint32_t required_version;
 	uint32_t *dmc_payload;
 	uint32_t dmc_fw_size;
 	uint32_t version;
drivers/gpu/drm/i915/intel_csr.c +24 -35

89 lines not on this page · raw message

Signature · 6 lines
2.11.0

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

PATCH v3 2/3 drm/i915/csr: keep max firmware size together with firmare name and version

Move max firmware size to the same if ladder with firmware name and required version. This allows us to detect the missing max size for a platform without actually loading the firmware, and makes the whole thing easier to maintain.

We need to move the power get earlier to allow for early return in the missing platform case. While at it, extend the comment on why we return with the reference held on errors.

We also need to move the module parameter override later to reuse the max firmware size, which is independent of the override.

v2: Add comment on why we leak the wakeref on errors (Chris)

v3: Rebase

---
 drivers/gpu/drm/i915/i915_drv.h  |  3 ++-
 drivers/gpu/drm/i915/intel_csr.c | 46 +++++++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
index 37f5fcf1644d..9e185f0a822a 100644
@@ -466,8 +466,9 @@ struct intel_csr {
 	struct work_struct work;
 	const char *fw_path;
 	uint32_t required_version;
+	uint32_t max_fw_size; /* bytes */
 	uint32_t *dmc_payload;
-	uint32_t dmc_fw_size;
+	uint32_t dmc_fw_size; /* dwords */
 	uint32_t version;
 	uint32_t mmio_count;
 	i915_reg_t mmioaddr[8];
drivers/gpu/drm/i915/intel_csr.c +26 -20

83 lines not on this page · raw message

Signature · 6 lines
2.11.0

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

PATCH v3 3/3 drm/i915/csr: bypass firmware request on i915.dmc_firmware_path=""

In reply to Jani Nikula

With i915.dmc_firmware_path="" it's obvious the intention is to disable CSR firmware loading. Bypass the firmware request altogether in this case, with more obvious debug logging.

v2: Use DRM_INFO for logging (Chris)

---
 drivers/gpu/drm/i915/intel_csr.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_csr.c +6 -0
index b3a084c48a94..81935da9cd6b 100644
@@ -485,6 +485,12 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
 	}
 
 	if (i915_modparams.dmc_firmware_path) {
+		if (strlen(i915_modparams.dmc_firmware_path) == 0) {
+			csr->fw_path = NULL;
+			DRM_INFO("Disabling CSR firmare and runtime PM\n");
+			return;
+		}
+
 		csr->fw_path = i915_modparams.dmc_firmware_path;
 		/* Bypass version check for firmware override. */
 		csr->required_version = 0;
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 10 lines · Chris Wilson

Quoting Jani Nikula (2018-09-26 14:34:12)

Quoted 6 lines

Having two separate if ladders gets increasingly hard to maintain. Put them together.

v2: Rebase

Didn't spot anything wrong in the revisions, so keep the r-b on both patches.

Thanks for the quick check; I'll push once the CI overlords give me the green light.

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw
Quoted 7 lines · Jani Nikula
Quoted 6 lines · Chris Wilson

Quoting Jani Nikula (2018-09-26 14:34:12)

Quoted 5 lines

Having two separate if ladders gets increasingly hard to maintain. Put them together.

v2: Rebase

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Didn't spot anything wrong in the revisions, so keep the r-b on both patches.

Thanks for the quick check; I'll push once the CI overlords give me the green light.

And pushed, thanks.

BR,
Jani.

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

✗ Fi.CI.SPARSE: warning for series starting with [v3,1/3] drm/i915/csr: keep firmware name and required version together

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [v3,1/3] drm/i915/csr: keep firmware name and required version together
URL : https://patchwork.freedesktop.org/series/50215/
State : warning

== Summary ==

$ dim sparse origin/drm-tip
Commit: drm/i915/csr: keep firmware name and required version together
-drivers/gpu/drm/i915/selftests/../i915_drv.h:3718:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3719:16: warning: expression using sizeof(void)

Commit: drm/i915/csr: keep max firmware size together with firmare name and version -drivers/gpu/drm/i915/selftests/../i915_drv.h:3719:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3720:16: warning: expression using sizeof(void)

Commit: drm/i915/csr: bypass firmware request on i915.dmc_firmware_path="" Okay!

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

#7 lore raw

✓ Fi.CI.BAT: success for series starting with [v3,1/3] drm/i915/csr: keep firmware name and required version together

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: series starting with [v3,1/3] drm/i915/csr: keep firmware name and required version together
URL : https://patchwork.freedesktop.org/series/50215/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4882 -> Patchwork_10285 =

== Summary - SUCCESS ==

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/50215/revisions/1/mbox/

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@kms_flip@basic-flip-vs-modeset:
      fi-skl-6700hq:      PASS -> DMESG-WARN (fdo#105998)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-blb-e6850:       PASS -> INCOMPLETE (fdo#107718)

    igt@kms_psr@primary_page_flip:
      fi-cnl-u:           PASS -> FAIL (fdo#107336)

    
    ==== Possible fixes ====

    igt@kms_frontbuffer_tracking@basic:
      fi-byt-clapper:     FAIL (fdo#103167) -> PASS

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
      fi-byt-clapper:     FAIL (fdo#107362, fdo#103191) -> PASS

    igt@kms_psr@primary_page_flip:
      fi-kbl-r:           FAIL (fdo#107336) -> PASS

fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#105998 https://bugs.freedesktop.org/show_bug.cgi?id=105998
fdo#107336 https://bugs.freedesktop.org/show_bug.cgi?id=107336
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718

== Participating hosts (46 -> 42) ==

Additional (1): fi-snb-2520m
Missing (5): fi-bsw-cyan fi-ilk-m540 fi-byt-squawks fi-icl-u2 fi-hsw-4200u

== Build changes ==

* Linux: CI_DRM_4882 -> Patchwork_10285

CI_DRM_4882: ac10240c56532bc7ecbd3c2ba786cf2778bfff8b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4650: a6e21812d100dce68450727e79fc09e0c0033683 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10285: 2a2502d0bae8e73022c3e2644f727ffe9e4b6eb6 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

2a2502d0bae8 drm/i915/csr: bypass firmware request on i915.dmc_firmware_path="" 00284cb89dc5 drm/i915/csr: keep max firmware size together with firmare name and version a6b6fca90ce9 drm/i915/csr: keep firmware name and required version together

== Logs ==

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