Commit ad550dbe authored by Le Ma's avatar Le Ma Committed by Alex Deucher
Browse files

drm/amdgpu: drop setting buffer funcs in sdma442 



To fix the entity rq NULL issue. This setting has been moved
to upper level.

Fixes: b7043800 ("drm/amdgpu: move buffer funcs setting up a level")
Signed-off-by: default avatarLe Ma <le.ma@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 69e3be68

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

+1 −22
Original line number Diff line number Diff line
@@ -431,16 +431,11 @@ static void sdma_v4_4_2_inst_gfx_stop(struct amdgpu_device *adev, 
	struct amdgpu_ring *sdma[AMDGPU_MAX_SDMA_INSTANCES];

	u32 doorbell_offset, doorbell;

	u32 rb_cntl, ib_cntl;

	int i, unset = 0;

	int i;



	for_each_inst(i, inst_mask) {

		sdma[i] = &adev->sdma.instance[i].ring;



		if ((adev->mman.buffer_funcs_ring == sdma[i]) && unset != 1) {

			amdgpu_ttm_set_buffer_funcs_status(adev, false);

			unset = 1;

		}



		rb_cntl = RREG32_SDMA(i, regSDMA_GFX_RB_CNTL);

		rb_cntl = REG_SET_FIELD(rb_cntl, SDMA_GFX_RB_CNTL, RB_ENABLE, 0);

		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, 
static void sdma_v4_4_2_inst_page_stop(struct amdgpu_device *adev,

				       uint32_t inst_mask)

{

	struct amdgpu_ring *sdma[AMDGPU_MAX_SDMA_INSTANCES];

	u32 rb_cntl, ib_cntl;

	int i;

	bool unset = false;



	for_each_inst(i, inst_mask) {

		sdma[i] = &adev->sdma.instance[i].page;



		if ((adev->mman.buffer_funcs_ring == sdma[i]) &&

			(!unset)) {

			amdgpu_ttm_set_buffer_funcs_status(adev, false);

			unset = true;

		}



		rb_cntl = RREG32_SDMA(i, regSDMA_PAGE_RB_CNTL);

		rb_cntl = REG_SET_FIELD(rb_cntl, SDMA_PAGE_RB_CNTL,

					RB_ENABLE, 0);
@@ -950,13 +935,7 @@ static int sdma_v4_4_2_inst_start(struct amdgpu_device *adev, 
			r = amdgpu_ring_test_helper(page);

			if (r)

				return r;



			if (adev->mman.buffer_funcs_ring == page)

				amdgpu_ttm_set_buffer_funcs_status(adev, true);

		}



		if (adev->mman.buffer_funcs_ring == ring)

			amdgpu_ttm_set_buffer_funcs_status(adev, true);

	}



	return r;