| Message ID | 20190108150246.1471-1-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4] drm/i915: Downgrade scare message for unknown HuC firmware | expand |
On Tue, 08 Jan 2019 16:02:46 +0100, Chris Wilson <chris@chris-wilson.co.uk> wrote: > If we haven't shipped and enabled firmware for a particular platform, > there is nothing the user can do about it. Don't scare the user with an > unactionable, unidentifiable warning! > > <6> [310.769452] i915 0000:00:02.0: GuC: No firmware known for this > platform! > <4> [310.769458] [drm] HuC: No firmware known for this platform! > > Unify both GuC/HuC messages to include the device for which we lack the > firmware, and provide the platform name as an aide-memoire. > > v2: Move and refine the message to common site of intel_uc_fw_fetch. > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> > --- Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Thanks, Michal
Quoting Michal Wajdeczko (2019-01-08 22:33:18) > On Tue, 08 Jan 2019 16:02:46 +0100, Chris Wilson > <chris@chris-wilson.co.uk> wrote: > > > If we haven't shipped and enabled firmware for a particular platform, > > there is nothing the user can do about it. Don't scare the user with an > > unactionable, unidentifiable warning! > > > > <6> [310.769452] i915 0000:00:02.0: GuC: No firmware known for this > > platform! > > <4> [310.769458] [drm] HuC: No firmware known for this platform! > > > > Unify both GuC/HuC messages to include the device for which we lack the > > firmware, and provide the platform name as an aide-memoire. > > > > v2: Move and refine the message to common site of intel_uc_fw_fetch. > > > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> > > --- > Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Ta, fwiw this brings us one step closer to turning off dmesg filtering ala https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2194/ -Chris
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c index 4b437e05e2cd..13ff7003c6be 100644 --- a/drivers/gpu/drm/i915/intel_guc_fw.c +++ b/drivers/gpu/drm/i915/intel_guc_fw.c @@ -77,10 +77,6 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw) guc_fw->path = I915_KBL_GUC_UCODE; guc_fw->major_ver_wanted = KBL_FW_MAJOR; guc_fw->minor_ver_wanted = KBL_FW_MINOR; - } else { - dev_info(dev_priv->drm.dev, - "%s: No firmware known for this platform!\n", - intel_uc_fw_type_repr(guc_fw->type)); } } diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c index 9612227b3c44..7d7bfc7f7ca7 100644 --- a/drivers/gpu/drm/i915/intel_huc_fw.c +++ b/drivers/gpu/drm/i915/intel_huc_fw.c @@ -76,9 +76,6 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw) huc_fw->path = I915_KBL_HUC_UCODE; huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR; huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR; - } else { - DRM_WARN("%s: No firmware known for this platform!\n", - intel_uc_fw_type_repr(huc_fw->type)); } } diff --git a/drivers/gpu/drm/i915/intel_uc_fw.c b/drivers/gpu/drm/i915/intel_uc_fw.c index fd496416087c..becf05ebae4d 100644 --- a/drivers/gpu/drm/i915/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/intel_uc_fw.c @@ -46,12 +46,17 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, size_t size; int err; + if (!uc_fw->path) { + dev_info(dev_priv->drm.dev, + "%s: No firmware was defined for %s!\n", + intel_uc_fw_type_repr(uc_fw->type), + intel_platform_name(INTEL_INFO(dev_priv)->platform)); + return; + } + DRM_DEBUG_DRIVER("%s fw fetch %s\n", intel_uc_fw_type_repr(uc_fw->type), uc_fw->path); - if (!uc_fw->path) - return; - uc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING; DRM_DEBUG_DRIVER("%s fw fetch %s\n", intel_uc_fw_type_repr(uc_fw->type),
If we haven't shipped and enabled firmware for a particular platform, there is nothing the user can do about it. Don't scare the user with an unactionable, unidentifiable warning! <6> [310.769452] i915 0000:00:02.0: GuC: No firmware known for this platform! <4> [310.769458] [drm] HuC: No firmware known for this platform! Unify both GuC/HuC messages to include the device for which we lack the firmware, and provide the platform name as an aide-memoire. v2: Move and refine the message to common site of intel_uc_fw_fetch. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> --- drivers/gpu/drm/i915/intel_guc_fw.c | 4 ---- drivers/gpu/drm/i915/intel_huc_fw.c | 3 --- drivers/gpu/drm/i915/intel_uc_fw.c | 11 ++++++++--- 3 files changed, 8 insertions(+), 10 deletions(-)