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

Commit c77c617e authored by Yifan Zhang's avatar Yifan Zhang Committed by Sasha Levin
Browse files

Revert "drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell." 



commit baacf52a473b24e10322b67757ddb92ab8d86717 upstream.

This reverts commit 1c0b0efd148d5b24c4932ddb3fa03c8edd6097b3.

Reason for revert: Side effect of enlarging CP_MEC_DOORBELL_RANGE may
cause some APUs fail to enter gfxoff in certain user cases.

Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6bd0da6c

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

+1 −5
Original line number Diff line number Diff line
@@ -3416,12 +3416,8 @@ static int gfx_v10_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.

		 */

		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,

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

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

	}



	WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,