Commit a5176a4c authored by Ilia Mirkin's avatar Ilia Mirkin Committed by Ben Skeggs

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

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108980Signed-off-by: Ilia Mirkin's avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 11878006
...@@ -22,6 +22,7 @@ ...@@ -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) ...@@ -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;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment