Commit 7f03b1d1 authored by Mangesh Gadre's avatar Mangesh Gadre Committed by Alex Deucher
Browse files

drm/amdgpu:Remove sdma halt/unhalt during frontdoor load 



sdma halt/unhalt is performed by psp when frontdoor
loading used,so this can be skipped.

v2: Instead of removing halt/unhalt completely,
    driver will do it only during backdoor load.

Signed-off-by: default avatarMangesh Gadre <Mangesh.Gadre@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4ff96bcc

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

+9 −4
Original line number Diff line number Diff line
@@ -578,6 +578,9 @@ static void sdma_v4_4_2_inst_enable(struct amdgpu_device *adev, bool enable, 
			return;

	}



	if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)

		return;



	for_each_inst(i, inst_mask) {

		f32_cntl = RREG32_SDMA(i, regSDMA_F32_CNTL);

		f32_cntl = REG_SET_FIELD(f32_cntl, SDMA_F32_CNTL, HALT, enable ? 0 : 1);
@@ -904,12 +907,14 @@ static int sdma_v4_4_2_inst_start(struct amdgpu_device *adev, 
				ring->use_doorbell, ring->doorbell_index,

				adev->doorbell_index.sdma_doorbell_range);



			if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {

				/* unhalt engine */

				temp = RREG32_SDMA(i, regSDMA_F32_CNTL);

				temp = REG_SET_FIELD(temp, SDMA_F32_CNTL, HALT, 0);

				WREG32_SDMA(i, regSDMA_F32_CNTL, temp);

			}

		}

	}



	if (amdgpu_sriov_vf(adev)) {

		sdma_v4_4_2_inst_ctx_switch_enable(adev, true, inst_mask);