Commit 19067e52 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/sched: make sure timer is restarted 



Make sure we always restart the timer after a timeout and remove the
device specific workarounds.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 548f2ecc

drivers/gpu/drm/etnaviv/etnaviv_sched.c

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ static void etnaviv_sched_timedout_job(struct drm_sched_job *sched_job) 
	change = dma_addr - gpu->hangcheck_dma_addr;

	if (change < 0 || change > 16) {

		gpu->hangcheck_dma_addr = dma_addr;

		schedule_delayed_work(&sched_job->sched->work_tdr,

				      sched_job->sched->timeout);

		return;

	}

drivers/gpu/drm/scheduler/sched_main.c

+1 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ static void drm_sched_job_timedout(struct work_struct *work) 
already_signaled:

		;

	}

	drm_sched_start_timeout(sched);

	spin_unlock(&sched->job_list_lock);

}

drivers/gpu/drm/v3d/v3d_sched.c

+0 −3
Original line number Diff line number Diff line
@@ -167,9 +167,6 @@ v3d_job_timedout(struct drm_sched_job *sched_job) 
	if (job->timedout_ctca != ctca || job->timedout_ctra != ctra) {

		job->timedout_ctca = ctca;

		job->timedout_ctra = ctra;



		schedule_delayed_work(&job->base.sched->work_tdr,

				      job->base.sched->timeout);

		return;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE