From 5e1ae75900d4dd070835166fd3d27778b72fac51 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 28 Sep 2010 10:03:57 +1000 Subject: [PATCH] --- yaml --- r: 218234 b: refs/heads/master c: 85341f27b49833325f97580edcd687b4d90bb30b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 88dfa7a90ba7..281d0ebea394 100644 --- 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 index 6bf3f714f84d..4562f309ae3d 100644 --- 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;