diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-10 11:45:04 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-10 11:45:04 +1000 |
| commit | 46828dc77961d9286e55671c4dd3b6c9effadf1a (patch) | |
| tree | 523d22fe1444e236beaca4457fbb06edcf6ba390 | |
| parent | 92f190aba2d57c91ef99e227e36461234c35eb7b (diff) | |
| parent | 372aa73e20197d463fc8b34524c20b089a98b1c3 (diff) | |
Merge branch 'linux-4.13' of git://github.com/skeggsb/linux into drm-fixesdrm-fixes-for-v4.13-rc5
single nouveau regression fix.
* 'linux-4.13' of git://github.com/skeggsb/linux:
drm/nouveau/disp/nv04: avoid creation of output paths
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c index c7c84d34d97e..88582af8bd89 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c +++ b/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) |