diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-08-18 14:09:00 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-12-02 15:37:19 +1000 |
| commit | a30656ee5dba9437854206b9905db66e17017313 (patch) | |
| tree | a8c689cbcfef9c844fe105e10d03fbb0e6003242 /nvkm | |
| parent | d2de98469afb14691cf6cecd89866be79d6c05b9 (diff) | |
| download | nouveau-a30656ee5dba9437854206b9905db66e17017313.tar.gz | |
bios: add support for dcb 4.1
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'nvkm')
| -rw-r--r-- | nvkm/subdev/bios/dcb.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/nvkm/subdev/bios/dcb.c b/nvkm/subdev/bios/dcb.c index bd8d34838..96099aff8 100644 --- a/nvkm/subdev/bios/dcb.c +++ b/nvkm/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) { - case 0x0f000000: - outp->dpconf.link_nr = 4; - break; - case 0x03000000: - outp->dpconf.link_nr = 2; - break; - case 0x01000000: - default: - outp->dpconf.link_nr = 1; - break; + outp->dpconf.link_nr = (conf & 0x0f000000) >> 24; + if (*ver < 0x41) { + switch (outp->dpconf.link_nr) { + case 0x0f: + outp->dpconf.link_nr = 4; + break; + case 0x03: + outp->dpconf.link_nr = 2; + break; + case 0x01: + default: + outp->dpconf.link_nr = 1; + break; + } } /* fall-through... */ |