---

yaml --- r: 329675 b: refs/heads/master c: acac7bd h: refs/heads/master i: 329673: 48b2b70 329671: b526b32 v: v3
git-mirror · Oct 3, 2012 · 862ed73 · 862ed73
1 parent 0a93712
commit 862ed73
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da07e52cf10c9584c7e197ac3d49455e1a4d4756
+refs/heads/master: acac7bdba61226502a230db9245ca426a67102a9
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/gpio.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/gpio.c
@@ -100,13 +100,17 @@ dcb_gpio_parse(struct nouveau_bios *bios, int idx, u8 func, u8 line,
 	/* DCB 2.2, fixed TVDAC GPIO data */
 	if ((entry = dcb_table(bios, &ver, &hdr, &cnt, &len)) && ver >= 0x22) {
 		if (func == DCB_GPIO_TVDAC0) {
-			*gpio = (struct dcb_gpio_func) {
-				.func = DCB_GPIO_TVDAC0,
-				.line = nv_ro08(bios, entry - 4) >> 4,
-				.log[0] = !!(nv_ro08(bios, entry - 5) & 2),
-				.log[1] =  !(nv_ro08(bios, entry - 5) & 2),
-			};
-			return 0;
+			u8 conf = nv_ro08(bios, entry - 5);
+			u8 addr = nv_ro08(bios, entry - 4);
+			if (conf & 0x01) {
+				*gpio = (struct dcb_gpio_func) {
+					.func = DCB_GPIO_TVDAC0,
+					.line = addr >> 4,
+					.log[0] = !!(conf & 0x02),
+					.log[1] =  !(conf & 0x02),
+				};
+				return 0;
+			}
 		}
 	}