Skip to contentSkip to conversation

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

PATCH Superseded Jani Nikula 3 participants 12 messages Sep 6, 2018

Subsystems (2)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 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.

---
 drivers/gpu/drm/i915/i915_drv.h  |  1 +
 drivers/gpu/drm/i915/intel_csr.c | 54 ++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 767615ecdea5..368066010f94 100644
@@ -464,6 +464,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 +22 -32

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
#1 lore raw

PATCH 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. We also need to move the module parameter override later to reuse the max firmware size, which is independent of the override. Note how this works with gen 11+ which don't have a specified firmware blob yet, but do have a maximum size.

---
 drivers/gpu/drm/i915/i915_drv.h  |  3 ++-
 drivers/gpu/drm/i915/intel_csr.c | 41 +++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
index 368066010f94..62444f4c3c8e 100644
@@ -465,8 +465,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 +22 -19

76 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
Reviewed-by on v1 2/3
#2 lore raw

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

Quoting Jani Nikula (2018-09-06 09:21:25)

Quoted 22 lines

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. We also need to move the module parameter override later to reuse the max firmware size, which is independent of the override. Note how this works with gen 11+ which don't have a specified firmware blob yet, but do have a maximum size.

---
 drivers/gpu/drm/i915/i915_drv.h  |  3 ++-
 drivers/gpu/drm/i915/intel_csr.c | 41 +++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -0
index 368066010f94..62444f4c3c8e 100644

drivers/gpu/drm/i915/i915_drv.h struct intel_csr { · line 470

Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -465,8 +465,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 */

Appreciated.

Quoted 19 lines
drivers/gpu/drm/i915/i915_drv.h +0 -0
        uint32_t version;
        uint32_t mmio_count;
        i915_reg_t mmioaddr[8];
drivers/gpu/drm/i915/intel_csr.c +0 -1
index 9a60bb9cc443..956ac8bbf5e4 100644
@@ -281,7 +281,6 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
        struct intel_csr *csr = &dev_priv->csr;
        const struct stepping_info *si = intel_get_stepping_info(dev_priv);
        uint32_t dmc_offset = CSR_DEFAULT_FW_OFFSET, readcount = 0, nbytes;
-       uint32_t max_fw_size = 0;
        uint32_t i;
        uint32_t *dmc_payload;
 
@@ -378,15 +377,7 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
        /* fw_size is in dwords, so multiplied by 4 to convert into bytes. */
        nbytes = dmc_header->fw_size * 4;

drivers/gpu/drm/i915/intel_csr.c static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, · line 380

Quoted 10 lines
drivers/gpu/drm/i915/intel_csr.c +1 -9
-       if (INTEL_GEN(dev_priv) >= 11)
-               max_fw_size = ICL_CSR_MAX_FW_SIZE;
-       else if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
-               max_fw_size = GLK_CSR_MAX_FW_SIZE;
-       else if (IS_GEN9(dev_priv))
-               max_fw_size = BXT_CSR_MAX_FW_SIZE;
-       else
-               MISSING_CASE(INTEL_REVID(dev_priv));
-       if (nbytes > max_fw_size) {
+       if (nbytes > csr->max_fw_size) {

Ok.

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +0 -0
                DRM_ERROR("DMC FW too big (%u bytes)\n", nbytes);
                return NULL;
        }

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

Quoted 10 lines
drivers/gpu/drm/i915/intel_csr.c +3 -4
@@ -451,32 +442,44 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
        if (!HAS_CSR(dev_priv))
                return;
 
-       if (i915_modparams.dmc_firmware_path) {
-               csr->fw_path = i915_modparams.dmc_firmware_path;
-               /* Bypass version check for firmware override. */
-               csr->required_version = 0;
+       /*
+        * Obtain a runtime pm reference, until CSR is loaded,
+        * to avoid entering runtime-suspend.

* On error, we return with the rpm wakeref held to prevent
* runtime suspend as runtime suspend *requires* a working
* CSR for whatever reason.

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

Quoted 2 lines
drivers/gpu/drm/i915/intel_csr.c +2 -0
+        */
+       intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);

A reminder that the leak is by design. Bonus points for integrating with the wakeref tracking so that we demonstrate we aren't just leaking for the fun of it.

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

Quoted 2 lines
drivers/gpu/drm/i915/intel_csr.c +2 -0
+       if (INTEL_GEN(dev_priv) >= 11) {
+               csr->max_fw_size = ICL_CSR_MAX_FW_SIZE;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
        } else if (IS_CANNONLAKE(dev_priv)) {
                csr->fw_path = I915_CSR_CNL;
                csr->required_version = CNL_CSR_VERSION_REQUIRED;
+               csr->max_fw_size = GLK_CSR_MAX_FW_SIZE;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
        } else if (IS_GEMINILAKE(dev_priv)) {
                csr->fw_path = I915_CSR_GLK;
                csr->required_version = GLK_CSR_VERSION_REQUIRED;
+               csr->max_fw_size = GLK_CSR_MAX_FW_SIZE;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
        } else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
                csr->fw_path = I915_CSR_KBL;
                csr->required_version = KBL_CSR_VERSION_REQUIRED;
+               csr->max_fw_size = BXT_CSR_MAX_FW_SIZE;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
        } else if (IS_SKYLAKE(dev_priv)) {
                csr->fw_path = I915_CSR_SKL;
                csr->required_version = SKL_CSR_VERSION_REQUIRED;
+               csr->max_fw_size = BXT_CSR_MAX_FW_SIZE;

Ok, but interesting naming scheme.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
        } else if (IS_BROXTON(dev_priv)) {
                csr->fw_path = I915_CSR_BXT;
                csr->required_version = BXT_CSR_VERSION_REQUIRED;
+               csr->max_fw_size = BXT_CSR_MAX_FW_SIZE;

Ok.

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

Quoted 3 lines
drivers/gpu/drm/i915/intel_csr.c +3 -0
+       } else {
+               MISSING_CASE(INTEL_REVID(dev_priv));
+               return;

Hmm. Feels like this should be retrofitted to patch 1, but whatever.

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

Quoted 12 lines
drivers/gpu/drm/i915/intel_csr.c +5 -5
        }
 
-       /*
-        * Obtain a runtime pm reference, until CSR is loaded,
-        * to avoid entering runtime-suspend.
-        */
-       intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);
+       if (i915_modparams.dmc_firmware_path) {
+               csr->fw_path = i915_modparams.dmc_firmware_path;
+               /* Bypass version check for firmware override. */
+               csr->required_version = 0;
+       }

