提交 4b709998 编写于 作者: I Ilia Mirkin 提交者: Greg Kroah-Hartman

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

[ Upstream commit a5176a4cb85bb6213daadf691097cf411da35df2 ]

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108980Signed-off-by: NIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
上级 85a088cc
...@@ -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% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册