Commit f10956d4 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/bios/dp: use alternate set of drvctl values where necessary 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7c11c99b

drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c

+4 −5
Original line number Diff line number Diff line
@@ -148,7 +148,8 @@ nvbios_dpcfg_entry(struct nvkm_bios *bios, u16 outp, u8 idx, 
		outp = nvbios_dp_table(bios, ver, hdr, cnt, len);

		*hdr = *hdr + (*len * * cnt);

		*len = nv_ro08(bios, outp + 0x06);

		*cnt = nv_ro08(bios, outp + 0x07);

		*cnt = nv_ro08(bios, outp + 0x07) *

		       nv_ro08(bios, outp + 0x05);

	}



	if (idx < *cnt)
@@ -196,12 +197,10 @@ nvbios_dpcfg_match(struct nvkm_bios *bios, u16 outp, u8 pc, u8 vs, u8 pe, 
	u16 data;



	if (*ver >= 0x30) {

		/*XXX: there's a second set of these on at least 4.1, that

		 *     i've witnessed nvidia using instead of the first

		 *     on gm204.  figure out what/why

		 */

		const u8 vsoff[] = { 0, 4, 7, 9 };

		idx = (pc * 10) + vsoff[vs] + pe;

		if (*ver >= 0x40 && *hdr >= 0x12)

			idx += nv_ro08(bios, outp + 0x11) * 40;

	} else {

		while ((data = nvbios_dpcfg_entry(bios, outp, ++idx,

						  ver, hdr, cnt, len))) {