diff options
| author | Michal Wajdeczko | 2017-12-06 14:53:11 +0100 |
|---|---|---|
| committer | Chris Wilson | 2017-12-06 15:41:47 +0100 |
| commit | 0dd940c8cec444d1864788b654280f96863f6d73 (patch) | |
| tree | 108bb953176d6ce6d554029df8a8529040a22bdc /drivers/gpu/drm/i915/intel_uc.c | |
| parent | drm/i915/huc: Move firmware selection to init_early (diff) | |
| download | kernel-qcow2-linux-0dd940c8cec444d1864788b654280f96863f6d73.tar.gz kernel-qcow2-linux-0dd940c8cec444d1864788b654280f96863f6d73.tar.xz kernel-qcow2-linux-0dd940c8cec444d1864788b654280f96863f6d73.zip | |
drm/i915/guc: Move firmware selection to init_early
Doing GuC firmware path selection from sanitize_options function
is not perfect, while there is no problem with doing so during
early init stage as we already have all needed data.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171206135316.32556-2-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 95b524c9f8f3..4b7f2a78b378 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -65,7 +65,7 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv) /* Verify firmware version */ if (i915_modparams.enable_guc_loading) { - if (intel_guc_fw_select(&dev_priv->guc)) + if (!intel_uc_fw_is_selected(&dev_priv->guc.fw)) i915_modparams.enable_guc_loading = 0; } |