There was a late minute user regression report[1] so lets revert this so it can be debugged in peace.
I have not been able to locally reproduce it yet, but at least a partial fix looks to be this[2]. Further debug will be needed, possibly after the holiday/ vacation season is over. [1] https://lore.kernel.org/dri-devel/TfhgV1W0W5LI6RWUO6J35B3R8QIYH_FN3Eihzdo_9PH39hfn1AVByT-QBPHmWiAR-L0Kqi2sppM_EhFPKwZPGmb5pFgpF2MrzeFzkZDmpG8=@proton.me/ [2] https://lore.kernel.org/dri-devel/[email protected]/ Cc: [email protected] Cc: Matthew Brost <[email protected]> Cc: Danilo Krummrich <[email protected]> Cc: Philipp Stanner <[email protected]> Cc: Christian König <[email protected]> v2: * Forgot the SoBs. v3: * Rebased for drm-misc-fixes. Tvrtko Ursulin (19): Revert "drm/sched: Remove drm_sched_init_args->num_rqs" Revert "drm/xe: Remove drm_sched_init_args->num_rqs usage" Revert "drm/v3d: Remove drm_sched_init_args->num_rqs usage" Revert "drm/sched: Remove drm_sched_init_args->num_rqs usage" Revert "drm/panthor: Remove drm_sched_init_args->num_rqs usage" Revert "drm/panfrost: Remove drm_sched_init_args->num_rqs usage" Revert "drm/nouveau: Remove drm_sched_init_args->num_rqs usage" Revert "drm/msm: Remove drm_sched_init_args->num_rqs usage" Revert "drm/lima: Remove drm_sched_init_args->num_rqs usage" Revert "drm/imagination: Remove drm_sched_init_args->num_rqs usage" Revert "drm/etnaviv: Remove drm_sched_init_args->num_rqs usage" Revert "drm/amdgpu: Remove drm_sched_init_args->num_rqs usage" Revert "accel/ethosu: Remove drm_sched_init_args->num_rqs usage" Revert "accel/rocket: Remove drm_sched_init_args->num_rqs usage" Revert "accel/amdxdna: Remove drm_sched_init_args->num_rqs usage" Revert "drm/sched: Embed run queue singleton into the scheduler" Revert "drm/sched: Remove FIFO and RR and simplify to a single run queue" Revert "drm/sched: Switch default policy to fair" drm/sched: Mark fair policy as experimental drivers/accel/amdxdna/aie2_ctx.c | 1 + drivers/accel/ethosu/ethosu_job.c | 1 + drivers/accel/rocket/rocket_job.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 27 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 8 +- drivers/gpu/drm/etnaviv/etnaviv_sched.c | 1 + drivers/gpu/drm/imagination/pvr_queue.c | 1 + drivers/gpu/drm/lima/lima_sched.c | 1 + drivers/gpu/drm/msm/msm_gem_vma.c | 1 + drivers/gpu/drm/msm/msm_ringbuffer.c | 1 + drivers/gpu/drm/nouveau/nouveau_sched.c | 1 + drivers/gpu/drm/panfrost/panfrost_job.c | 1 + drivers/gpu/drm/panthor/panthor_mmu.c | 1 + drivers/gpu/drm/panthor/panthor_sched.c | 1 + drivers/gpu/drm/scheduler/sched_entity.c | 52 ++++++-- drivers/gpu/drm/scheduler/sched_fence.c | 2 +- drivers/gpu/drm/scheduler/sched_internal.h | 15 ++- drivers/gpu/drm/scheduler/sched_main.c | 121 +++++++++++++++--- drivers/gpu/drm/scheduler/sched_rq.c | 87 +++++++++---- .../gpu/drm/scheduler/tests/mock_scheduler.c | 1 + drivers/gpu/drm/v3d/v3d_sched.c | 1 + drivers/gpu/drm/xe/xe_dep_scheduler.c | 1 + drivers/gpu/drm/xe/xe_execlist.c | 1 + drivers/gpu/drm/xe/xe_gpu_scheduler.c | 1 + include/drm/gpu_scheduler.h | 42 +++++- 30 files changed, 304 insertions(+), 95 deletions(-) -- 2.54.0