Ok.

Please add the comment describing the intentional leak,

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

#3 lore raw

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

Quoted 110 lines · Chris Wilson

Quoting Jani Nikula (2018-09-06 09:21:25)

Quoted 22 lines

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. We also need to move the module parameter override later to reuse the max firmware size, which is independent of the override. Note how this works with gen 11+ which don't have a specified firmware blob yet, but do have a maximum size.

---
 drivers/gpu/drm/i915/i915_drv.h  |  3 ++-
 drivers/gpu/drm/i915/intel_csr.c | 41 +++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -0
index 368066010f94..62444f4c3c8e 100644

drivers/gpu/drm/i915/i915_drv.h struct intel_csr { · line 470

Quoted 7 lines
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -465,8 +465,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 */

Appreciated.

Quoted 19 lines
drivers/gpu/drm/i915/i915_drv.h +0 -0
        uint32_t version;
        uint32_t mmio_count;
        i915_reg_t mmioaddr[8];
drivers/gpu/drm/i915/intel_csr.c +0 -1
index 9a60bb9cc443..956ac8bbf5e4 100644
@@ -281,7 +281,6 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
        struct intel_csr *csr = &dev_priv->csr;
        const struct stepping_info *si = intel_get_stepping_info(dev_priv);
        uint32_t dmc_offset = CSR_DEFAULT_FW_OFFSET, readcount = 0, nbytes;
-       uint32_t max_fw_size = 0;
        uint32_t i;
        uint32_t *dmc_payload;
 
@@ -378,15 +377,7 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
 
        /* fw_size is in dwords, so multiplied by 4 to convert into bytes. */
        nbytes = dmc_header->fw_size * 4;

drivers/gpu/drm/i915/intel_csr.c static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, · line 380

Quoted 10 lines
drivers/gpu/drm/i915/intel_csr.c +1 -9
-       if (INTEL_GEN(dev_priv) >= 11)
-               max_fw_size = ICL_CSR_MAX_FW_SIZE;
-       else if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
-               max_fw_size = GLK_CSR_MAX_FW_SIZE;
-       else if (IS_GEN9(dev_priv))
-               max_fw_size = BXT_CSR_MAX_FW_SIZE;
-       else
-               MISSING_CASE(INTEL_REVID(dev_priv));
-       if (nbytes > max_fw_size) {
+       if (nbytes > csr->max_fw_size) {

Ok.

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +0 -0
                DRM_ERROR("DMC FW too big (%u bytes)\n", nbytes);
                return NULL;
        }

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

Quoted 10 lines
drivers/gpu/drm/i915/intel_csr.c +3 -4
@@ -451,32 +442,44 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
        if (!HAS_CSR(dev_priv))
                return;
 
-       if (i915_modparams.dmc_firmware_path) {
-               csr->fw_path = i915_modparams.dmc_firmware_path;
-               /* Bypass version check for firmware override. */
-               csr->required_version = 0;
+       /*
+        * Obtain a runtime pm reference, until CSR is loaded,
+        * to avoid entering runtime-suspend.

* On error, we return with the rpm wakeref held to prevent
* runtime suspend as runtime suspend *requires* a working
* CSR for whatever reason.

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

Quoted 2 lines
drivers/gpu/drm/i915/intel_csr.c +2 -0
+        */
+       intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);

A reminder that the leak is by design. Bonus points for integrating with the wakeref tracking so that we demonstrate we aren't just leaking for the fun of it.

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

Quoted 2 lines
drivers/gpu/drm/i915/intel_csr.c +2 -0
+       if (INTEL_GEN(dev_priv) >= 11) {
+               csr->max_fw_size = ICL_CSR_MAX_FW_SIZE;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
        } else if (IS_CANNONLAKE(dev_priv)) {
                csr->fw_path = I915_CSR_CNL;
                csr->required_version = CNL_CSR_VERSION_REQUIRED;
+               csr->max_fw_size = GLK_CSR_MAX_FW_SIZE;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
        } else if (IS_GEMINILAKE(dev_priv)) {
                csr->fw_path = I915_CSR_GLK;
                csr->required_version = GLK_CSR_VERSION_REQUIRED;
+               csr->max_fw_size = GLK_CSR_MAX_FW_SIZE;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
        } else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
                csr->fw_path = I915_CSR_KBL;
                csr->required_version = KBL_CSR_VERSION_REQUIRED;
+               csr->max_fw_size = BXT_CSR_MAX_FW_SIZE;
Quoted 7 lines

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
        } else if (IS_SKYLAKE(dev_priv)) {
                csr->fw_path = I915_CSR_SKL;
                csr->required_version = SKL_CSR_VERSION_REQUIRED;
+               csr->max_fw_size = BXT_CSR_MAX_FW_SIZE;

Ok, but interesting naming scheme.

I know... but decided to not open that can of worms.

Quoted 6 lines

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

Quoted 5 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
        } else if (IS_BROXTON(dev_priv)) {
                csr->fw_path = I915_CSR_BXT;
                csr->required_version = BXT_CSR_VERSION_REQUIRED;
+               csr->max_fw_size = BXT_CSR_MAX_FW_SIZE;
Quoted 7 lines

Ok.

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

Quoted 3 lines
drivers/gpu/drm/i915/intel_csr.c +3 -0
+       } else {
+               MISSING_CASE(INTEL_REVID(dev_priv));
+               return;

Hmm. Feels like this should be retrofitted to patch 1, but whatever.

That doesn't sit well with gen 11+ until we move the max size here too.

Quoted 13 lines

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

Quoted 12 lines
drivers/gpu/drm/i915/intel_csr.c +5 -5
        }
 
-       /*
-        * Obtain a runtime pm reference, until CSR is loaded,
-        * to avoid entering runtime-suspend.
-        */
-       intel_display_power_get(dev_priv, POWER_DOMAIN_INIT);
+       if (i915_modparams.dmc_firmware_path) {
+               csr->fw_path = i915_modparams.dmc_firmware_path;
+               /* Bypass version check for firmware override. */
+               csr->required_version = 0;
+       }
Quoted 4 lines

Ok.

Please add the comment describing the intentional leak,

Will fix, thanks for the review.

BR,
Jani.

Quoted 1 line

-Chris

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

PATCH 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.

---
 drivers/gpu/drm/i915/intel_csr.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_csr.c +6 -0
index 956ac8bbf5e4..dbaeffddb5e7 100644
@@ -476,6 +476,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_DEBUG_KMS("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
#5 lore raw

Re: [PATCH 3/3] drm/i915/csr: bypass firmware request on i915.dmc_firmware_path=""

Quoting Jani Nikula (2018-09-06 09:21:26)

Quoted 14 lines

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.

---
 drivers/gpu/drm/i915/intel_csr.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_csr.c +0 -0
index 956ac8bbf5e4..dbaeffddb5e7 100644

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

Quoted 6 lines
drivers/gpu/drm/i915/intel_csr.c +3 -0
@@ -476,6 +476,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_DEBUG_KMS("Disabling CSR firmare and runtime PM\n");

In response to a user parameter, could even be DRM_INFO(). -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by
#6 lore raw

Re: [PATCH 3/3] drm/i915/csr: bypass firmware request on i915.dmc_firmware_path=""

Quoting Chris Wilson (2018-09-06 10:08:37)

Quoted 17 lines

Quoting Jani Nikula (2018-09-06 09:21:26)

Quoted 16 lines

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.

---
 drivers/gpu/drm/i915/intel_csr.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/intel_csr.c +0 -0
index 956ac8bbf5e4..dbaeffddb5e7 100644
@@ -476,6 +476,12 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
        }
 
Quoted 6 lines

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +3 -0
        if (i915_modparams.dmc_firmware_path) {
+               if (strlen(i915_modparams.dmc_firmware_path) == 0) {
+                       csr->fw_path = NULL;
+                       DRM_DEBUG_KMS("Disabling CSR firmare and runtime PM\n");

In response to a user parameter, could even be DRM_INFO().

Either way (but my preference here is for DRM_INFO),

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

#7 lore raw

✗ Fi.CI.SPARSE: warning for series starting with [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 [1/3] drm/i915/csr: keep firmware name and required version together
URL : https://patchwork.freedesktop.org/series/49256/
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:3688:16: warning: expression using sizeof(void)
+drivers/gpu/drm/i915/selftests/../i915_drv.h:3689: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:3689:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3690: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

#8 lore raw
In reply to Jani Nikula

Quoting Jani Nikula (2018-09-06 09:21:24)

Quoted 2 lines

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

Does it even have to be an if-ladder? Something like

struct platform_requirements {
	unsigned long platform_mask;
	u32 required_version;
	const char *path;
} [];

How does that work by patch 3?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw
Quoted 4 lines · Chris Wilson

Quoting Jani Nikula (2018-09-06 09:21:24)

Quoted 2 lines

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

Quoted 8 lines

Does it even have to be an if-ladder? Something like

struct platform_requirements {
	unsigned long platform_mask;
	u32 required_version;
	const char *path;
} [];

How does that work by patch 3?

I expect this to evolve to the same kind of thing as the PCH detection and checks where you can't get away with a simple platform mask, and you have to resort to an if ladder. Or you need separate match functions, which get unwieldy without lambda functions.

Also, I think we may need to have several firmware blobs per platform that get requested in sequence, to allow for more graceful updates. In any case, I think grouping this stuff together is a good first step.

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
#10 lore raw

✗ Fi.CI.BAT: failure for series starting with [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 [1/3] drm/i915/csr: keep firmware name and required version together
URL : https://patchwork.freedesktop.org/series/49256/
State : failure

== Summary ==

= CI Bug Log - changes from CI_DRM_4778 -> Patchwork_10107 =

== Summary - FAILURE ==

Serious unknown changes coming with Patchwork_10107 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_10107, 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/49256/revisions/1/mbox/

== Possible new issues ==

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

=== IGT changes ===

    ==== Possible regressions ====

    igt@kms_psr@primary_page_flip:
      fi-kbl-r:           PASS -> FAIL

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_coherency:
      fi-gdg-551:         PASS -> DMESG-FAIL (fdo#107164)

    igt@drv_selftest@live_hangcheck:
      fi-kbl-guc:         PASS -> DMESG-FAIL (fdo#106560, fdo#107837)

    igt@gem_exec_suspend@basic-s3:
      fi-blb-e6850:       PASS -> INCOMPLETE (fdo#107718)

    igt@kms_psr@primary_page_flip:
      fi-icl-u:           NOTRUN -> FAIL (fdo#107383) +3

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

    
    ==== Possible fixes ====

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

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

fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#107164 https://bugs.freedesktop.org/show_bug.cgi?id=107164
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107383 https://bugs.freedesktop.org/show_bug.cgi?id=107383
fdo#107718 https://bugs.freedesktop.org/show_bug.cgi?id=107718
fdo#107837 https://bugs.freedesktop.org/show_bug.cgi?id=107837

== Participating hosts (53 -> 49) ==

Additional (1): fi-icl-u
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u

== Build changes ==

* Linux: CI_DRM_4778 -> Patchwork_10107

CI_DRM_4778: 456cfc52e9f12423c6e597f677d8acb05851c3e3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4631: 8884101aa01aedee01b2c3d0ac075473384551b7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_10107: 2475ce20b41d4d37edacba420d5ae1f475f37807 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

2475ce20b41d drm/i915/csr: bypass firmware request on i915.dmc_firmware_path="" 6f9a15361f00 drm/i915/csr: keep max firmware size together with firmare name and version c232905796cd 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_10107/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/3
#11 lore raw
In reply to Jani Nikula

Quoting Jani Nikula (2018-09-06 09:21:24)

Quoted 64 lines

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

---
 drivers/gpu/drm/i915/i915_drv.h  |  1 +
 drivers/gpu/drm/i915/intel_csr.c | 54 ++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 32 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -0
index 767615ecdea5..368066010f94 100644
@@ -464,6 +464,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 +2 -24
index 14cf4c367e36..9a60bb9cc443 100644
@@ -284,7 +284,6 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
        uint32_t max_fw_size = 0;
        uint32_t i;
        uint32_t *dmc_payload;
-       uint32_t required_version;
 
        if (!fw)
                return NULL;
@@ -299,36 +298,19 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,
                return NULL;
        }
 
-       csr->version = css_header->version;
-
-       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;
-       } else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
-               required_version = KBL_CSR_VERSION_REQUIRED;
-       } else if (IS_SKYLAKE(dev_priv)) {
-               required_version = SKL_CSR_VERSION_REQUIRED;
-       } else if (IS_BROXTON(dev_priv)) {
-               required_version = BXT_CSR_VERSION_REQUIRED;
-       } else {
-               MISSING_CASE(INTEL_REVID(dev_priv));
-               required_version = 0;
-       }
-
-       if (csr->version != required_version) {
+       if (csr->required_version &&
+           css_header->version != csr->required_version) {
                DRM_INFO("Refusing to load DMC firmware v%u.%u,"
                         " please use v%u.%u\n",
-                        CSR_VERSION_MAJOR(csr->version),
-                        CSR_VERSION_MINOR(csr->version),

drivers/gpu/drm/i915/intel_csr.c static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, · line 312

Quoted 10 lines
drivers/gpu/drm/i915/intel_csr.c +5 -2
-                        CSR_VERSION_MAJOR(required_version),
-                        CSR_VERSION_MINOR(required_version));
+                        CSR_VERSION_MAJOR(css_header->version),
+                        CSR_VERSION_MINOR(css_header->version),
+                        CSR_VERSION_MAJOR(csr->required_version),
+                        CSR_VERSION_MINOR(csr->required_version));
                return NULL;
        }
 
+       csr->version = css_header->version;

Ok, so far.

Quoted 5 lines
drivers/gpu/drm/i915/intel_csr.c +1 -0
+
        readcount += sizeof(struct intel_css_header);
 
        /* Extract Package Header information*/

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

Quoted 9 lines
drivers/gpu/drm/i915/intel_csr.c +3 -2
@@ -469,18 +451,26 @@ void intel_csr_ucode_init(struct drm_i915_private *dev_priv)
        if (!HAS_CSR(dev_priv))
                return;
 
-       if (i915_modparams.dmc_firmware_path)
+       if (i915_modparams.dmc_firmware_path) {
                csr->fw_path = i915_modparams.dmc_firmware_path;
-       else if (IS_CANNONLAKE(dev_priv))
+               /* Bypass version check for firmware override. */
+               csr->required_version = 0;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +2 -1
+       } else if (IS_CANNONLAKE(dev_priv)) {
                csr->fw_path = I915_CSR_CNL;
-       else if (IS_GEMINILAKE(dev_priv))
+               csr->required_version = CNL_CSR_VERSION_REQUIRED;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +2 -1
+       } else if (IS_GEMINILAKE(dev_priv)) {
                csr->fw_path = I915_CSR_GLK;
-       else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv))
+               csr->required_version = GLK_CSR_VERSION_REQUIRED;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +2 -1
+       } else if (IS_KABYLAKE(dev_priv) || IS_COFFEELAKE(dev_priv)) {
                csr->fw_path = I915_CSR_KBL;
-       else if (IS_SKYLAKE(dev_priv))
+               csr->required_version = KBL_CSR_VERSION_REQUIRED;

Ok.

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

Quoted 4 lines
drivers/gpu/drm/i915/intel_csr.c +2 -1
+       } else if (IS_SKYLAKE(dev_priv)) {
                csr->fw_path = I915_CSR_SKL;
-       else if (IS_BROXTON(dev_priv))
+               csr->required_version = SKL_CSR_VERSION_REQUIRED;

Ok.

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

Quoted 3 lines
drivers/gpu/drm/i915/intel_csr.c +2 -0
+       } else if (IS_BROXTON(dev_priv)) {
                csr->fw_path = I915_CSR_BXT;
+               csr->required_version = BXT_CSR_VERSION_REQUIRED;

Ok.

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