1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 3c8eaae13732..1aa85236b788 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -211,11 +211,13 @@ static void guc_params_init(struct drm_i915_private *dev_priv)
         params[GUC_CTL_FEATURE] |= GUC_CTL_DISABLE_SCHEDULER |
                         GUC_CTL_VCS2_ENABLED;
 
+        params[GUC_CTL_LOG_PARAMS] = guc->log.flags;
+
         if (i915.guc_log_level >= 0) {
-                params[GUC_CTL_LOG_PARAMS] = guc->log_flags;
                 params[GUC_CTL_DEBUG] =
                         i915.guc_log_level << GUC_LOG_VERBOSITY_SHIFT;
-        }
+        } else
+                params[GUC_CTL_DEBUG] = GUC_LOG_DISABLED;
 
         if (guc->ads_vma) {
                 u32 ads = i915_ggtt_offset(guc->ads_vma) >> PAGE_SHIFT;
@@ -483,6 +485,7 @@ int intel_guc_setup(struct drm_device *dev)
         }
 
         guc_interrupts_release(dev_priv);
+        gen9_reset_guc_interrupts(dev_priv);
 
         guc_fw->guc_fw_load_status = GUC_FIRMWARE_PENDING;
 
@@ -527,6 +530,9 @@ int intel_guc_setup(struct drm_device *dev)
                 intel_guc_fw_status_repr(guc_fw->guc_fw_load_status));
 
         if (i915.enable_guc_submission) {
+                if (i915.guc_log_level >= 0)
+                        gen9_enable_guc_interrupts(dev_priv);
+
                 err = i915_guc_submission_enable(dev_priv);
                 if (err)
                         goto fail;