On Wed, Jan 14, 2026 at 11:47 AM Alex Deucher <[email protected]> wrote: > > This set contains a number of bug fixes and cleanups for > IB handling that I worked on over the holidays. The first > the patches from V1 are already reviewed, so I didn't include > them in V2. > > Patches 1-24: > Removes the direct submit path for IBs and requires > that all IB submissions use a job structure. This > greatly simplifies the IB submission code. V2 uses > GFP_ATOMIC when in reset. > > Patches 26-42: > Split IB state setup and ring emission. This keeps all > of the IB state in the job. This greatly simplifies > re-emission of non-timed-out jobs after a ring reset and > allows for re-emission multiple times if multiple resets > happen in a row. It also properly handles the dma fence > error handling for timedout jobs with adapter resets. > V2 fixes the set_q handling by saving the ring state in > the job and redetermining the offsets as the packet > stream is replayed. Jobs whose IBs are skipped still > handle the set_q state properly so the re-emitted packet > streams are always coherent.
Also available here: https://gitlab.freedesktop.org/agd5f/linux/-/commits/ib_improvements?ref_type=heads Alex > > Alex Deucher (42): > drm/amdgpu/job: use GFP_ATOMIC while in gpu reset > drm/amdgpu/vpe: switch to using job for IBs > drm/amdgpu/gfx6: switch to using job for IBs > drm/amdgpu/gfx7: switch to using job for IBs > drm/amdgpu/gfx8: switch to using job for IBs > drm/amdgpu/gfx9: switch to using job for IBs > drm/amdgpu/gfx9.4.2: switch to using job for IBs > drm/amdgpu/gfx9.4.3: switch to using job for IBs > drm/amdgpu/gfx10: switch to using job for IBs > drm/amdgpu/gfx11: switch to using job for IBs > drm/amdgpu/gfx12: switch to using job for IBs > drm/amdgpu/gfx12.1: switch to using job for IBs > drm/amdgpu/si_dma: switch to using job for IBs > drm/amdgpu/cik_sdma: switch to using job for IBs > drm/amdgpu/sdma2.4: switch to using job for IBs > drm/amdgpu/sdma3: switch to using job for IBs > drm/amdgpu/sdma4: switch to using job for IBs > drm/amdgpu/sdma4.4.2: switch to using job for IBs > drm/amdgpu/sdma5: switch to using job for IBs > drm/amdgpu/sdma5.2: switch to using job for IBs > drm/amdgpu/sdma6: switch to using job for IBs > drm/amdgpu/sdma7: switch to using job for IBs > drm/amdgpu/sdma7.1: switch to using job for IBs > drm/amdgpu: require a job to schedule an IB > drm/amdgpu: rename amdgpu_fence_driver_guilty_force_completion() > drm/amdgpu: mark fences with errors before ring reset > drm/amdgpu: don't call drm_sched_stop/start() in asic reset > drm/amdgpu: drop drm_sched_increase_karma() > drm/amdgpu: plumb timedout fence through to force completion > drm/amdgpu: simplify VCN reset helper > drm/amdgpu: change function signature for emit_pipeline_sync() > drm/amdgpu: drop extra parameter for vm_flush > drm/amdgpu: move need_ctx_switch into amdgpu_job > drm/amdgpu: store vm flush state in amdgpu_job > drm/amdgpu: split fence init and emit logic > drm/amdgpu: split vm flush and vm flush emit logic > drm/amdgpu: split ib schedule and ib emit logic > drm/amdgpu: move drm sched stop/start into amdgpu_job_timedout() > drm/amdgpu: add an all_instance_rings_reset ring flag > drm/amdgpu: add helper to save and restore ring state > drm/amdgpu: rework reset reemit handling > drm/amdgpu: simplify per queue reset code > > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 136 +++------ > drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 302 +++++++++++--------- > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 53 +++- > drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 12 + > drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 83 ++---- > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 41 ++- > drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 6 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 4 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 52 ++-- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 141 ++++----- > drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 45 +-- > drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 36 ++- > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 41 ++- > drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 41 ++- > drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 41 ++- > drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 33 ++- > drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 28 +- > drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 30 +- > drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 143 ++++----- > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 149 +++++----- > drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 26 +- > drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 38 +-- > drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 3 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 3 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 3 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 3 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 3 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 3 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 3 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 3 +- > drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c | 3 +- > drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 43 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 43 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 43 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 45 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 46 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 45 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 45 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 45 +-- > drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 45 +-- > drivers/gpu/drm/amd/amdgpu/si_dma.c | 34 ++- > drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 8 +- > drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 + > drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 2 + > drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 3 +- > drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 4 +- > drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 3 +- > drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 3 +- > drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 4 +- > 56 files changed, 1007 insertions(+), 993 deletions(-) > > -- > 2.52.0 >
