Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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 years ago
parent
92f190aba2 372aa73e20
commit
46828dc779
1 changed files with 2 additions and 0 deletions
Split View Show Diff Stats
  1. 2 0
      drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c

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

@@ -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)