---

yaml --- r: 205109 b: refs/heads/master c: c04c5b1 h: refs/heads/master i: 205107: 72e4577 v: v3
git-mirror · Jul 26, 2010 · fa27a89 · fa27a89
1 parent ea565b8
commit fa27a89
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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);