Commit 571c0536 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: switch sdma buffer function tear down to a helper 



Switch all of the SDMA implementations to use the helper to
tear down the ttm buffer manager.

Tested-by: default avatarBokun Zhang <Bokun.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e5da6519

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

+21 −0
Original line number Diff line number Diff line
@@ -285,3 +285,24 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev, 
	}

	return err;

}



void amdgpu_sdma_unset_buffer_funcs_helper(struct amdgpu_device *adev)

{

	struct amdgpu_ring *sdma;

	int i;



	for (i = 0; i < adev->sdma.num_instances; i++) {

		if (adev->sdma.has_page_queue) {

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

			if (adev->mman.buffer_funcs_ring == sdma) {

				amdgpu_ttm_set_buffer_funcs_status(adev, false);

				break;

			}

		}

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

		if (adev->mman.buffer_funcs_ring == sdma) {

			amdgpu_ttm_set_buffer_funcs_status(adev, false);

			break;

		}

	}

}

drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h

+2 −0
Original line number Diff line number Diff line
@@ -128,4 +128,6 @@ int amdgpu_sdma_init_microcode(struct amdgpu_device *adev, 
        char *fw_name, u32 instance, bool duplicate);

void amdgpu_sdma_destroy_inst_ctx(struct amdgpu_device *adev,

        bool duplicate);

void amdgpu_sdma_unset_buffer_funcs_helper(struct amdgpu_device *adev);



#endif

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

+1 −5
Original line number Diff line number Diff line
@@ -309,14 +309,10 @@ static void cik_sdma_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 seq 
 */

static void cik_sdma_gfx_stop(struct amdgpu_device *adev)

{

	struct amdgpu_ring *sdma0 = &adev->sdma.instance[0].ring;

	struct amdgpu_ring *sdma1 = &adev->sdma.instance[1].ring;

	u32 rb_cntl;

	int i;



	if ((adev->mman.buffer_funcs_ring == sdma0) ||

	    (adev->mman.buffer_funcs_ring == sdma1))

			amdgpu_ttm_set_buffer_funcs_status(adev, false);

	amdgpu_sdma_unset_buffer_funcs_helper(adev);



	for (i = 0; i < adev->sdma.num_instances; i++) {

		rb_cntl = RREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i]);

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

+1 −5
Original line number Diff line number Diff line
@@ -342,14 +342,10 @@ static void sdma_v2_4_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 se 
 */

static void sdma_v2_4_gfx_stop(struct amdgpu_device *adev)

{

	struct amdgpu_ring *sdma0 = &adev->sdma.instance[0].ring;

	struct amdgpu_ring *sdma1 = &adev->sdma.instance[1].ring;

	u32 rb_cntl, ib_cntl;

	int i;



	if ((adev->mman.buffer_funcs_ring == sdma0) ||

	    (adev->mman.buffer_funcs_ring == sdma1))

		amdgpu_ttm_set_buffer_funcs_status(adev, false);

	amdgpu_sdma_unset_buffer_funcs_helper(adev);



	for (i = 0; i < adev->sdma.num_instances; i++) {

		rb_cntl = RREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i]);

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

+1 −5
Original line number Diff line number Diff line
@@ -516,14 +516,10 @@ static void sdma_v3_0_ring_emit_fence(struct amdgpu_ring *ring, u64 addr, u64 se 
 */

static void sdma_v3_0_gfx_stop(struct amdgpu_device *adev)

{

	struct amdgpu_ring *sdma0 = &adev->sdma.instance[0].ring;

	struct amdgpu_ring *sdma1 = &adev->sdma.instance[1].ring;

	u32 rb_cntl, ib_cntl;

	int i;



	if ((adev->mman.buffer_funcs_ring == sdma0) ||

	    (adev->mman.buffer_funcs_ring == sdma1))

		amdgpu_ttm_set_buffer_funcs_status(adev, false);

	amdgpu_sdma_unset_buffer_funcs_helper(adev);



	for (i = 0; i < adev->sdma.num_instances; i++) {

		rb_cntl = RREG32(mmSDMA0_GFX_RB_CNTL + sdma_offsets[i]);