diff options
| author | Ben Skeggs | 2015-08-20 06:54:11 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2015-08-28 04:40:20 +0200 |
| commit | dd4bb3eccc806e78baee3009aa466466daae0f29 (patch) | |
| tree | 3945ca064f0f2a7ce6df960c89379def2109a5c3 /drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c | |
| parent | drm/nouveau/mmu: switch to new-style timer macros (diff) | |
| download | kernel-qcow2-linux-dd4bb3eccc806e78baee3009aa466466daae0f29.tar.gz kernel-qcow2-linux-dd4bb3eccc806e78baee3009aa466466daae0f29.tar.xz kernel-qcow2-linux-dd4bb3eccc806e78baee3009aa466466daae0f29.zip | |
drm/nouveau/pmu: switch to new-style timer macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c index a6d6162a3618..469177e34563 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c @@ -36,10 +36,13 @@ magic_(struct nvkm_device *device, u32 ctrl, int size) nvkm_wr32(device, 0x00c800, 0x00000000); nvkm_wr32(device, 0x00c808, 0x00000000); nvkm_wr32(device, 0x00c800, ctrl); - if (nv_wait(device, 0x00c800, 0x40000000, 0x40000000)) { - while (size--) - nvkm_wr32(device, 0x00c804, 0x00000000); - } + nvkm_msec(device, 2000, + if (nvkm_rd32(device, 0x00c800) & 0x40000000) { + while (size--) + nvkm_wr32(device, 0x00c804, 0x00000000); + break; + } + ); nvkm_wr32(device, 0x00c800, 0x00000000); } |