aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvd0_display.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-03-11 01:08:05 -0500
committerBen Skeggs <bskeggs@redhat.com>2012-03-22 10:21:18 -0400
commit6544599249086ce50f216a6cedbea56514ffefc6 (patch)
tree7b4fb0b9ada08c8a9b6530f08eeee93459f3fbf8 /drivers/gpu/drm/nouveau/nvd0_display.c
parente592c73b91e9dfc7403fe41f649dd18593805ccd (diff)
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/nvd0_display.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvd0_display.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
index d69642da8b56..0247250939e8 100644
--- a/drivers/gpu/drm/nouveau/nvd0_display.c
+++ b/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -1226,6 +1226,11 @@ nvd0_sor_dp_train_adj(struct drm_device *dev, struct dcb_entry *dcb,
1226 if (table[0] == 0x30) { 1226 if (table[0] == 0x30) {
1227 config = entry + table[4]; 1227 config = entry + table[4];
1228 config += table[5] * preem; 1228 config += table[5] * preem;
1229 } else
1230 if (table[0] == 0x40) {
1231 config = table + table[1];
1232 config += table[2] * table[3];
1233 config += table[6] * preem;
1229 } 1234 }
1230 } 1235 }
1231 1236
@@ -1258,6 +1263,7 @@ nvd0_sor_dp_link_set(struct drm_device *dev, struct dcb_entry *dcb, int crtc,
1258 table = nouveau_dp_bios_data(dev, dcb, &entry); 1263 table = nouveau_dp_bios_data(dev, dcb, &entry);
1259 if (table) { 1264 if (table) {
1260 if (table[0] == 0x30) entry = ROMPTR(dev, entry[10]); 1265 if (table[0] == 0x30) entry = ROMPTR(dev, entry[10]);
1266 else if (table[0] == 0x40) entry = ROMPTR(dev, entry[9]);
1261 else entry = NULL; 1267 else entry = NULL;
1262 1268
1263 while (entry) { 1269 while (entry) {