| Message ID | 20171010145135.3488-8-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Michal Wajdeczko (2017-10-10 15:51:31) > Guc status message printed right after firmware upload may be too > optimistic, as we may fail on subsequent steps. Move that message > to the end of intel_uc_init_hw where we know the status for sure. > > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com> > --- > drivers/gpu/drm/i915/intel_guc_fw.c | 6 ------ > drivers/gpu/drm/i915/intel_uc.c | 6 ++++++ > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c > index 020ce26..51be318 100644 > --- a/drivers/gpu/drm/i915/intel_guc_fw.c > +++ b/drivers/gpu/drm/i915/intel_guc_fw.c > @@ -294,11 +294,5 @@ int intel_guc_fw_upload(struct intel_guc *guc) > > guc->fw.load_status = INTEL_UC_FIRMWARE_SUCCESS; > > - DRM_INFO("GuC %s (firmware %s [version %u.%u])\n", > - i915_modparams.enable_guc_submission ? "submission enabled" : > - "loaded", > - guc->fw.path, > - guc->fw.major_ver_found, guc->fw.minor_ver_found); > - > return 0; > } > diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c > index 048f5c4..7dd7546 100644 > --- a/drivers/gpu/drm/i915/intel_uc.c > +++ b/drivers/gpu/drm/i915/intel_uc.c > @@ -222,6 +222,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) > goto err_interrupts; > } > > + DRM_INFO("GuC %s (firmware %s [version %u.%u])\n", > + i915_modparams.enable_guc_submission ? "submission enabled" : > + "loaded", > + guc->fw.path, > + guc->fw.major_ver_found, guc->fw.minor_ver_found); Can we also polish it to DRM_DEV_INFO(&dev_priv->dev, ...) ? And does it really need intel_uc_init_hw in the user facing message? i.e. just a plain dev_info()? -Chris
diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c index 020ce26..51be318 100644 --- a/drivers/gpu/drm/i915/intel_guc_fw.c +++ b/drivers/gpu/drm/i915/intel_guc_fw.c @@ -294,11 +294,5 @@ int intel_guc_fw_upload(struct intel_guc *guc) guc->fw.load_status = INTEL_UC_FIRMWARE_SUCCESS; - DRM_INFO("GuC %s (firmware %s [version %u.%u])\n", - i915_modparams.enable_guc_submission ? "submission enabled" : - "loaded", - guc->fw.path, - guc->fw.major_ver_found, guc->fw.minor_ver_found); - return 0; } diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 048f5c4..7dd7546 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -222,6 +222,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) goto err_interrupts; } + DRM_INFO("GuC %s (firmware %s [version %u.%u])\n", + i915_modparams.enable_guc_submission ? "submission enabled" : + "loaded", + guc->fw.path, + guc->fw.major_ver_found, guc->fw.minor_ver_found); + return 0; /*
Guc status message printed right after firmware upload may be too optimistic, as we may fail on subsequent steps. Move that message to the end of intel_uc_init_hw where we know the status for sure. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com> --- drivers/gpu/drm/i915/intel_guc_fw.c | 6 ------ drivers/gpu/drm/i915/intel_uc.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)