Commit 11815bb0 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: partially revert "reduce reset time" 



This partially reverts commit 194eb174.

This commit introduced a new state variable into adev without even
remotely worrying about CPU barriers.

Since we already have the amdgpu_in_reset() function exactly for this
use case partially revert that.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 26c95e83

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

+0 −1
Original line number Diff line number Diff line
@@ -1175,7 +1175,6 @@ struct amdgpu_device { 


	struct work_struct		reset_work;



	bool                            job_hang;

	bool                            dc_enabled;

	/* Mask of active clusters */

	uint32_t			aid_mask;

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

+1 −1
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ int amdgpu_amdkfd_unmap_hiq(struct amdgpu_device *adev, u32 doorbell_off, 
	if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)

		return -EINVAL;



	if (!kiq_ring->sched.ready || adev->job_hang)

	if (!kiq_ring->sched.ready || amdgpu_in_reset(adev))

		return 0;



	ring_funcs = kzalloc(sizeof(*ring_funcs), GFP_KERNEL);

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

+2 −2
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ int amdgpu_gfx_disable_kcq(struct amdgpu_device *adev, int xcc_id) 
	if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)

		return -EINVAL;



	if (!kiq_ring->sched.ready || adev->job_hang || amdgpu_in_reset(adev))

	if (!kiq_ring->sched.ready || amdgpu_in_reset(adev))

		return 0;



	spin_lock(&kiq->ring_lock);
@@ -567,7 +567,7 @@ int amdgpu_gfx_disable_kgq(struct amdgpu_device *adev, int xcc_id) 
	if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)

		return -EINVAL;



	if (!adev->gfx.kiq[0].ring.sched.ready || adev->job_hang)

	if (!adev->gfx.kiq[0].ring.sched.ready || amdgpu_in_reset(adev))

		return 0;



	if (amdgpu_gfx_is_master_xcc(adev, xcc_id)) {

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

+0 −3
Original line number Diff line number Diff line
@@ -102,8 +102,6 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) 
		return DRM_GPU_SCHED_STAT_ENODEV;

	}



	adev->job_hang = true;



	/*

	 * Do the coredump immediately after a job timeout to get a very

	 * close dump/snapshot/representation of GPU's current error status
@@ -181,7 +179,6 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) 
	}



exit:

	adev->job_hang = false;

	drm_dev_exit(idx);

	return DRM_GPU_SCHED_STAT_NOMINAL;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -5957,7 +5957,7 @@ static int gfx_v10_0_cp_gfx_enable(struct amdgpu_device *adev, bool enable) 
	else

		WREG32_SOC15(GC, 0, mmCP_ME_CNTL, tmp);



	if (adev->job_hang && !enable)

	if (amdgpu_in_reset(adev) && !enable)

		return 0;



	for (i = 0; i < adev->usec_timeout; i++) {