diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-12-13 10:22:53 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-12-13 11:40:16 +1000 |
| commit | 79d48dadb0a71ec31ec8ce234ad0811a50123580 (patch) | |
| tree | b5be0bd8d45f67a2ebce8aff307807fc0cba04f5 | |
| parent | f4e65efc88b64c1dbca275d42a188edccedb56c6 (diff) | |
| download | linux-stable-79d48dadb0a71ec31ec8ce234ad0811a50123580.tar.gz linux-stable-79d48dadb0a71ec31ec8ce234ad0811a50123580.tar.bz2 linux-stable-79d48dadb0a71ec31ec8ce234ad0811a50123580.zip | |
drm/nouveau/bios/dp: fix handling of LevelEntryTableIndex on DP table 4.2
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c index d89e78c4e689..972370ed36f0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c @@ -207,8 +207,11 @@ nvbios_dpcfg_match(struct nvkm_bios *bios, u16 outp, u8 pc, u8 vs, u8 pe, if (*ver >= 0x30) { const u8 vsoff[] = { 0, 4, 7, 9 }; idx = (pc * 10) + vsoff[vs] + pe; - if (*ver >= 0x40 && *hdr >= 0x12) + if (*ver >= 0x40 && *ver <= 0x41 && *hdr >= 0x12) idx += nvbios_rd08(bios, outp + 0x11) * 40; + else + if (*ver >= 0x42) + idx += nvbios_rd08(bios, outp + 0x11) * 10; } else { while ((data = nvbios_dpcfg_entry(bios, outp, ++idx, ver, hdr, cnt, len))) { |