Merge branch 'drm-next-4.21' of git://people.freedesktop.org/~agd5f/linux into drm-next
New features for 4.21: amdgpu: - Support for SDMA paging queue on vega - Put compute EOP buffers into vram for better performance - Share more code with amdkfd - Support for scanout with DCC on gfx9 - Initial kerneldoc for DC - Updated SMU firmware support for gfx8 chips - Rework CSA handling for eventual support for preemption - XGMI PSP support - Clean up RLC handling - Enable GPU reset by default on VI, SOC15 dGPUs - Ring and IB test cleanups amdkfd: - Share more code with amdgpu ttm: - Move global init out of the drivers scheduler: - Track if schedulers are ready for work - Timeout/fault handling changes to facilitate GPU recovery Signed-off-by: Dave Airlie <airlied@redhat.com> From: Alex Deucher <alexdeucher@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181114165113.3751-1-alexander.deucher@amd.com
This commit is contained in:
@@ -35,6 +35,8 @@ v3d_job_free(struct drm_sched_job *sched_job)
|
||||
{
|
||||
struct v3d_job *job = to_v3d_job(sched_job);
|
||||
|
||||
drm_sched_job_cleanup(sched_job);
|
||||
|
||||
v3d_exec_put(job->exec);
|
||||
}
|
||||
|
||||
@@ -167,9 +169,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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user