for SRIOV gpu reset: this feature allows driver to judge how much time can a job hang for and will kickout this job from ring_mirror list when doing recover if the threshold is exceeded. Monk Liu (4): drm/amdgpu:don't invoke srio-gpu-reset in gpu-reset drm/amdgpu:use job* to replace voluntary drm/amdgpu:only call flr_work under infinite timeout drm/amdgpu/SRIOV:implement guilty job TDR for drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 4 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 46 +++++++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 11 ++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 6 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 2 +- drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 +- drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 15 +++++---- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1 + drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +-- drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 11 ++++++- drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 7 ++++ 18 files changed, 92 insertions(+), 31 deletions(-) -- 2.7.4