Skip to contentSkip to conversation

drm/i915: fixup sbi_read/write locking

PATCH Applied [email protected] 3 participants 3 messages Jan 22, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: fixup sbi_read/write locking

From: Daniel Vetter <[email protected]>

commit 09153000b8ca32a539a1207edebabd0d40b6c61b

Author: Daniel Vetter <[email protected]>
Date:   Wed Dec 12 14:06:44 2012 +0100

drm/i915: rework locking for intel_dpio|sbi_read|write

reworked the locking around sbi_read/write functions for 3.8-fixes. But

commit dde86e2db54545ef981b64805097a7b4c3156d6e

Author: Paulo Zanoni <[email protected]>
Date:   Sat Dec 1 12:04:25 2012 -0200

drm/i915: add lpt_init_pch_refcl

Added new use-cases in the -next tree which has not been updated in the merge. Fix it up.

---
 drivers/gpu/drm/i915/intel_display.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_display.c +4 -0
index 26df9e3..27fe702 100644
@@ -4871,6 +4871,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;
@@ -5013,6 +5015,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);
 }
 
 /*
Signature · 1 line
1.7.10.4
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 15 lines · On Tue, 22 Jan 2013 15:33:27 +0100 [email protected] wrote:

From: Daniel Vetter <[email protected]>

commit 09153000b8ca32a539a1207edebabd0d40b6c61b

Author: Daniel Vetter <[email protected]>
Date:   Wed Dec 12 14:06:44 2012 +0100

drm/i915: rework locking for intel_dpio|sbi_read|write

reworked the locking around sbi_read/write functions for 3.8-fixes. But

commit dde86e2db54545ef981b64805097a7b4c3156d6e

Author: Paulo Zanoni <[email protected]>
Date:   Sat Dec 1 12:04:25 2012 -0200
Quoted 7 lines

drm/i915: add lpt_init_pch_refcl

Added new use-cases in the -next tree which has not been updated in the merge. Fix it up.

#2 lore raw
Quoted 20 lines · Ben Widawsky
Quoted 17 lines · On Tue, 22 Jan 2013 15:33:27 +0100 [email protected] wrote:

From: Daniel Vetter <[email protected]>

commit 09153000b8ca32a539a1207edebabd0d40b6c61b

Author: Daniel Vetter <[email protected]>
Date:   Wed Dec 12 14:06:44 2012 +0100

drm/i915: rework locking for intel_dpio|sbi_read|write

reworked the locking around sbi_read/write functions for 3.8-fixes. But

commit dde86e2db54545ef981b64805097a7b4c3156d6e

Author: Paulo Zanoni <[email protected]>
Date:   Sat Dec 1 12:04:25 2012 -0200

drm/i915: add lpt_init_pch_refcl

Quoted 7 lines
Quoted 5 lines

Added new use-cases in the -next tree which has not been updated in the merge. Fix it up.

Queued for -next, thanks for the review.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch