summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_dma.c
diff options
context:
space:
mode:
authorJani Nikula2013-07-25 11:44:34 +0200
committerDaniel Vetter2013-07-25 15:39:15 +0200
commit14c5cec5d0cd73e7e9d4fbea2bbfeea8f3ade871 (patch)
treed76b677dbeddbf1186f9cd6479c081320615b1b3 /drivers/gpu/drm/i915/i915_dma.c
parentdrm/i915: fix hdmi portclock limits (diff)
downloadkernel-qcow2-linux-14c5cec5d0cd73e7e9d4fbea2bbfeea8f3ade871.tar.gz
kernel-qcow2-linux-14c5cec5d0cd73e7e9d4fbea2bbfeea8f3ade871.tar.xz
kernel-qcow2-linux-14c5cec5d0cd73e7e9d4fbea2bbfeea8f3ade871.zip
drm/i915: initialize gt_lock early with other spin locks
commit 181d1b9e31c668259d3798c521672afb8edd355c Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Sun Jul 21 13:16:24 2013 +0200 drm/i915: fix up gt init sequence fallout moved dev_priv->gt_lock initialization after use. Do the initialization much earlier with other spin lock initializations. Reported-by: Sedat Dilek <sedat.dilek@gmail.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Tested-by: Sedat Dilek <sedat.dilek@gmail.com> Cc: stable@vger.kernel.org (since the regressing patch is also cc: stable) Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
-rw-r--r--drivers/gpu/drm/i915/i915_dma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 67ec54f67afe..b1520682cb23 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1498,6 +1498,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
spin_lock_init(&dev_priv->irq_lock);
spin_lock_init(&dev_priv->gpu_error.lock);
spin_lock_init(&dev_priv->rps.lock);
+ spin_lock_init(&dev_priv->gt_lock);
spin_lock_init(&dev_priv->backlight.lock);
mutex_init(&dev_priv->dpio_lock);
mutex_init(&dev_priv->rps.hw_lock);