diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-06-25 12:26:42 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-07-01 13:50:46 +1000 |
| commit | d2898713fbd6431d7c09a52eb5e814805fcf8194 (patch) | |
| tree | 6a35d347e7fa3a476eeab527c596d562a6ee6751 /drivers/gpu/drm/nouveau/nouveau_display.c | |
| parent | 79442c3af0525e81d4598e272abe5db60c489c62 (diff) | |
| download | talos-obmc-linux-d2898713fbd6431d7c09a52eb5e814805fcf8194.tar.gz talos-obmc-linux-d2898713fbd6431d7c09a52eb5e814805fcf8194.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index f17dc2ab03ec..0b6c296e6ef3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -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; |
