---

yaml
---
r: 218219
b: refs/heads/master
c: 5e6a744
h: refs/heads/master
i:
  218217: 23fbb18
  218215: 08b9016
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb338bb6f230aa70e70dc0d27af1b7a8efc34cdd
+refs/heads/master: 5e6a74436e378eb021a74f3e5f329eecf49d928e

trunk/drivers/gpu/drm/nouveau/nouveau_bios.c

@@ -5809,14 +5809,27 @@ parse_dcb_gpio_table(struct nvbios *bios)
 		entries   = gpio[2];
 		recordlen = gpio[3];
 	} else
-	if (dcb[0] >= 0x22) {
+	if (dcb[0] >= 0x22 && dcb[-1] >= 0x13) {
 		gpio = ROMPTR(bios, dcb[-15]);
 		if (!gpio)
 			goto no_table;
 
 		headerlen = 3;
 		entries   = gpio[2];
 		recordlen = gpio[1];
+	} else
+	if (dcb[0] >= 0x22) {
+		/* No GPIO table present, parse the TVDAC GPIO data. */
+		uint8_t *tvdac_gpio = &dcb[-5];
+
+		if (tvdac_gpio[0] & 1) {
+			e = new_gpio_entry(bios);
+			e->tag = DCB_GPIO_TVDAC0;
+			e->line = tvdac_gpio[1] >> 4;
+			e->invert = tvdac_gpio[0] & 2;
+		}
+
+		goto no_table;
 	} else {
 		NV_DEBUG(dev, "no/unknown gpio table on DCB 0x%02x\n", dcb[0]);
 		goto no_table;