Commit c3bf96ea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-06-18' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Not much happening in fixes land this week only one PR for two amdgpu
  powergating fixes was waiting for me, maybe something will show up
  over the weekend, maybe not.

  amdgpu:

   - GFX9 and 10 powergating fixes"

* tag 'drm-fixes-2021-06-18' of git://anongit.freedesktop.org/drm/drm:
  drm/amdgpu/gfx10: enlarge CP_MEC_DOORBELL_RANGE_UPPER to cover full doorbell.
  drm/amdgpu/gfx9: fix the doorbell missing when in CGPG issue.
parents fd0aa1a4 c55338d3

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

+5 −1
Original line number Diff line number Diff line
@@ -6871,8 +6871,12 @@ 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_index.userqueue_end * 2) << 2);

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

	}



	WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,

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

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

		 */

		WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,

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

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

	}



	WREG32_SOC15_RLC(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,