diff options
| author | Michal Wajdeczko <michal.wajdeczko@intel.com> | 2019-08-16 20:56:58 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-08-16 23:45:54 +0100 |
| commit | 356c484822e6ac97dad6947c083fc45d07332c7c (patch) | |
| tree | e191cfec02c2017fb2a0e89f43be0a892144370d /drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | |
| parent | 4cb3b44d6b7185611a4f0fd613c05a9e57d7ad94 (diff) | |
| download | linux-stable-356c484822e6ac97dad6947c083fc45d07332c7c.tar.gz linux-stable-356c484822e6ac97dad6947c083fc45d07332c7c.tar.bz2 linux-stable-356c484822e6ac97dad6947c083fc45d07332c7c.zip | |
drm/i915/uc: Add explicit DISABLED state for firmware
We really need to have separate NOT_SUPPORTED state (for
lack of hardware support) and DISABLED state (to indicate
user decision) as we will have to take special steps even
if GuC firmware is now disabled but hardware exists and
could have been previously used.
v2: fix logic (Chris/CI)
v3: use proper check to avoid probe failure (CI)
v4: explain status transitions (Chris)
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
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/20190816205658.15020-1-michal.wajdeczko@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c index 96feca99322a..74602487ed67 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c @@ -35,7 +35,7 @@ void intel_huc_fw_init_early(struct intel_huc *huc) struct drm_i915_private *i915 = gt->i915; intel_uc_fw_init_early(&huc->fw, INTEL_UC_FW_TYPE_HUC, - intel_uc_supports_guc(uc), + intel_uc_uses_guc(uc), INTEL_INFO(i915)->platform, INTEL_REVID(i915)); } |