Commit 01d05521 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gfx11: use proper rlc safe mode helpers 



Rather than open coding it for the queue reset.

Acked-by: default avatarVitaly Prosyak <vitaly.prosyak@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bcee4c3f

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

+4 −4
Original line number Diff line number Diff line
@@ -4781,7 +4781,7 @@ static int gfx_v11_0_soft_reset(void *handle) 
	int r, i, j, k;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	gfx_v11_0_set_safe_mode(adev, 0);

	amdgpu_gfx_rlc_enter_safe_mode(adev, 0);



	tmp = RREG32_SOC15(GC, 0, regCP_INT_CNTL);

	tmp = REG_SET_FIELD(tmp, CP_INT_CNTL, CMP_BUSY_INT_ENABLE, 0);
@@ -4900,7 +4900,7 @@ static int gfx_v11_0_soft_reset(void *handle) 
	tmp = REG_SET_FIELD(tmp, CP_INT_CNTL, GFX_IDLE_INT_ENABLE, 1);

	WREG32_SOC15(GC, 0, regCP_INT_CNTL, tmp);



	gfx_v11_0_unset_safe_mode(adev, 0);

	amdgpu_gfx_rlc_exit_safe_mode(adev, 0);



	return gfx_v11_0_cp_resume(adev);

}
@@ -6590,7 +6590,7 @@ static int gfx_v11_0_reset_kcq(struct amdgpu_ring *ring, unsigned int vmid) 
	if (amdgpu_sriov_vf(adev))

		return -EINVAL;



	gfx_v11_0_set_safe_mode(adev, 0);

	amdgpu_gfx_rlc_enter_safe_mode(adev, 0);

	mutex_lock(&adev->srbm_mutex);

	soc21_grbm_select(adev, ring->me, ring->pipe, ring->queue, 0);

	WREG32_SOC15(GC, 0, regCP_HQD_DEQUEUE_REQUEST, 0x2);
@@ -6606,7 +6606,7 @@ static int gfx_v11_0_reset_kcq(struct amdgpu_ring *ring, unsigned int vmid) 
		r = -ETIMEDOUT;

	soc21_grbm_select(adev, 0, 0, 0, 0);

	mutex_unlock(&adev->srbm_mutex);

	gfx_v11_0_unset_safe_mode(adev, 0);

	amdgpu_gfx_rlc_exit_safe_mode(adev, 0);

	if (r) {

		dev_err(adev->dev, "fail to wait on hqd deactivate\n");

		return r;