]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/nouveau: remove unused memory target test
authorTimur Tabi <ttabi@nvidia.com>
Wed, 13 Aug 2025 00:10:04 +0000 (19:10 -0500)
committerDanilo Krummrich <dakr@kernel.org>
Mon, 25 Aug 2025 16:09:29 +0000 (18:09 +0200)
The memory target check is a hold-over from a refactor.  It's harmless
but distracting, so just remove it.

Fixes: 2541626cfb79 ("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>
drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c

index 6a004c6e67425550f90a90f00cfae562ae8ec244..7c43397c19e61d0b9347ec50034a8808ee0db9fa 100644 (file)
@@ -249,9 +249,11 @@ int
 gm200_flcn_fw_load(struct nvkm_falcon_fw *fw)
 {
        struct nvkm_falcon *falcon = fw->falcon;
-       int target, ret;
+       int ret;
 
        if (fw->inst) {
+               int target;
+
                nvkm_falcon_mask(falcon, 0x048, 0x00000001, 0x00000001);
 
                switch (nvkm_memory_target(fw->inst)) {
@@ -285,15 +287,6 @@ gm200_flcn_fw_load(struct nvkm_falcon_fw *fw)
        }
 
        if (fw->boot) {
-               switch (nvkm_memory_target(&fw->fw.mem.memory)) {
-               case NVKM_MEM_TARGET_VRAM: target = 4; break;
-               case NVKM_MEM_TARGET_HOST: target = 5; break;
-               case NVKM_MEM_TARGET_NCOH: target = 6; break;
-               default:
-                       WARN_ON(1);
-                       return -EINVAL;
-               }
-
                ret = nvkm_falcon_pio_wr(falcon, fw->boot, 0, 0,
                                         IMEM, falcon->code.limit - fw->boot_size, fw->boot_size,
                                         fw->boot_addr >> 8, false);