From 7b649600c56f32eb70066386e9c50e510bc6ea2a Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 5 Aug 2011 10:28:52 +1000 Subject: [PATCH] --- yaml --- r: 269679 b: refs/heads/master c: 856ed888754e98b5933878f56b9c540b68dab1d6 h: refs/heads/master i: 269677: 2d74d2568c96699dce908030ba9f8bd2b55e9169 269675: fc59333d8eee447ff2d45b9b0a8975e9fa6bd629 269671: dd0bc748cf4d0afee2235ee22f10f5dba72ad5b2 269663: 0cca832a2671c5cafcc09ee7ed49fb3ba6a90c25 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_dp.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2a77442d22bf..2e31be541278 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1262a206da7d28340dfce954e31bd5fe5ae9e2dd +refs/heads/master: 856ed888754e98b5933878f56b9c540b68dab1d6 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_dp.c b/trunk/drivers/gpu/drm/nouveau/nouveau_dp.c index 89d5c161c8bd..55782bd7df0f 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_dp.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_dp.c @@ -314,11 +314,10 @@ dp_set_link_config(struct drm_device *dev, struct dp_state *dp) */ bios = nouveau_bios_dp_table(dev, dp->dcb, &headerlen); if (bios && (bios = ROMPTR(&dev_priv->vbios, bios[10]))) { - u16 script = ROM16(bios[2]); - if (dp->link_bw != 270000) - script = ROM16(bios[6]); + while (dp->link_bw < (ROM16(bios[0]) * 10)) + bios += 4; - nouveau_bios_run_init_table(dev, script, dp->dcb, dp->crtc); + nouveau_bios_run_init_table(dev, ROM16(bios[2]), dp->dcb, dp->crtc); } /* configure lane count on the source */