---

yaml --- r: 218234 b: refs/heads/master c: 85341f2 h: refs/heads/master v: v3
git-mirror · Oct 4, 2010 · 5e1ae75 · 5e1ae75
1 parent e9f795b
commit 5e1ae75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fade7ad56d929e168ead0f75e591468afa2fe97c
+refs/heads/master: 85341f27b49833325f97580edcd687b4d90bb30b
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_dp.c b/trunk/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -469,7 +469,7 @@ nouveau_dp_detect(struct drm_encoder *encoder)
 	    !nv_encoder->dcb->dpconf.link_bw)
 		nv_encoder->dp.link_bw = DP_LINK_BW_1_62;
 
-	nv_encoder->dp.link_nr = dpcd[2] & DP_MAX_LANE_COUNT;
+	nv_encoder->dp.link_nr = dpcd[2] & DP_MAX_LANE_COUNT_MASK;
 	if (nv_encoder->dp.link_nr > nv_encoder->dcb->dpconf.link_nr)
 		nv_encoder->dp.link_nr = nv_encoder->dcb->dpconf.link_nr;