Commit 38aea071 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon/cik: write gfx ucode version to ucode addr reg 



Helpful for debugging as the version shows up in a
register dump.

Cc: Jay Cornwall <jay.cornwall@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9d0223d5

drivers/gpu/drm/radeon/cik.c

+7 −10
Original line number Diff line number Diff line
@@ -4235,7 +4235,7 @@ static int cik_cp_gfx_load_microcode(struct radeon_device *rdev) 
		WREG32(CP_PFP_UCODE_ADDR, 0);

		for (i = 0; i < fw_size; i++)

			WREG32(CP_PFP_UCODE_DATA, le32_to_cpup(fw_data++));

		WREG32(CP_PFP_UCODE_ADDR, 0);

		WREG32(CP_PFP_UCODE_ADDR, le32_to_cpu(pfp_hdr->header.ucode_version));



		/* CE */

		fw_data = (const __le32 *)
@@ -4244,7 +4244,7 @@ static int cik_cp_gfx_load_microcode(struct radeon_device *rdev) 
		WREG32(CP_CE_UCODE_ADDR, 0);

		for (i = 0; i < fw_size; i++)

			WREG32(CP_CE_UCODE_DATA, le32_to_cpup(fw_data++));

		WREG32(CP_CE_UCODE_ADDR, 0);

		WREG32(CP_CE_UCODE_ADDR, le32_to_cpu(ce_hdr->header.ucode_version));



		/* ME */

		fw_data = (const __be32 *)
@@ -4253,7 +4253,8 @@ static int cik_cp_gfx_load_microcode(struct radeon_device *rdev) 
		WREG32(CP_ME_RAM_WADDR, 0);

		for (i = 0; i < fw_size; i++)

			WREG32(CP_ME_RAM_DATA, le32_to_cpup(fw_data++));

		WREG32(CP_ME_RAM_WADDR, 0);

		WREG32(CP_ME_RAM_WADDR, le32_to_cpu(me_hdr->header.ucode_version));

		WREG32(CP_ME_RAM_RADDR, le32_to_cpu(me_hdr->header.ucode_version));

	} else {

		const __be32 *fw_data;
@@ -4279,10 +4280,6 @@ static int cik_cp_gfx_load_microcode(struct radeon_device *rdev) 
		WREG32(CP_ME_RAM_WADDR, 0);

	}



	WREG32(CP_PFP_UCODE_ADDR, 0);

	WREG32(CP_CE_UCODE_ADDR, 0);

	WREG32(CP_ME_RAM_WADDR, 0);

	WREG32(CP_ME_RAM_RADDR, 0);

	return 0;

}
@@ -4564,7 +4561,7 @@ static int cik_cp_compute_load_microcode(struct radeon_device *rdev) 
		WREG32(CP_MEC_ME1_UCODE_ADDR, 0);

		for (i = 0; i < fw_size; i++)

			WREG32(CP_MEC_ME1_UCODE_DATA, le32_to_cpup(fw_data++));

		WREG32(CP_MEC_ME1_UCODE_ADDR, 0);

		WREG32(CP_MEC_ME1_UCODE_ADDR, le32_to_cpu(mec_hdr->header.ucode_version));



		/* MEC2 */

		if (rdev->family == CHIP_KAVERI) {
@@ -4578,7 +4575,7 @@ static int cik_cp_compute_load_microcode(struct radeon_device *rdev) 
			WREG32(CP_MEC_ME2_UCODE_ADDR, 0);

			for (i = 0; i < fw_size; i++)

				WREG32(CP_MEC_ME2_UCODE_DATA, le32_to_cpup(fw_data++));

			WREG32(CP_MEC_ME2_UCODE_ADDR, 0);

			WREG32(CP_MEC_ME2_UCODE_ADDR, le32_to_cpu(mec2_hdr->header.ucode_version));

		}

	} else {

		const __be32 *fw_data;
@@ -6227,7 +6224,7 @@ static int cik_rlc_resume(struct radeon_device *rdev) 
		WREG32(RLC_GPM_UCODE_ADDR, 0);

		for (i = 0; i < size; i++)

			WREG32(RLC_GPM_UCODE_DATA, le32_to_cpup(fw_data++));

		WREG32(RLC_GPM_UCODE_ADDR, 0);

		WREG32(RLC_GPM_UCODE_ADDR, le32_to_cpu(hdr->header.ucode_version));

	} else {

		const __be32 *fw_data;