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

drm/nouveau/falcon: 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 dd4bb3eccc
commit 6ed5c16824
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/nouveau/nvkm/engine/falcon.c
View File

@ -102,10 +102,17 @@ _nvkm_falcon_init(struct nvkm_object *object)
/* wait for 'uc halted' to be signalled before continuing */
if (falcon->secret && falcon->version < 4) {
if (!falcon->version)
nv_wait(falcon, 0x008, 0x00000010, 0x00000010);
else
nv_wait(falcon, 0x180, 0x80000000, 0);
if (!falcon->version) {
nvkm_msec(device, 2000,
if (nv_ro32(falcon, 0x008) & 0x00000010)
break;
);
} else {
nvkm_msec(device, 2000,
if (!(nv_ro32(falcon, 0x180) & 0x80000000))
break;
);
}
nv_wo32(falcon, 0x004, 0x00000010);
}