Commit 1c0539a6 authored by Yifan Zhang's avatar Yifan Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: fix the doorbell missing when in CGPG issue for renoir. 



If GC has entered CGPG, ringing doorbell > first page doesn't wakeup GC.
Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround this issue.

Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4d77f36f

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

+20 −1
Original line number Diff line number Diff line
@@ -1295,6 +1295,16 @@ static bool is_raven_kicker(struct amdgpu_device *adev) 
		return false;

}



static bool check_if_enlarge_doorbell_range(struct amdgpu_device *adev)

{

	if ((adev->asic_type == CHIP_RENOIR) &&

	    (adev->gfx.me_fw_version >= 0x000000a5) &&

	    (adev->gfx.me_feature_version >= 52))

		return true;

	else

		return false;

}



static void gfx_v9_0_check_if_need_gfxoff(struct amdgpu_device *adev)

{

	if (gfx_v9_0_should_disable_gfxoff(adev->pdev))
@@ -3675,6 +3685,15 @@ static int gfx_v9_0_kiq_init_register(struct amdgpu_ring *ring) 
	if (ring->use_doorbell) {

		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,

					(adev->doorbell_index.kiq * 2) << 2);

		/* If GC has entered CGPG, ringing doorbell > first page

		 * doesn't wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to

		 * workaround this issue. And this change has to align with firmware

		 * update.

		 */

		if (check_if_enlarge_doorbell_range(adev))

			WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,

					(adev->doorbell.size - 4));

		else

			WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,

					(adev->doorbell_index.userqueue_end * 2) << 2);

	}