diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:11 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:21 +1000 |
| commit | 3a020b4dfc3a6c79f144b2c6786d86b33cda64d9 (patch) | |
| tree | bf9ae689d1295c0bc644f1bd7d5bce7787d921b4 /drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c | |
| parent | 6ed5c1682425e29913785977cccca67ff3dec5f1 (diff) | |
| download | linux-3a020b4dfc3a6c79f144b2c6786d86b33cda64d9.tar.bz2 | |
drm/nouveau/disp: switch to new-style timer macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c index ed4d13222d9d..d921efe7e731 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c @@ -75,7 +75,10 @@ g94_sor_dp_lnk_pwr(struct nvkm_output_dp *outp, int nr) nvkm_mask(device, 0x61c130 + loff, 0x0000000f, mask); nvkm_mask(device, 0x61c034 + soff, 0x80000000, 0x80000000); - nv_wait(disp, 0x61c034 + soff, 0x80000000, 0x00000000); + nvkm_msec(device, 2000, + if (!(nvkm_rd32(device, 0x61c034 + soff) & 0x80000000)) + break; + ); return 0; } |