Skip to content

Commit baacf52

Browse files
yifancomalexdeucher
authored andcommitted
Revert "drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell."
This reverts commit 1c0b0ef. 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: Yifan Zhang <[email protected]> Acked-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
1 parent 4c6a231 commit baacf52

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6871,12 +6871,8 @@ static int gfx_v10_0_kiq_init_register(struct amdgpu_ring *ring)
68716871
if (ring->use_doorbell) {
68726872
WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,
68736873
(adev->doorbell_index.kiq * 2) << 2);
6874-
/* If GC has entered CGPG, ringing doorbell > first page doesn't
6875-
* wakeup GC. Enlarge CP_MEC_DOORBELL_RANGE_UPPER to workaround
6876-
* this issue.
6877-
*/
68786874
WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,
6879-
(adev->doorbell.size - 4));
6875+
(adev->doorbell_index.userqueue_end * 2) << 2);
68806876
}
68816877

68826878
WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,

0 commit comments

Comments
 (0)