drm/nouveau/bios: add support for dcb 4.1

Signed-off-by: N Ben Skeggs <bskeggs@redhat.com>

drm/nouveau/bios: add support for dcb 4.1
Signed-off-by: N Ben Skeggs <bskeggs@redhat.com>
dae20439 · Ben Skeggs · c9083577 · dae20439
隐藏空白更改
内联并排

Showing with 15 addition and 12 deletion

drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c +15 -12

未找到文件。
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/dcb.c
@@ -42,7 +42,7 @@ dcb_table(struct nouveau_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len)
 	*ver = nv_ro08(bios, dcb);
-	if (*ver >= 0x41) {
+	if (*ver >= 0x42) {
 		nv_warn(bios, "DCB version 0x%02x unknown\n", *ver);
 		return 0x0000;
 	} else
@@ -157,17 +157,20 @@ dcb_outp_parse(struct nouveau_bios *bios, u8 idx, u8 *ver, u8 *len,
 					break;
 				}
-				switch (conf & 0x0f000000) {
+				outp->dpconf.link_nr = (conf & 0x0f000000) >> 24;
-				case 0x0f000000:
+				if (*ver < 0x41) {
-					outp->dpconf.link_nr = 4;
+					switch (outp->dpconf.link_nr) {
-					break;
+					case 0x0f:
-				case 0x03000000:
+						outp->dpconf.link_nr = 4;
-					outp->dpconf.link_nr = 2;
+						break;
-					break;
+					case 0x03:
-				case 0x01000000:
+						outp->dpconf.link_nr = 2;
-				default:
+						break;
-					outp->dpconf.link_nr = 1;
+					case 0x01:
-					break;
+					default:
+						outp->dpconf.link_nr = 1;
+						break;
+					}
 				}
 				/* fall-through... */