From c44ab17339b7907fe2d37d40ca955d2c4b38efcd Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Tue, 22 Jan 2013 15:33:27 +0100 Subject: [PATCH] --- yaml --- r: 358023 b: refs/heads/master c: c00db2463978ffab59d731773aae1a4f4e11d78c h: refs/heads/master i: 358021: 09781df9f22546fa49e2b343adb469cde9f2a47b 358019: 77e5ee381fcb1e2951faf4c7413a9f3cb6012d1b 358015: 9459af72807804accbe54bb162635c3dae7396cd v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f091951ec5fe..8fef3e3f4c7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b9f35a6dd72f89452c58bbdbaf063027bf857ec +refs/heads/master: c00db2463978ffab59d731773aae1a4f4e11d78c diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 305be115319e..886124a720e9 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -4873,6 +4873,8 @@ static void lpt_init_pch_refclk(struct drm_device *dev) if (!has_vga) return; + mutex_lock(&dev_priv->dpio_lock); + /* XXX: Rip out SDV support once Haswell ships for real. */ if (IS_HASWELL(dev) && (dev->pci_device & 0xFF00) == 0x0C00) is_sdv = true; @@ -5015,6 +5017,8 @@ static void lpt_init_pch_refclk(struct drm_device *dev) tmp = intel_sbi_read(dev_priv, SBI_DBUFF0, SBI_ICLK); tmp |= SBI_DBUFF0_ENABLE; intel_sbi_write(dev_priv, SBI_DBUFF0, tmp, SBI_ICLK); + + mutex_unlock(&dev_priv->dpio_lock); } /*