drm/i915/guc: Use correct lock for accessing guc->mmio_msg

Guc->mmio_msg is set under the guc->irq_lock in guc_get_mmio_msg so it
should be consumed under the same lock from guc_handle_mmio_msg.

I am not sure if the overall flow here makes complete sense but at least
the correct lock is now used.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20201120095636.1987395-1-tvrtko.ursulin@linux.intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
index 4e6070e95fe9c7be9626b56a9ca8327eb03f4423..220626c3ad81bab1661b9ffd6b51277f305e30bf 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
@@ -175,19 +175,15 @@ static void guc_get_mmio_msg(struct intel_guc *guc)
 
 static void guc_handle_mmio_msg(struct intel_guc *guc)
 {
-       struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
-
        /* we need communication to be enabled to reply to GuC */
        GEM_BUG_ON(!guc_communication_enabled(guc));
 
-       if (!guc->mmio_msg)
-               return;
-
-       spin_lock_irq(&i915->irq_lock);
-       intel_guc_to_host_process_recv_msg(guc, &guc->mmio_msg, 1);
-       spin_unlock_irq(&i915->irq_lock);
-
-       guc->mmio_msg = 0;
+       spin_lock_irq(&guc->irq_lock);
+       if (guc->mmio_msg) {
+               intel_guc_to_host_process_recv_msg(guc, &guc->mmio_msg, 1);
+               guc->mmio_msg = 0;
+       }
+       spin_unlock_irq(&guc->irq_lock);
 }
 
 static void guc_reset_interrupts(struct intel_guc *guc)