summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Wajdeczko <michal.wajdeczko@intel.com>2019-08-04 19:50:51 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2019-08-05 18:25:26 +0100
commit34f0a20fa4ea8ad08b2d1fd43fa6e2febb9a4eff (patch)
treea6eea97e9a3ec06f7d8039ff7f47394319d91456
parent2afc794c3ea026edcf4134b683e5c478073e8781 (diff)
drm/i915/uc: Remove redundant GuC support checks
Since commit db81bc6eb9c0 ("drm/i915/uc: Consider enable_guc modparam during fw selection") we have started using firmware status as main indicator of the GuC support. No need to use same checks twice. 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/20190804195052.31140-4-michal.wajdeczko@intel.com
-rw-r--r--drivers/gpu/drm/i915/gt/uc/intel_uc.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index fe526698eee2..1ddd252419ec 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -306,9 +306,6 @@ int intel_uc_init(struct intel_uc *uc)
if (!intel_uc_supports_guc(uc))
return 0;
- if (!intel_uc_fw_supported(&guc->fw))
- return -ENODEV;
-
/* XXX: GuC submission is unavailable for now */
GEM_BUG_ON(intel_uc_supports_guc_submission(uc));
@@ -336,8 +333,6 @@ void intel_uc_fini(struct intel_uc *uc)
if (!intel_uc_supports_guc(uc))
return;
- GEM_BUG_ON(!intel_uc_fw_supported(&guc->fw));
-
if (intel_uc_supports_huc(uc))
intel_huc_fini(&uc->huc);
@@ -351,7 +346,7 @@ static int __uc_sanitize(struct intel_uc *uc)
struct intel_guc *guc = &uc->guc;
struct intel_huc *huc = &uc->huc;
- GEM_BUG_ON(!intel_uc_fw_supported(&guc->fw));
+ GEM_BUG_ON(!intel_uc_supports_guc(uc));
intel_huc_sanitize(huc);
intel_guc_sanitize(guc);
@@ -429,8 +424,6 @@ int intel_uc_init_hw(struct intel_uc *uc)
if (!intel_uc_supports_guc(uc))
return 0;
- GEM_BUG_ON(!intel_uc_fw_supported(&guc->fw));
-
ret = uc_init_wopcm(uc);
if (ret)
goto err_out;
@@ -530,8 +523,6 @@ void intel_uc_fini_hw(struct intel_uc *uc)
if (!intel_guc_is_running(guc))
return;
- GEM_BUG_ON(!intel_uc_fw_supported(&guc->fw));
-
if (intel_uc_supports_guc_submission(uc))
intel_guc_submission_disable(guc);