Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e4b070e authored by Heinrich Schuchardt's avatar Heinrich Schuchardt Committed by Alex Deucher
Browse files

drm/radeon/cik: remove dead code (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 bb1800ca

drivers/gpu/drm/radeon/cik.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -1871,7 +1871,7 @@ int ci_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, tmp;

	u32 running, tmp;

	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;
@@ -1912,11 +1912,6 @@ int ci_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);
@@ -1964,9 +1959,6 @@ int ci_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;