mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-01 07:14:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/nouveau/ltc: switch to new-style timer macros

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2015-08-20 14:54:11 +10:00
parent 63bb5c390b
commit 1302bcbb82
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gf100.c
View File

@@ -39,10 +39,16 @@ gf100_ltc_cbc_clear(struct nvkm_ltc_priv *ltc, u32 start, u32 limit)
void
gf100_ltc_cbc_wait(struct nvkm_ltc_priv *ltc)
{
struct nvkm_device *device = ltc->base.subdev.device;
int c, s;
for (c = 0; c < ltc->ltc_nr; c++) {
for (s = 0; s < ltc->lts_nr; s++)
nv_wait(ltc, 0x1410c8 + c * 0x2000 + s * 0x400, ~0, 0);
for (s = 0; s < ltc->lts_nr; s++) {
const u32 addr = 0x1410c8 + (c * 0x2000) + (s * 0x400);
nvkm_msec(device, 2000,
if (!nvkm_rd32(device, addr))
break;
);
}
}
}

10
drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c
View File

@@ -38,10 +38,16 @@ gm107_ltc_cbc_clear(struct nvkm_ltc_priv *ltc, u32 start, u32 limit)
static void
gm107_ltc_cbc_wait(struct nvkm_ltc_priv *ltc)
{
struct nvkm_device *device = ltc->base.subdev.device;
int c, s;
for (c = 0; c < ltc->ltc_nr; c++) {
for (s = 0; s < ltc->lts_nr; s++)
nv_wait(ltc, 0x14046c + c * 0x2000 + s * 0x200, ~0, 0);
for (s = 0; s < ltc->lts_nr; s++) {
const u32 addr = 0x14046c + (c * 0x2000) + (s * 0x200);
nvkm_msec(device, 2000,
if (!nvkm_rd32(device, addr))
break;
);
}
}
}