p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/nouveau/falcon: avoid touching registers if engine is off 

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108980
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ilia Mirkin 2018-12-13 22:44:08 -05:00 committed by Ben Skeggs
parent 118780066e
commit a5176a4cb8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@
#include <engine/falcon.h> #include <engine/falcon.h>
#include <core/gpuobj.h> #include <core/gpuobj.h>
#include <subdev/mc.h>
#include <subdev/timer.h> #include <subdev/timer.h>
#include <engine/fifo.h> #include <engine/fifo.h>
@ -107,8 +108,10 @@ nvkm_falcon_fini(struct nvkm_engine *engine, bool suspend)
} }
} }
nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000); if (nvkm_mc_enabled(device, engine->subdev.index)) {
nvkm_wr32(device, base + 0x014, 0xffffffff); nvkm_mask(device, base + 0x048, 0x00000003, 0x00000000);
nvkm_wr32(device, base + 0x014, 0xffffffff);
}
return 0; return 0;
} }