summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-02-25 11:53:00 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-02-25 15:09:42 +1000
commitc52e53fd38b195169c67a8cc9ed1af0125d2655c (patch)
tree99b90d2d04ada7dbdbabcc771a6755909084cde5 /drivers/gpu
parent81e2d42200cd8fa37ec4ebdc66373d0db0e05678 (diff)
downloadlinux-3.10-c52e53fd38b195169c67a8cc9ed1af0125d2655c.tar.gz
linux-3.10-c52e53fd38b195169c67a8cc9ed1af0125d2655c.tar.bz2
linux-3.10-c52e53fd38b195169c67a8cc9ed1af0125d2655c.zip
drm/nouveau: support version 0x20 displayport tables
Not entirely identical to 0x21, the per-encoder table header lacks the third init table pointer. However, our current parsing of the table should work just fine. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bios.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index bcf843f22b7..71247da17da 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -3726,7 +3726,7 @@ nouveau_bios_dp_table(struct drm_device *dev, struct dcb_entry *dcbent,
}
table = &bios->data[bios->display.dp_table_ptr];
- if (table[0] != 0x21) {
+ if (table[0] != 0x20 && table[0] != 0x21) {
NV_ERROR(dev, "DisplayPort table version 0x%02x unknown\n",
table[0]);
return NULL;