summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_bios.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-03-11 07:08:05 +0100
committerBen Skeggs <bskeggs@redhat.com>2012-03-22 15:21:18 +0100
commit6544599249086ce50f216a6cedbea56514ffefc6 (patch)
tree7b4fb0b9ada08c8a9b6530f08eeee93459f3fbf8 /drivers/gpu/drm/nouveau/nouveau_bios.c
parentdrm/nve0/disp: nvidia randomly decided to move the dithering method (diff)
downloadlinux-6544599249086ce50f216a6cedbea56514ffefc6.tar.xz
linux-6544599249086ce50f216a6cedbea56514ffefc6.zip
drm/nouveau/dp: support version 4.0 of DP table
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bios.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_bios.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 8dbeeea91872..637afe71de56 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -1144,7 +1144,8 @@ init_dp_condition(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)
break;
case 1:
case 2:
- if (!(entry[5] & cond))
+ if ((table[0] < 0x40 && !(entry[5] & cond)) ||
+ (table[0] == 0x40 && !(entry[4] & cond)))
iexec->execute = false;
break;
case 5: