summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
diff options
context:
space:
mode:
authorMonk Liu2016-03-04 11:51:02 +0100
committerAlex Deucher2016-05-02 21:19:57 +0200
commit0de2479c953ae07fd11e7b1bc8d4fc831e6842bb (patch)
treeceb625203d34fe6920545e2e08839c7e3e535d03 /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
parentdrm/amdgpu: get rid of incorrect TDR (diff)
downloadkernel-qcow2-linux-0de2479c953ae07fd11e7b1bc8d4fc831e6842bb.tar.gz
kernel-qcow2-linux-0de2479c953ae07fd11e7b1bc8d4fc831e6842bb.tar.xz
kernel-qcow2-linux-0de2479c953ae07fd11e7b1bc8d4fc831e6842bb.zip
drm/amdgpu: rework TDR in scheduler (v2)
Add two callbacks to scheduler to maintain jobs, and invoked for job timeout calculations. Now TDR measures time gap from job is processed by hw. v2: fix typo Signed-off-by: Monk Liu <Monk.Liu@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 23266b454aec..9025671d21c3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@ -871,6 +871,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
r = amd_sched_job_init(&job->base, &ring->sched,
&p->ctx->rings[ring->idx].entity,
+ amdgpu_job_timeout_func,
p->filp, &fence);
if (r) {
amdgpu_job_free(job);