diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:11 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:21 +0300 |
| commit | 3a020b4dfc3a6c79f144b2c6786d86b33cda64d9 (patch) | |
| tree | bf9ae689d1295c0bc644f1bd7d5bce7787d921b4 /drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c | |
| parent | 6ed5c1682425e29913785977cccca67ff3dec5f1 (diff) | |
| download | linux-3a020b4dfc3a6c79f144b2c6786d86b33cda64d9.tar.xz | |
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/hdagt215.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c index c2ae112225fc..0aba48c586ee 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c @@ -51,7 +51,11 @@ gt215_hda_eld(NV50_DISP_MTHD_V1) if (size && args->v0.data[0]) { if (outp->info.type == DCB_OUTPUT_DP) { nvkm_mask(device, 0x61c1e0 + soff, 0x8000000d, 0x80000001); - nv_wait(disp, 0x61c1e0 + soff, 0x80000000, 0x00000000); + nvkm_msec(device, 2000, + u32 tmp = nvkm_rd32(device, 0x61c1e0 + soff); + if (!(tmp & 0x80000000)) + break; + ); } for (i = 0; i < size; i++) nvkm_wr32(device, 0x61c440 + soff, (i << 8) | args->v0.data[0]); @@ -61,7 +65,11 @@ gt215_hda_eld(NV50_DISP_MTHD_V1) } else { if (outp->info.type == DCB_OUTPUT_DP) { nvkm_mask(device, 0x61c1e0 + soff, 0x80000001, 0x80000000); - nv_wait(disp, 0x61c1e0 + soff, 0x80000000, 0x00000000); + nvkm_msec(device, 2000, + u32 tmp = nvkm_rd32(device, 0x61c1e0 + soff); + if (!(tmp & 0x80000000)) + break; + ); } nvkm_mask(device, 0x61c448 + soff, 0x80000003, 0x80000000 | !!size); } |