| Message ID | 20170224154004.17821-7-arkadiusz.hiler@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Feb 24, 2017 at 04:40:00PM +0100, Arkadiusz Hiler wrote: > Let intel_guc_init_fw() focus on determining and fetching the correct > firmware. > > This patch introduces intel_uc_sanitize_options() that is called from > intel_sanitize_options(). > > Then, if we have GuC, we can call intel_guc_intel_fw() conditionally and Typo. > we do not have to do the internal checks. > > v2: fix comment, notify when nuking GuC explicitly enabled (M. Wajdeczko) > v3: fix comment again, change the nuke message (M. Wajdeczko) > v4: update title to reflect new function name + rebase > > Cc: Michal Winiarski <michal.winiarski@intel.com> > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> > --- > drivers/gpu/drm/i915/i915_drv.c | 2 ++ > drivers/gpu/drm/i915/intel_guc_loader.c | 14 -------------- > drivers/gpu/drm/i915/intel_uc.c | 28 +++++++++++++++++++++++++++- > drivers/gpu/drm/i915/intel_uc.h | 1 + > 4 files changed, 30 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 56624bf..7964e7f 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -993,6 +993,8 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv) > > i915.semaphores = intel_sanitize_semaphores(dev_priv, i915.semaphores); > DRM_DEBUG_DRIVER("use GPU semaphores? %s\n", yesno(i915.semaphores)); > + > + intel_uc_sanitize_options(dev_priv); > } > > /** > diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c > index 87b7a39..5bd1e4a 100644 > --- a/drivers/gpu/drm/i915/intel_guc_loader.c > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c > @@ -601,17 +601,6 @@ void intel_guc_init_fw(struct intel_guc *guc) > struct drm_i915_private *dev_priv = guc_to_i915(guc); > const char *fw_path; > > - if (!HAS_GUC(dev_priv)) { > - i915.enable_guc_loading = 0; > - i915.enable_guc_submission = 0; > - } else { > - /* A negative value means "use platform default" */ > - if (i915.enable_guc_loading < 0) > - i915.enable_guc_loading = HAS_GUC_UCODE(dev_priv); > - if (i915.enable_guc_submission < 0) > - i915.enable_guc_submission = HAS_GUC_SCHED(dev_priv); > - } > - > if (!HAS_GUC_UCODE(dev_priv)) { > fw_path = NULL; Hmm, once sanitized we should not reach this point. > } else if (IS_SKYLAKE(dev_priv)) { > @@ -634,9 +623,6 @@ void intel_guc_init_fw(struct intel_guc *guc) > guc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE; > guc->fw.load_status = INTEL_UC_FIRMWARE_NONE; > > - /* Early (and silent) return if GuC loading is disabled */ > - if (!i915.enable_guc_loading) > - return; > if (fw_path == NULL) > return; > if (*fw_path == '\0') > diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c > index 5c204e6..8f5aa58 100644 > --- a/drivers/gpu/drm/i915/intel_uc.c > +++ b/drivers/gpu/drm/i915/intel_uc.c > @@ -26,6 +26,27 @@ > #include "intel_uc.h" > #include <linux/firmware.h> > > +void intel_uc_sanitize_options(struct drm_i915_private *dev_priv) > +{ > + if (!HAS_GUC(dev_priv)) { > + if (i915.enable_guc_loading > 0) > + DRM_INFO("Ignoring GuC options, no hardware"); > + > + i915.enable_guc_loading = 0; > + i915.enable_guc_submission = 0; > + } else { > + /* A negative value means "use platform default" */ > + if (i915.enable_guc_loading < 0) > + i915.enable_guc_loading = HAS_GUC_UCODE(dev_priv); > + if (i915.enable_guc_submission < 0) > + i915.enable_guc_submission = HAS_GUC_SCHED(dev_priv); > + > + /* can't enable guc submission without guc loaded */ s/can't/Can't > + if (!i915.enable_guc_loading) > + i915.enable_guc_submission = 0; > + } > +} > + > void intel_uc_init_early(struct drm_i915_private *dev_priv) > { > mutex_init(&dev_priv->guc.send_mutex); > @@ -33,7 +54,12 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv) > > void intel_uc_init_fw(struct drm_i915_private *dev_priv) > { > - intel_huc_init_fw(&dev_priv->huc); > + if (!i915.enable_guc_loading) > + return; > + > + if (HAS_HUC_UCODE(dev_priv)) > + intel_huc_init_fw(&dev_priv->huc); Did you removed corresponding "if(HAS_HUC_UCODE)" from huc_init_fw function ? In patch 05/10 it was still there. -Michal > + > intel_guc_init_fw(&dev_priv->guc); > } > > diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h > index 221f169..f8d8816 100644 > --- a/drivers/gpu/drm/i915/intel_uc.h > +++ b/drivers/gpu/drm/i915/intel_uc.h > @@ -184,6 +184,7 @@ struct intel_huc { > }; > > /* intel_uc.c */ > +void intel_uc_sanitize_options(struct drm_i915_private *dev_priv); > void intel_uc_init_early(struct drm_i915_private *dev_priv); > void intel_uc_init_fw(struct drm_i915_private *dev_priv); > int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len); > -- > 2.9.3 >
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 56624bf..7964e7f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -993,6 +993,8 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv) i915.semaphores = intel_sanitize_semaphores(dev_priv, i915.semaphores); DRM_DEBUG_DRIVER("use GPU semaphores? %s\n", yesno(i915.semaphores)); + + intel_uc_sanitize_options(dev_priv); } /** diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c index 87b7a39..5bd1e4a 100644 --- a/drivers/gpu/drm/i915/intel_guc_loader.c +++ b/drivers/gpu/drm/i915/intel_guc_loader.c @@ -601,17 +601,6 @@ void intel_guc_init_fw(struct intel_guc *guc) struct drm_i915_private *dev_priv = guc_to_i915(guc); const char *fw_path; - if (!HAS_GUC(dev_priv)) { - i915.enable_guc_loading = 0; - i915.enable_guc_submission = 0; - } else { - /* A negative value means "use platform default" */ - if (i915.enable_guc_loading < 0) - i915.enable_guc_loading = HAS_GUC_UCODE(dev_priv); - if (i915.enable_guc_submission < 0) - i915.enable_guc_submission = HAS_GUC_SCHED(dev_priv); - } - if (!HAS_GUC_UCODE(dev_priv)) { fw_path = NULL; } else if (IS_SKYLAKE(dev_priv)) { @@ -634,9 +623,6 @@ void intel_guc_init_fw(struct intel_guc *guc) guc->fw.fetch_status = INTEL_UC_FIRMWARE_NONE; guc->fw.load_status = INTEL_UC_FIRMWARE_NONE; - /* Early (and silent) return if GuC loading is disabled */ - if (!i915.enable_guc_loading) - return; if (fw_path == NULL) return; if (*fw_path == '\0') diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 5c204e6..8f5aa58 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -26,6 +26,27 @@ #include "intel_uc.h" #include <linux/firmware.h> +void intel_uc_sanitize_options(struct drm_i915_private *dev_priv) +{ + if (!HAS_GUC(dev_priv)) { + if (i915.enable_guc_loading > 0) + DRM_INFO("Ignoring GuC options, no hardware"); + + i915.enable_guc_loading = 0; + i915.enable_guc_submission = 0; + } else { + /* A negative value means "use platform default" */ + if (i915.enable_guc_loading < 0) + i915.enable_guc_loading = HAS_GUC_UCODE(dev_priv); + if (i915.enable_guc_submission < 0) + i915.enable_guc_submission = HAS_GUC_SCHED(dev_priv); + + /* can't enable guc submission without guc loaded */ + if (!i915.enable_guc_loading) + i915.enable_guc_submission = 0; + } +} + void intel_uc_init_early(struct drm_i915_private *dev_priv) { mutex_init(&dev_priv->guc.send_mutex); @@ -33,7 +54,12 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv) void intel_uc_init_fw(struct drm_i915_private *dev_priv) { - intel_huc_init_fw(&dev_priv->huc); + if (!i915.enable_guc_loading) + return; + + if (HAS_HUC_UCODE(dev_priv)) + intel_huc_init_fw(&dev_priv->huc); + intel_guc_init_fw(&dev_priv->guc); } diff --git a/drivers/gpu/drm/i915/intel_uc.h b/drivers/gpu/drm/i915/intel_uc.h index 221f169..f8d8816 100644 --- a/drivers/gpu/drm/i915/intel_uc.h +++ b/drivers/gpu/drm/i915/intel_uc.h @@ -184,6 +184,7 @@ struct intel_huc { }; /* intel_uc.c */ +void intel_uc_sanitize_options(struct drm_i915_private *dev_priv); void intel_uc_init_early(struct drm_i915_private *dev_priv); void intel_uc_init_fw(struct drm_i915_private *dev_priv); int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len);
Let intel_guc_init_fw() focus on determining and fetching the correct firmware. This patch introduces intel_uc_sanitize_options() that is called from intel_sanitize_options(). Then, if we have GuC, we can call intel_guc_intel_fw() conditionally and we do not have to do the internal checks. v2: fix comment, notify when nuking GuC explicitly enabled (M. Wajdeczko) v3: fix comment again, change the nuke message (M. Wajdeczko) v4: update title to reflect new function name + rebase Cc: Michal Winiarski <michal.winiarski@intel.com> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com> --- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/intel_guc_loader.c | 14 -------------- drivers/gpu/drm/i915/intel_uc.c | 28 +++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_uc.h | 1 + 4 files changed, 30 insertions(+), 15 deletions(-)