From fa27a89520b869c35db219a8cdc18a7ed04bbf59 Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Sat, 24 Jul 2010 17:42:20 +0200
Subject: [PATCH] --- yaml --- r: 205109 b: refs/heads/master c:
 c04c5b1da18ec73eaabc7b8a8757545865426fc2 h: refs/heads/master i:   205107:
 72e4577a24c6d2b834bb1b7bd716c9c59b61524c v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/nouveau/nv04_display.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1104b5873bd9..74edd4b569bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 946fd35f88ae7ef910229e7995ab0c32d52517b4
+refs/heads/master: c04c5b1da18ec73eaabc7b8a8757545865426fc2
diff --git a/trunk/drivers/gpu/drm/nouveau/nv04_display.c b/trunk/drivers/gpu/drm/nouveau/nv04_display.c
index cd70bd827614..9e28cf772e3c 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv04_display.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv04_display.c
@@ -78,6 +78,14 @@ nv04_display_store_initial_head_owner(struct drm_device *dev)
 int
 nv04_display_early_init(struct drm_device *dev)
 {
+	/* Make the I2C buses accessible. */
+	if (!nv_gf4_disp_arch(dev)) {
+		uint32_t pmc_enable = nv_rd32(dev, NV03_PMC_ENABLE);
+
+		if (!(pmc_enable & 1))
+			nv_wr32(dev, NV03_PMC_ENABLE, pmc_enable | 1);
+	}
+
 	/* Unlock the VGA CRTCs. */
 	NVLockVgaCrtcs(dev, false);