Merge tag 'trace-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gt / uc / intel_uc.c

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 6abb8f2..6d8b923 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -23,7 +23,7 @@ static void uc_expand_default_options(struct intel_uc *uc)
                return;
 
        /* Don't enable GuC/HuC on pre-Gen12 */
-       if (INTEL_GEN(i915) < 12) {
+       if (GRAPHICS_VER(i915) < 12) {
                i915->params.enable_guc = 0;
                return;
        }
@@ -467,7 +467,7 @@ static int __uc_init_hw(struct intel_uc *uc)
 
        /* WaEnableuKernelHeaderValidFix:skl */
        /* WaEnableGuCBootHashCheckNotSet:skl,bxt,kbl */
-       if (IS_GEN(i915, 9))
+       if (GRAPHICS_VER(i915) == 9)
                attempts = 3;
        else
                attempts = 1;
@@ -502,10 +502,6 @@ static int __uc_init_hw(struct intel_uc *uc)
 
        intel_huc_auth(huc);
 
-       ret = intel_guc_sample_forcewake(guc);
-       if (ret)
-               goto err_communication;
-
        if (intel_uc_uses_guc_submission(uc))
                intel_guc_submission_enable(guc);
 
@@ -529,8 +525,6 @@ static int __uc_init_hw(struct intel_uc *uc)
        /*
         * We've failed to load the firmware :(
         */
-err_communication:
-       guc_disable_communication(guc);
 err_log_capture:
        __uc_capture_load_err_log(uc);
 err_out:
@@ -558,9 +552,6 @@ static void __uc_fini_hw(struct intel_uc *uc)
        if (intel_uc_uses_guc_submission(uc))
                intel_guc_submission_disable(guc);
 
-       if (guc_communication_enabled(guc))
-               guc_disable_communication(guc);
-
        __uc_sanitize(uc);
 }
 
@@ -577,7 +568,6 @@ void intel_uc_reset_prepare(struct intel_uc *uc)
        if (!intel_guc_is_ready(guc))
                return;
 
-       guc_disable_communication(guc);
        __uc_sanitize(uc);
 }