public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/uc: Extra info notice about FW version mis-match vs overrides
@ 2019-11-21  0:31 John.C.Harrison
  2019-11-21  0:31 ` [Intel-gfx] " John.C.Harrison
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: John.C.Harrison @ 2019-11-21  0:31 UTC (permalink / raw)
  To: Intel-GFX

From: John Harrison <John.C.Harrison@Intel.com>

If a FW override is present then a version mis-match is actually
ignored. The warning message was still being printed, though. Which
could confuse people by implying that the load had failed due to the
mis-match when actually something else had failed.

This patch adds an extra message to say that the mis-match is being
ignored if an override is present.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 66a30ab7044a..c1ae807b07ae 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -361,6 +361,9 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw, struct drm_i915_private *i915)
 			err = -ENOEXEC;
 			goto fail;
 		}
+
+		dev_notice(dev, "%s firmware %s: Firmware override so ignoring version mis-match\n",
+			   intel_uc_fw_type_repr(uc_fw->type), uc_fw->path);
 	}
 
 	obj = i915_gem_object_create_shmem_from_data(i915, fw->data, fw->size);
-- 
2.21.0.5.gaeb582a983

_______________________________________________
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
* [PATCH] drm/i915/uc: Extra info notice about FW version mis-match vs overrides
@ 2019-11-21  0:27 John.C.Harrison
  2019-11-21 10:43 ` Michal Wajdeczko
  0 siblings, 1 reply; 10+ messages in thread
From: John.C.Harrison @ 2019-11-21  0:27 UTC (permalink / raw)
  To: Intel-GFX

From: John Harrison <John.C.Harrison@Intel.com>

If a FW override is present then a version mis-match is actually
ignored. The warning message was still being printed, though. Which
could confuse people by implying that the load had failed due to the
mis-match when actually something else had failed.

This patch adds an extra message to say that the mis-match is being
ignored if an override is present.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 66a30ab7044a..c1ae807b07ae 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -361,6 +361,9 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw, struct drm_i915_private *i915)
 			err = -ENOEXEC;
 			goto fail;
 		}
+
+		dev_notice(dev, "%s firmware %s: Firmware override so ignoring version mis-match\n",
+			   intel_uc_fw_type_repr(uc_fw->type), uc_fw->path);
 	}
 
 	obj = i915_gem_object_create_shmem_from_data(i915, fw->data, fw->size);
-- 
2.21.0.5.gaeb582a983

_______________________________________________
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

end of thread, other threads:[~2019-11-22  6:33 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-21  0:31 [PATCH] drm/i915/uc: Extra info notice about FW version mis-match vs overrides John.C.Harrison
2019-11-21  0:31 ` [Intel-gfx] " John.C.Harrison
2019-11-21  0:33 ` John Harrison
2019-11-21  0:33   ` [Intel-gfx] " John Harrison
2019-11-21  4:09 ` ✓ Fi.CI.BAT: success for drm/i915/uc: Extra info notice about FW version mis-match vs overrides (rev2) Patchwork
2019-11-21  4:09   ` [Intel-gfx] " Patchwork
2019-11-22  6:33 ` ✓ Fi.CI.IGT: " Patchwork
2019-11-22  6:33   ` [Intel-gfx] " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2019-11-21  0:27 [PATCH] drm/i915/uc: Extra info notice about FW version mis-match vs overrides John.C.Harrison
2019-11-21 10:43 ` Michal Wajdeczko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox