Skip to content

Commit 7359123

Browse files
ttabigregkh
authored andcommitted
drm/nouveau: remove unused memory target test
[ Upstream commit 64c722b ] The memory target check is a hold-over from a refactor. It's harmless but distracting, so just remove it. Fixes: 2541626 ("drm/nouveau/acr: use common falcon HS FW code for ACR FWs") Signed-off-by: Timur Tabi <ttabi@nvidia.com> Link: https://lore.kernel.org/r/20250813001004.2986092-3-ttabi@nvidia.com Signed-off-by: Danilo Krummrich <dakr@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 0d6f4cb commit 7359123

File tree

1 file changed

+3
-10
lines changed
  • drivers/gpu/drm/nouveau/nvkm/falcon

1 file changed

+3
-10
lines changed

drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,11 @@ int
249249
gm200_flcn_fw_load(struct nvkm_falcon_fw *fw)
250250
{
251251
struct nvkm_falcon *falcon = fw->falcon;
252-
int target, ret;
252+
int ret;
253253

254254
if (fw->inst) {
255+
int target;
256+
255257
nvkm_falcon_mask(falcon, 0x048, 0x00000001, 0x00000001);
256258

257259
switch (nvkm_memory_target(fw->inst)) {
@@ -285,15 +287,6 @@ gm200_flcn_fw_load(struct nvkm_falcon_fw *fw)
285287
}
286288

287289
if (fw->boot) {
288-
switch (nvkm_memory_target(&fw->fw.mem.memory)) {
289-
case NVKM_MEM_TARGET_VRAM: target = 4; break;
290-
case NVKM_MEM_TARGET_HOST: target = 5; break;
291-
case NVKM_MEM_TARGET_NCOH: target = 6; break;
292-
default:
293-
WARN_ON(1);
294-
return -EINVAL;
295-
}
296-
297290
ret = nvkm_falcon_pio_wr(falcon, fw->boot, 0, 0,
298291
IMEM, falcon->code.limit - fw->boot_size, fw->boot_size,
299292
fw->boot_addr >> 8, false);

0 commit comments

Comments
 (0)