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 <[email protected]> Cc: Daniele Ceraolo Spurio <[email protected]> Cc: Chris Wilson <[email protected]> --- drivers/gpu/drm/i915/gt/uc/intel_uc.c | 11 +---------- 1 file changed, 1 insertion(+), 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); -- 2.19.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
