Skip to content

Commit ad550db

Browse files
Le Maalexdeucher
authored andcommitted
drm/amdgpu: drop setting buffer funcs in sdma442
To fix the entity rq NULL issue. This setting has been moved to upper level. Fixes: b704380 ("drm/amdgpu: move buffer funcs setting up a level") Signed-off-by: Le Ma <[email protected]> Reviewed-by: Hawking Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 69e3be6 commit ad550db

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

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

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -431,16 +431,11 @@ static void sdma_v4_4_2_inst_gfx_stop(struct amdgpu_device *adev,
431431
struct amdgpu_ring *sdma[AMDGPU_MAX_SDMA_INSTANCES];
432432
u32 doorbell_offset, doorbell;
433433
u32 rb_cntl, ib_cntl;
434-
int i, unset = 0;
434+
int i;
435435

436436
for_each_inst(i, inst_mask) {
437437
sdma[i] = &adev->sdma.instance[i].ring;
438438

439-
if ((adev->mman.buffer_funcs_ring == sdma[i]) && unset != 1) {
440-
amdgpu_ttm_set_buffer_funcs_status(adev, false);
441-
unset = 1;
442-
}
443-
444439
rb_cntl = RREG32_SDMA(i, regSDMA_GFX_RB_CNTL);
445440
rb_cntl = REG_SET_FIELD(rb_cntl, SDMA_GFX_RB_CNTL, RB_ENABLE, 0);
446441
WREG32_SDMA(i, regSDMA_GFX_RB_CNTL, rb_cntl);
@@ -487,20 +482,10 @@ static void sdma_v4_4_2_inst_rlc_stop(struct amdgpu_device *adev,
487482
static void sdma_v4_4_2_inst_page_stop(struct amdgpu_device *adev,
488483
uint32_t inst_mask)
489484
{
490-
struct amdgpu_ring *sdma[AMDGPU_MAX_SDMA_INSTANCES];
491485
u32 rb_cntl, ib_cntl;
492486
int i;
493-
bool unset = false;
494487

495488
for_each_inst(i, inst_mask) {
496-
sdma[i] = &adev->sdma.instance[i].page;
497-
498-
if ((adev->mman.buffer_funcs_ring == sdma[i]) &&
499-
(!unset)) {
500-
amdgpu_ttm_set_buffer_funcs_status(adev, false);
501-
unset = true;
502-
}
503-
504489
rb_cntl = RREG32_SDMA(i, regSDMA_PAGE_RB_CNTL);
505490
rb_cntl = REG_SET_FIELD(rb_cntl, SDMA_PAGE_RB_CNTL,
506491
RB_ENABLE, 0);
@@ -950,13 +935,7 @@ static int sdma_v4_4_2_inst_start(struct amdgpu_device *adev,
950935
r = amdgpu_ring_test_helper(page);
951936
if (r)
952937
return r;
953-
954-
if (adev->mman.buffer_funcs_ring == page)
955-
amdgpu_ttm_set_buffer_funcs_status(adev, true);
956938
}
957-
958-
if (adev->mman.buffer_funcs_ring == ring)
959-
amdgpu_ttm_set_buffer_funcs_status(adev, true);
960939
}
961940

962941
return r;

0 commit comments

Comments
 (0)