Эх сурвалжийг харах

Merge branch 'linux-4.13' of git://github.com/skeggsb/linux into drm-fixes

single nouveau regression fix.

* 'linux-4.13' of git://github.com/skeggsb/linux:
  drm/nouveau/disp/nv04: avoid creation of output paths
Dave Airlie 8 жил өмнө
parent
commit
46828dc779

+ 2 - 0
drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c

@@ -267,6 +267,8 @@ nvkm_disp_oneinit(struct nvkm_engine *engine)
 	/* Create output path objects for each VBIOS display path. */
 	i = -1;
 	while ((data = dcb_outp_parse(bios, ++i, &ver, &hdr, &dcbE))) {
+		if (ver < 0x40) /* No support for chipsets prior to NV50. */
+			break;
 		if (dcbE.type == DCB_OUTPUT_UNUSED)
 			continue;
 		if (dcbE.type == DCB_OUTPUT_EOL)