Skip to content

Commit 2d42cf5

Browse files
Jie1zhanggregkh
authored andcommitted
drm/amdgpu: Fix SDMA UTC_L1 handling during start/stop sequences
commit 7f3b16f upstream. This commit makes two key fixes to SDMA v4.4.2 handling: 1. disable UTC_L1 in sdma_cntl register when stopping SDMA engines by reading the current value before modifying UTC_L1_ENABLE bit. 2. Ensure UTC_L1_ENABLE is consistently managed by: - Adding the missing register write when enabling UTC_L1 during start - Keeping UTC_L1 enabled by default as per hardware requirements v2: Correct SDMA_CNTL setting (Philip) Suggested-by: Jonathan Kim <jonathan.kim@amd.com> Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 375bf56) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0b48de0 commit 2d42cf5

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ static void sdma_v4_4_2_inst_gfx_stop(struct amdgpu_device *adev,
489489
{
490490
struct amdgpu_ring *sdma[AMDGPU_MAX_SDMA_INSTANCES];
491491
u32 doorbell_offset, doorbell;
492-
u32 rb_cntl, ib_cntl;
492+
u32 rb_cntl, ib_cntl, sdma_cntl;
493493
int i;
494494

495495
for_each_inst(i, inst_mask) {
@@ -501,6 +501,9 @@ static void sdma_v4_4_2_inst_gfx_stop(struct amdgpu_device *adev,
501501
ib_cntl = RREG32_SDMA(i, regSDMA_GFX_IB_CNTL);
502502
ib_cntl = REG_SET_FIELD(ib_cntl, SDMA_GFX_IB_CNTL, IB_ENABLE, 0);
503503
WREG32_SDMA(i, regSDMA_GFX_IB_CNTL, ib_cntl);
504+
sdma_cntl = RREG32_SDMA(i, regSDMA_CNTL);
505+
sdma_cntl = REG_SET_FIELD(sdma_cntl, SDMA_CNTL, UTC_L1_ENABLE, 0);
506+
WREG32_SDMA(i, regSDMA_CNTL, sdma_cntl);
504507

505508
if (sdma[i]->use_doorbell) {
506509
doorbell = RREG32_SDMA(i, regSDMA_GFX_DOORBELL);
@@ -994,6 +997,7 @@ static int sdma_v4_4_2_inst_start(struct amdgpu_device *adev,
994997
/* set utc l1 enable flag always to 1 */
995998
temp = RREG32_SDMA(i, regSDMA_CNTL);
996999
temp = REG_SET_FIELD(temp, SDMA_CNTL, UTC_L1_ENABLE, 1);
1000+
WREG32_SDMA(i, regSDMA_CNTL, temp);
9971001

9981002
if (amdgpu_ip_version(adev, SDMA0_HWIP, 0) < IP_VERSION(4, 4, 5)) {
9991003
/* enable context empty interrupt during initialization */

0 commit comments

Comments
 (0)