diff options
| author | Michal Wajdeczko | 2017-12-06 14:53:16 +0100 |
|---|---|---|
| committer | Chris Wilson | 2017-12-06 15:41:54 +0100 |
| commit | 0dfa1cee613e03cee295b8d1ed8130c84311b584 (patch) | |
| tree | 90c9bcf2a1d15542c2cfcdc7bdd6b2b864445c88 /drivers/gpu/drm/i915/intel_huc.h | |
| parent | drm/i915/guc: Combine enable_guc_loading|submission modparams (diff) | |
| download | kernel-qcow2-linux-0dfa1cee613e03cee295b8d1ed8130c84311b584.tar.gz kernel-qcow2-linux-0dfa1cee613e03cee295b8d1ed8130c84311b584.tar.xz kernel-qcow2-linux-0dfa1cee613e03cee295b8d1ed8130c84311b584.zip | |
drm/i915/huc: Load HuC only if requested
Our new "enable_guc" modparam allows to control whenever HuC
should be loaded. However existing code will try load and
authenticate HuC always when we use the GuC. This patch is
trying to enforce modparam selection.
v2: no need to cast PTR_ERR (Chris)
fetch/fini only if required (Michal)
fix wrong break (Sagar)
v3: add new goto label (Sagar)
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: Sagar Arun Kamble <sagar.a.kamble@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171206135316.32556-7-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_huc.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_huc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_huc.h b/drivers/gpu/drm/i915/intel_huc.h index 3d757bce9ce3..40039db59e04 100644 --- a/drivers/gpu/drm/i915/intel_huc.h +++ b/drivers/gpu/drm/i915/intel_huc.h @@ -35,7 +35,7 @@ struct intel_huc { }; void intel_huc_init_early(struct intel_huc *huc); -void intel_huc_init_hw(struct intel_huc *huc); -void intel_huc_auth(struct intel_huc *huc); +int intel_huc_init_hw(struct intel_huc *huc); +int intel_huc_auth(struct intel_huc *huc); #endif |