diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-02-11 03:52:58 +0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-02-20 10:01:05 +0400 |
| commit | eb6313add6dddf07ea3e50c4caa33a9c3b2379f1 (patch) | |
| tree | db60f5990aa58a2c1279f19057e67b9d3867c6d0 /drivers/gpu/drm/nouveau/nouveau_bios.c | |
| parent | 476e84e126171d809f9c0b5d97137f5055f95ca8 (diff) | |
| download | linux-eb6313add6dddf07ea3e50c4caa33a9c3b2379f1.tar.xz | |
drm/nv50: initial kms support for off-chip TMDS/DP encoders
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.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index b64065781a4a..50a6dd02f7c5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c @@ -1469,6 +1469,7 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb, } case DCB_OUTPUT_DP: entry->dpconf.sor.link = (conf & 0x00000030) >> 4; + entry->extdev = (conf & 0x0000ff00) >> 8; switch ((conf & 0x00e00000) >> 21) { case 0: entry->dpconf.link_bw = 162000; @@ -1490,8 +1491,10 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb, } break; case DCB_OUTPUT_TMDS: - if (dcb->version >= 0x40) + if (dcb->version >= 0x40) { entry->tmdsconf.sor.link = (conf & 0x00000030) >> 4; + entry->extdev = (conf & 0x0000ff00) >> 8; + } else if (dcb->version >= 0x30) entry->tmdsconf.slave_addr = (conf & 0x00000700) >> 8; else if (dcb->version >= 0x22) |