iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/devinit/gm200: replace while loops with PTIMER-based timeout loops

Browse Source 
It appears to be safe to access PTIMER on an unposted board with newer
chipsets.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2016-11-08 11:54:24 +10:00
parent d91ccec631
commit 920c58a711
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c
View File

@ -26,6 +26,7 @@
#include <subdev/bios.h> #include <subdev/bios.h>
#include <subdev/bios/bit.h> #include <subdev/bios/bit.h>
#include <subdev/bios/pmu.h> #include <subdev/bios/pmu.h>
#include <subdev/timer.h>
static void static void
pmu_code(struct nv50_devinit *init, u32 pmu, u32 img, u32 len, bool sec) pmu_code(struct nv50_devinit *init, u32 pmu, u32 img, u32 len, bool sec)
@ -128,8 +129,11 @@ gm200_devinit_post(struct nvkm_devinit *base, bool post)
nvkm_mask(device, 0x000200, 0x00002000, 0x00000000); nvkm_mask(device, 0x000200, 0x00002000, 0x00000000);
nvkm_mask(device, 0x000200, 0x00002000, 0x00002000); nvkm_mask(device, 0x000200, 0x00002000, 0x00002000);
nvkm_rd32(device, 0x000200); nvkm_rd32(device, 0x000200);
while (nvkm_rd32(device, 0x10a10c) & 0x00000006) { if (nvkm_msec(device, 2000,
} if (!(nvkm_rd32(device, 0x10a10c) & 0x00000006))
break;
) < 0)
return -ETIMEDOUT;
} }
ret = pmu_load(init, 0x04, post, &exec, &args); ret = pmu_load(init, 0x04, post, &exec, &args);
@ -156,8 +160,11 @@ gm200_devinit_post(struct nvkm_devinit *base, bool post)
if (post) { if (post) {
nvkm_wr32(device, 0x10a040, 0x00005000); nvkm_wr32(device, 0x10a040, 0x00005000);
pmu_exec(init, exec); pmu_exec(init, exec);
while (!(nvkm_rd32(device, 0x10a040) & 0x00002000)) { if (nvkm_msec(device, 2000,
} if (nvkm_rd32(device, 0x10a040) & 0x00002000)
break;
) < 0)
return -ETIMEDOUT;
} }
/* load and execute some other ucode image (bios therm?) */ /* load and execute some other ucode image (bios therm?) */