drm/i915: Fix locking around GuC firmware load

[karo-tx-linux.git] / drivers / gpu / drm / i915 / i915_dma.c

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 2336af92d94bb5c5d3d101227cce4b8041feffb7..b4741d121a744f67b95f1d4af95fd0518e1ddf4f 100644 (file)
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -406,10 +406,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
         * working irqs for e.g. gmbus and dp aux transfers. */
        intel_modeset_init(dev);
 
-       /* intel_guc_ucode_init() needs the mutex to allocate GEM objects */
-       mutex_lock(&dev->struct_mutex);
        intel_guc_ucode_init(dev);
-       mutex_unlock(&dev->struct_mutex);
 
        ret = i915_gem_init(dev);
        if (ret)
@@ -452,9 +449,7 @@ cleanup_gem:
        i915_gem_context_fini(dev);
        mutex_unlock(&dev->struct_mutex);
 cleanup_irq:
-       mutex_lock(&dev->struct_mutex);
        intel_guc_ucode_fini(dev);
-       mutex_unlock(&dev->struct_mutex);
        drm_irq_uninstall(dev);
 cleanup_gem_stolen:
        i915_gem_cleanup_stolen(dev);
@@ -1193,8 +1188,8 @@ int i915_driver_unload(struct drm_device *dev)
        /* Flush any outstanding unpin_work. */
        flush_workqueue(dev_priv->wq);
 
-       mutex_lock(&dev->struct_mutex);
        intel_guc_ucode_fini(dev);
+       mutex_lock(&dev->struct_mutex);
        i915_gem_cleanup_ringbuffer(dev);
        i915_gem_context_fini(dev);
        mutex_unlock(&dev->struct_mutex);