On Thu, Jul 18, 2024 at 10:15 AM Alex Deucher <alexander.deucher@xxxxxxx> wrote: > > This adds preliminary support for GC per queue reset. In this > case, only the jobs currently in the queue are lost. If this > fails, we fall back to a full adapter reset. Also available here via git: https://gitlab.freedesktop.org/agd5f/linux/-/commits/amd-staging-drm-next-queue-reset Alex > > Alex Deucher (19): > drm/amdgpu/mes: add API for legacy queue reset > drm/amdgpu/mes11: add API for legacy queue reset > drm/amdgpu/mes12: add API for legacy queue reset > drm/amdgpu/mes: add API for user queue reset > drm/amdgpu/mes11: add API for user queue reset > drm/amdgpu/mes12: add API for user queue reset > drm/amdgpu: add new ring reset callback > drm/amdgpu: add per ring reset support (v2) > drm/amdgpu/gfx11: add ring reset callbacks > drm/amdgpu/gfx11: rename gfx_v11_0_gfx_init_queue() > drm/amdgpu/gfx10: add ring reset callbacks > drm/amdgpu/gfx10: rework reset sequence > drm/amdgpu/gfx9: add ring reset callback > drm/amdgpu/gfx9.4.3: add ring reset callback > drm/amdgpu/gfx12: add ring reset callbacks > drm/amdgpu/gfx12: fallback to driver reset compute queue directly > drm/amdgpu/gfx11: enter safe mode before touching CP_INT_CNTL > drm/amdgpu/gfx11: add a mutex for the gfx semaphore > drm/amdgpu/gfx11: export gfx_v11_0_request_gfx_index_mutex() > > Jiadong Zhu (13): > drm/amdgpu/gfx11: wait for reset done before remap > drm/amdgpu/gfx10: remap queue after reset successfully > drm/amdgpu/gfx10: wait for reset done before remap > drm/amdgpu/gfx9: remap queue after reset successfully > drm/amdgpu/gfx9: wait for reset done before remap > drm/amdgpu/gfx9.4.3: remap queue after reset successfully > drm/amdgpu/gfx_9.4.3: wait for reset done before remap > drm/amdgpu/gfx: add a new kiq_pm4_funcs callback for reset_hw_queue > drm/amdgpu/gfx9: implement reset_hw_queue for gfx9 > drm/amdgpu/gfx9.4.3: implement reset_hw_queue for gfx9.4.3 > drm/amdgpu/mes: modify mes api for mmio queue reset > drm/amdgpu/mes: implement amdgpu_mes_reset_hw_queue_mmio > drm/amdgpu/mes11: implement mmio queue reset for gfx11 > > Prike Liang (2): > drm/amdgpu: increase the reset counter for the queue reset > drm/amdgpu/gfx11: fallback to driver reset compute queue directly (v2) > > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 6 + > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 18 +++ > drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 88 ++++++++++++ > drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 37 +++++ > drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 + > drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 158 ++++++++++++++++++++- > drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 117 +++++++++++++-- > drivers/gpu/drm/amd/amdgpu/gfx_v11_0.h | 3 + > drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 95 ++++++++++++- > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 126 +++++++++++++++- > drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 125 +++++++++++++++- > drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 132 +++++++++++++++++ > drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 54 +++++++ > 14 files changed, 930 insertions(+), 32 deletions(-) > > -- > 2.45.2 >
