Commit 998d3fd4 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: remove SRIOV specific handling from sdma_v4_0_gfx_resume 



Just use the same code path for both SRIOV and bare metal.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 09f0b4ff

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

+1 −7
Original line number Diff line number Diff line
@@ -725,11 +725,6 @@ static void sdma_v4_0_gfx_resume(struct amdgpu_device *adev, unsigned int i) 
	/* before programing wptr to a less value, need set minor_ptr_update first */

	WREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_MINOR_PTR_UPDATE), 1);



	if (!amdgpu_sriov_vf(adev)) { /* only bare-metal use register write for wptr */

		WREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_RB_WPTR), lower_32_bits(ring->wptr) << 2);

		WREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_RB_WPTR_HI), upper_32_bits(ring->wptr) << 2);

	}



	doorbell = RREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_DOORBELL));

	doorbell_offset = RREG32(sdma_v4_0_get_reg_offset(adev, i, mmSDMA0_GFX_DOORBELL_OFFSET));
@@ -745,7 +740,6 @@ static void sdma_v4_0_gfx_resume(struct amdgpu_device *adev, unsigned int i) 
	adev->nbio_funcs->sdma_doorbell_range(adev, i, ring->use_doorbell,

					      ring->doorbell_index);



	if (amdgpu_sriov_vf(adev))

	sdma_v4_0_ring_set_wptr(ring);



	/* set minor_ptr_update to 0 after wptr programed */

CRA Git | Maintained and supported by SUSTech CRA and CCSE