[Intel-gfx] [PATCH] drm/i915/uc: Extra info notice about FW version mis-match vs overrides

[John Harrison]

Oops. Ignore this email. Accidentally sent the same thing twice.

On 11/20/2019 16:31, John.C.Harrison at Intel.com wrote:
> From: John Harrison <John.C.Harrison at 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 at 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);