diff options
author | Michal Wajdeczko | 2018-06-28 16:15:21 +0200 |
---|---|---|
committer | Chris Wilson | 2018-06-28 23:51:33 +0200 |
commit | f7dc0157e4b5f23780559c6b71d3f7282f6c7f1b (patch) | |
tree | 0dffacb4d5b5e490cf5049470ad0743f6f60df41 /drivers/gpu/drm/i915/intel_huc.c | |
parent | drm/i915/guc: Use intel_guc_init_misc to hide GuC internals (diff) | |
download | kernel-qcow2-linux-f7dc0157e4b5f23780559c6b71d3f7282f6c7f1b.tar.gz kernel-qcow2-linux-f7dc0157e4b5f23780559c6b71d3f7282f6c7f1b.tar.xz kernel-qcow2-linux-f7dc0157e4b5f23780559c6b71d3f7282f6c7f1b.zip |
drm/i915/uc: Fetch GuC/HuC firmwares from guc/huc specific init
We're fetching GuC/HuC firmwares directly from uc level during
init_early stage but this breaks guc/huc struct isolation and
also strict SW-only initialization rule for init_early. Move fw
fetching to init phase and do it separately per guc/huc struct.
v2: don't forget to move wopcm_init - Michele
v3: fetch in init_misc phase - Michal
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michel Thierry <michel.thierry@intel.com>
Reviewed-by: Michel Thierry <michel.thierry@intel.com> #2
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180628141522.62788-2-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_huc.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_huc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c index 291285277403..ffcad5fad6a7 100644 --- a/drivers/gpu/drm/i915/intel_huc.c +++ b/drivers/gpu/drm/i915/intel_huc.c @@ -32,6 +32,14 @@ void intel_huc_init_early(struct intel_huc *huc) intel_huc_fw_init_early(huc); } +int intel_huc_init_misc(struct intel_huc *huc) +{ + struct drm_i915_private *i915 = huc_to_i915(huc); + + intel_uc_fw_fetch(i915, &huc->fw); + return 0; +} + /** * intel_huc_auth() - Authenticate HuC uCode * @huc: intel_huc structure |