From 800a9dceea7b0f39a4a50910377a0c65b70281bb Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Fri, 31 May 2013 22:22:40 +0000 Subject: [PATCH] --- yaml --- r: 376813 b: refs/heads/master c: b06f6a9d06f4b0fa38bd3e32714106d824470813 h: refs/heads/master i: 376811: 145dcd5d4619cf93cdecddab04ecf4fa7a63ed73 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cf2f07361eaa..db8357492424 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ed7fad6dbb211142cb61169d8d0bbbb049d4de1 +refs/heads/master: b06f6a9d06f4b0fa38bd3e32714106d824470813 diff --git a/trunk/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c b/trunk/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c index d0817d94454c..ed7415e5e220 100644 --- a/trunk/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c +++ b/trunk/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c @@ -51,7 +51,8 @@ nv50_dac_sense(struct nv50_disp_priv *priv, int or, u32 loadval) const u32 doff = (or * 0x800); int load = -EINVAL; nv_wr32(priv, 0x61a00c + doff, 0x00100000 | loadval); - udelay(9500); + mdelay(9); + udelay(500); nv_wr32(priv, 0x61a00c + doff, 0x80000000); load = (nv_rd32(priv, 0x61a00c + doff) & 0x38000000) >> 27; nv_wr32(priv, 0x61a00c + doff, 0x00000000);