Commit 32f00289 authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/amdgpu/gfx9: put queue resets behind a debug option" 



This reverts commit 7c1a2d8a.

Extended validation has completed successfully, so enable
these features by default.

Acked-by: default avatarJiadong Zhu <Jiadong.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: Jonathan Kim <jonathan.kim@amd.com>
Cc: Jiadong Zhu <Jiadong.Zhu@amd.com>
parent 9ee8ab24

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

+0 −4
Original line number Diff line number Diff line
@@ -1131,10 +1131,6 @@ uint64_t kgd_gfx_v9_hqd_get_pq_addr(struct amdgpu_device *adev, 
	uint32_t low, high;

	uint64_t queue_addr = 0;



	if (!adev->debug_exp_resets &&

	    !adev->gfx.num_gfx_rings)

		return 0;



	kgd_gfx_v9_acquire_queue(adev, pipe_id, queue_id, inst);

	amdgpu_gfx_rlc_enter_safe_mode(adev, inst);

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

+0 −4
Original line number Diff line number Diff line
@@ -7257,10 +7257,6 @@ static int gfx_v9_0_reset_kcq(struct amdgpu_ring *ring, 
	unsigned long flags;

	int i, r;



	if (!adev->debug_exp_resets &&

	    !adev->gfx.num_gfx_rings)

		return -EINVAL;



	if (amdgpu_sriov_vf(adev))

		return -EINVAL;

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

+0 −6
Original line number Diff line number Diff line
@@ -3054,9 +3054,6 @@ static void gfx_v9_4_3_ring_soft_recovery(struct amdgpu_ring *ring, 
	struct amdgpu_device *adev = ring->adev;

	uint32_t value = 0;



	if (!adev->debug_exp_resets)

		return;



	value = REG_SET_FIELD(value, SQ_CMD, CMD, 0x03);

	value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);

	value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);
@@ -3572,9 +3569,6 @@ static int gfx_v9_4_3_reset_kcq(struct amdgpu_ring *ring, 
	unsigned long flags;

	int r;



	if (!adev->debug_exp_resets)

		return -EINVAL;



	if (amdgpu_sriov_vf(adev))

		return -EINVAL;