openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "drm/amdgpu: Fix bugs in setting CP RB/MEC DOORBELL_RANGE registers" 

The original change caused a regression, so revert it until the new fix
is ready.

BUG: https://bugs.freedesktop.org/show_bug.cgi?id=109650

This reverts commit 764c85fef41722db0f21558c6c2fb38bee172d19.

Signed-off-by: Yong Zhao <Yong.Zhao@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Yong Zhao 2019-02-19 11:21:51 -05:00 committed by Alex Deucher
parent e02c80d60c
commit a4a3ad3523
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
View File

@ -4223,8 +4223,8 @@ static void gfx_v8_0_set_cpg_door_bell(struct amdgpu_device *adev, struct amdgpu
adev->doorbell_index.gfx_ring0); adev->doorbell_index.gfx_ring0);
WREG32(mmCP_RB_DOORBELL_RANGE_LOWER, tmp); WREG32(mmCP_RB_DOORBELL_RANGE_LOWER, tmp);
/* There is only one GFX queue */ WREG32(mmCP_RB_DOORBELL_RANGE_UPPER,
WREG32(mmCP_RB_DOORBELL_RANGE_UPPER, tmp); CP_RB_DOORBELL_RANGE_UPPER__DOORBELL_RANGE_UPPER_MASK);
} }
static int gfx_v8_0_cp_gfx_resume(struct amdgpu_device *adev) static int gfx_v8_0_cp_gfx_resume(struct amdgpu_device *adev)
@ -4646,19 +4646,8 @@ static int gfx_v8_0_kcq_init_queue(struct amdgpu_ring *ring)
static void gfx_v8_0_set_mec_doorbell_range(struct amdgpu_device *adev) static void gfx_v8_0_set_mec_doorbell_range(struct amdgpu_device *adev)
{ {
if (adev->asic_type > CHIP_TONGA) { if (adev->asic_type > CHIP_TONGA) {
/* The first few doorbells in pci doorbell bar are for GFX RB WREG32(mmCP_MEC_DOORBELL_RANGE_LOWER, adev->doorbell_index.kiq << 2);
* rings and all the leftover for MEC. WREG32(mmCP_MEC_DOORBELL_RANGE_UPPER, adev->doorbell_index.mec_ring7 << 2);
* So CP_MEC_DOORBELL_RANGE_LOWER should be set one index after
* CP_RB_DOORBELL_RANGE_UPPER, as we assume there is only one
* GFX RB rings.
*/
u32 tmp = REG_SET_FIELD(0, CP_MEC_DOORBELL_RANGE_LOWER,
DOORBELL_RANGE_LOWER,
adev->gfx.gfx_ring[0].doorbell_index + 1);
WREG32(mmCP_MEC_DOORBELL_RANGE_LOWER, tmp);
WREG32(mmCP_MEC_DOORBELL_RANGE_UPPER,
CP_MEC_DOORBELL_RANGE_UPPER__DOORBELL_RANGE_UPPER_MASK);
} }
/* enable doorbells */ /* enable doorbells */
WREG32_FIELD(CP_PQ_STATUS, DOORBELL_ENABLE, 1); WREG32_FIELD(CP_PQ_STATUS, DOORBELL_ENABLE, 1);

19
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
View File

@ -2631,8 +2631,8 @@ static int gfx_v9_0_cp_gfx_resume(struct amdgpu_device *adev)
DOORBELL_RANGE_LOWER, ring->doorbell_index); DOORBELL_RANGE_LOWER, ring->doorbell_index);
WREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_RANGE_LOWER, tmp); WREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_RANGE_LOWER, tmp);
/* There is only one GFX queue */ WREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_RANGE_UPPER,
WREG32_SOC15(GC, 0, mmCP_RB_DOORBELL_RANGE_UPPER, tmp); CP_RB_DOORBELL_RANGE_UPPER__DOORBELL_RANGE_UPPER_MASK);
/* start the ring */ /* start the ring */
@ -2995,19 +2995,10 @@ static int gfx_v9_0_kiq_init_register(struct amdgpu_ring *ring)
/* enable the doorbell if requested */ /* enable the doorbell if requested */
if (ring->use_doorbell) { if (ring->use_doorbell) {
/* The first few doorbells in pci doorbell bar are for GFX RB WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER,
* rings and all the leftover for MEC. (adev->doorbell_index.kiq * 2) << 2);
* So CP_MEC_DOORBELL_RANGE_LOWER should be set one index after
* CP_RB_DOORBELL_RANGE_UPPER, as we assume there is only one
* GFX RB rings.
*/
u32 tmp = REG_SET_FIELD(0, CP_MEC_DOORBELL_RANGE_LOWER,
DOORBELL_RANGE_LOWER,
adev->gfx.gfx_ring[0].doorbell_index + 2);
WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_LOWER, tmp);
WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER, WREG32_SOC15(GC, 0, mmCP_MEC_DOORBELL_RANGE_UPPER,
CP_MEC_DOORBELL_RANGE_UPPER__DOORBELL_RANGE_UPPER_MASK); (adev->doorbell_index.userqueue_end * 2) << 2);
} }
WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL, WREG32_SOC15(GC, 0, mmCP_HQD_PQ_DOORBELL_CONTROL,