diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-15 04:02:39 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-15 04:02:39 -0500 |
commit | c09cd6e9691ec6fce8cb90b65929cad389d39c84 (patch) | |
tree | d76104420f72172b21b8fb5ca512baa016ac892b /drivers/gpu/drm/i915/i915_dma.c | |
parent | 7eb1c496f7ac0f386552c0cd9144f6965fc61da5 (diff) | |
parent | 96ab4c70396e4e5a4d623bc95e86484682bef78f (diff) |
Merge branch 'backlight-rework' into drm-intel-next-queued
Pull in Jani's backlight rework branch. This was merged through a
separate branch to be able to sort out the Broadwell conflicts
properly before pulling it into the main development branch.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 00d74f816a72..25acbb5eca6e 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1486,7 +1486,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) | |||
1486 | 1486 | ||
1487 | spin_lock_init(&dev_priv->irq_lock); | 1487 | spin_lock_init(&dev_priv->irq_lock); |
1488 | spin_lock_init(&dev_priv->gpu_error.lock); | 1488 | spin_lock_init(&dev_priv->gpu_error.lock); |
1489 | spin_lock_init(&dev_priv->backlight.lock); | 1489 | spin_lock_init(&dev_priv->backlight_lock); |
1490 | spin_lock_init(&dev_priv->uncore.lock); | 1490 | spin_lock_init(&dev_priv->uncore.lock); |
1491 | spin_lock_init(&dev_priv->mm.object_stat_lock); | 1491 | spin_lock_init(&dev_priv->mm.object_stat_lock); |
1492 | mutex_init(&dev_priv->dpio_lock); | 1492 | mutex_init(&dev_priv->dpio_lock); |