]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
drm/nouveau/bios/mxm: handle digital connector table 1.1
authorBen Skeggs <bskeggs@redhat.com>
Mon, 5 Dec 2016 22:59:31 +0000 (08:59 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 5 Dec 2016 23:08:23 +0000 (09:08 +1000)
I suspect the version bump is just to signify that the table now specifies
pad macro/links instead of SOR/sublinks.

For our usage of the table, just recognising the new version is enough.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c

index 3ddf0939ded3afe67f12c13feaf9d978e4d31a11..994cc2d7759b693d4ead530eabfe949d664fa4f9 100644 (file)
@@ -81,7 +81,7 @@ mxm_sor_map(struct nvkm_bios *bios, u8 conn)
                u16 map = nvbios_rd16(bios, mxm + 4);
                if (map) {
                        ver = nvbios_rd08(bios, map);
-                       if (ver == 0x10) {
+                       if (ver == 0x10 || ver == 0x11) {
                                if (conn < nvbios_rd08(bios, map + 3)) {
                                        map += nvbios_rd08(bios, map + 1);
                                        map += conn;