Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau...

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / core / engine / disp / dacnv50.c

diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c b/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c
index a60a5accb540868c209a9431eec8aafa4487c483..f02fd9f443fff3e1178b40cedda50ee4e9ba5461 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c
+++ b/drivers/gpu/drm/nouveau/core/engine/disp/dacnv50.c
@@ -53,7 +53,8 @@ nv50_dac_sense(struct nv50_disp_priv *priv, int or, u32 loadval)
        nv_mask(priv, 0x61a004 + doff, 0x807f0000, 0x80150000);
        nv_wait(priv, 0x61a004 + doff, 0x80000000, 0x00000000);
        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);