]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/radeon: remove dead code in ni_mc_load_microcode()
authorNikita Zhandarovich <n.zhandarovich@fintech.ru>
Wed, 17 Jan 2024 14:44:36 +0000 (06:44 -0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 22 Jan 2024 21:55:51 +0000 (16:55 -0500)
Inside the if block with (running == 0), the checks for 'running'
possibly being non-zero are redundant. Remove them altogether.

This change is similar to the one authored by Heinrich Schuchardt
<xypron.glpk@gmx.de> in commit
ddbbd3be9679 ("drm/radeon: remove dead code, si_mc_load_microcode (v2)")

Found by Linux Verification Center (linuxtesting.org) with static
analysis tool Svace.

Fixes: 0af62b016804 ("drm/radeon/kms: add ucode loader for NI")
Signed-off-by: Nikita Zhandarovich <n.zhandarovich@fintech.ru>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/ni.c

index 6f231a740ba531d1f646ee665350882593f12f29..9f0881ab3105c683471fec3a0adb42240388024d 100644 (file)
@@ -618,7 +618,7 @@ static const u32 cayman_io_mc_regs[BTC_IO_MC_REGS_SIZE][2] = {
 int ni_mc_load_microcode(struct radeon_device *rdev)
 {
        const __be32 *fw_data;
-       u32 mem_type, running, blackout = 0;
+       u32 mem_type, running;
        u32 *io_mc_regs;
        int i, ucode_size, regs_size;
 
@@ -653,11 +653,6 @@ int ni_mc_load_microcode(struct radeon_device *rdev)
        running = RREG32(MC_SEQ_SUP_CNTL) & RUN_MASK;
 
        if ((mem_type == MC_SEQ_MISC0_GDDR5_VALUE) && (running == 0)) {
-               if (running) {
-                       blackout = RREG32(MC_SHARED_BLACKOUT_CNTL);
-                       WREG32(MC_SHARED_BLACKOUT_CNTL, 1);
-               }
-
                /* reset the engine and set to writable */
                WREG32(MC_SEQ_SUP_CNTL, 0x00000008);
                WREG32(MC_SEQ_SUP_CNTL, 0x00000010);
@@ -683,9 +678,6 @@ int ni_mc_load_microcode(struct radeon_device *rdev)
                                break;
                        udelay(1);
                }
-
-               if (running)
-                       WREG32(MC_SHARED_BLACKOUT_CNTL, blackout);
        }
 
        return 0;