Commit ddbbd3be authored by Heinrich Schuchardt's avatar Heinrich Schuchardt Committed by Alex Deucher

drm/radeon: remove dead code, si_mc_load_microcode (v2)

In an if block for (running == 0) running cannot be non-zero.

v2: agd: remove unused variable
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarHeinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6e4b070e
...@@ -1547,7 +1547,7 @@ int si_mc_load_microcode(struct radeon_device *rdev) ...@@ -1547,7 +1547,7 @@ int si_mc_load_microcode(struct radeon_device *rdev)
{ {
const __be32 *fw_data = NULL; const __be32 *fw_data = NULL;
const __le32 *new_fw_data = NULL; const __le32 *new_fw_data = NULL;
u32 running, blackout = 0; u32 running;
u32 *io_mc_regs = NULL; u32 *io_mc_regs = NULL;
const __le32 *new_io_mc_regs = NULL; const __le32 *new_io_mc_regs = NULL;
int i, regs_size, ucode_size; int i, regs_size, ucode_size;
...@@ -1598,11 +1598,6 @@ int si_mc_load_microcode(struct radeon_device *rdev) ...@@ -1598,11 +1598,6 @@ int si_mc_load_microcode(struct radeon_device *rdev)
running = RREG32(MC_SEQ_SUP_CNTL) & RUN_MASK; running = RREG32(MC_SEQ_SUP_CNTL) & RUN_MASK;
if (running == 0) { if (running == 0) {
if (running) {
blackout = RREG32(MC_SHARED_BLACKOUT_CNTL);
WREG32(MC_SHARED_BLACKOUT_CNTL, blackout | 1);
}
/* reset the engine and set to writable */ /* reset the engine and set to writable */
WREG32(MC_SEQ_SUP_CNTL, 0x00000008); WREG32(MC_SEQ_SUP_CNTL, 0x00000008);
WREG32(MC_SEQ_SUP_CNTL, 0x00000010); WREG32(MC_SEQ_SUP_CNTL, 0x00000010);
...@@ -1641,9 +1636,6 @@ int si_mc_load_microcode(struct radeon_device *rdev) ...@@ -1641,9 +1636,6 @@ int si_mc_load_microcode(struct radeon_device *rdev)
break; break;
udelay(1); udelay(1);
} }
if (running)
WREG32(MC_SHARED_BLACKOUT_CNTL, blackout);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment