summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-07-09 08:40:49 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-07-13 10:13:51 +1000
commit946cbc825adfa8189a035346d5f7ff31c32b549d (patch)
treedb9f191e143529feccc774bc5c1abfccdba7859b /drivers/gpu
parentc50a5681e7d0ce1dd6de06fd70a7eff56ebfb9e9 (diff)
downloadblackbird-op-linux-946cbc825adfa8189a035346d5f7ff31c32b549d.tar.gz
blackbird-op-linux-946cbc825adfa8189a035346d5f7ff31c32b549d.zip
drm/nv50: fix dp_set_tmds to work on the right OR
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_display.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 6a293c818b61..ec1ccf680ddf 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -809,7 +809,8 @@ nv50_display_unk20_dp_set_tmds(struct drm_device *dev, struct dcb_entry *dcb)
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
- if (nv_encoder->dcb->type == OUTPUT_DP) {
+ if (nv_encoder->dcb->type == OUTPUT_DP &&
+ nv_encoder->dcb->or & (1 << or)) {
tmp = nv_rd32(dev, NV50_SOR_DP_CTRL(or, link));
tmp &= ~NV50_SOR_DP_CTRL_ENABLED;
nv_wr32(dev, NV50_SOR_DP_CTRL(or, link), tmp);
OpenPOWER on IntegriCloud