drm/nouveau/kms: don't fail if there's no dcb table entries
Fixes module not loading on Tesla K20. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
79442c3af0
commit
d2898713fb
|
@ -1878,9 +1878,6 @@ parse_dcb_table(struct drm_device *dev, struct nvbios *bios)
|
|||
if (dcb->version < 0x21)
|
||||
merge_like_dcb_entries(dev, dcb);
|
||||
|
||||
if (!dcb->entries)
|
||||
return -ENXIO;
|
||||
|
||||
/* dump connector table entries to log, if any exist */
|
||||
idx = -1;
|
||||
while ((conn = olddcb_conn(dev, ++idx))) {
|
||||
|
|
|
@ -332,10 +332,15 @@ nouveau_display_create(struct drm_device *dev)
|
|||
|
||||
if (nouveau_modeset == 1 ||
|
||||
(nouveau_modeset < 0 && pclass == PCI_CLASS_DISPLAY_VGA)) {
|
||||
if (nv_device(drm->device)->card_type < NV_50)
|
||||
ret = nv04_display_create(dev);
|
||||
else
|
||||
ret = nv50_display_create(dev);
|
||||
if (drm->vbios.dcb.entries) {
|
||||
if (nv_device(drm->device)->card_type < NV_50)
|
||||
ret = nv04_display_create(dev);
|
||||
else
|
||||
ret = nv50_display_create(dev);
|
||||
} else {
|
||||
ret = 0;
|
||||
}
|
||||
|
||||
if (ret)
|
||||
goto disp_create_err;
|
||||
|
||||
|
|
Loading…
Reference in a new issue