---

yaml --- r: 205075 b: refs/heads/master c: 946cbc8 h: refs/heads/master i: 205073: 3f03173 205071: cf90026 v: v3
git-mirror · Jul 13, 2010 · e70c815 · e70c815
1 parent a8a332a
commit e70c815
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c50a5681e7d0ce1dd6de06fd70a7eff56ebfb9e9
+refs/heads/master: 946cbc825adfa8189a035346d5f7ff31c32b549d
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_display.c b/trunk/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);