]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amdgpu/umsch: fix ucode check
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 12 Feb 2025 21:31:43 +0000 (16:31 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:39:14 +0000 (14:39 +0200)
[ Upstream commit c917e39cbdcd9fff421184db6cc461cc58d52c17 ]

Return an error if the IP version doesn't match otherwise
we end up passing a NULL string to amdgpu_ucode_request.
We should never hit this in practice today since we only
enable the umsch code on the supported IP versions, but
add a check to be safe.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202502130406.iWQ0eBug-lkp@intel.com/
Fixes: 020620424b27 ("drm/amd: Use a constant format string for amdgpu_ucode_request")
Reviewed-by: Saleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Lang Yu <Lang.Yu@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c

index 6162582d0aa2721704a13a1ec68309468501934d..d5125523bfa7be3b109870770d4febcaa86bcf29 100644 (file)
@@ -584,7 +584,7 @@ int amdgpu_umsch_mm_init_microcode(struct amdgpu_umsch_mm *umsch)
                fw_name = "amdgpu/umsch_mm_4_0_0.bin";
                break;
        default:
-               break;
+               return -EINVAL;
        }
 
        r = amdgpu_ucode_request(adev, &adev->umsch_mm.fw, "%s", fw_name);