Re: [PATCH v5 0/8] drm/sched: Allow drivers to skip the reset with DRM_GPU_SCHED_STAT_NO_HANG

["Maíra Canal" <mcanal@igalia.com>]

+cc Maxime, Thomas

Hi Philipp,

On 09/07/25 10:14, Philipp Stanner wrote:
> On Tue, 2025-07-08 at 10:25 -0300, Maíra Canal wrote:
>> TL;DR: The only two patches that are lacking R-b's are:
>>
>> [PATCH 2/8] drm/sched: Allow drivers to skip the reset and keep on running
>> [PATCH 7/8] drm/xe: Use DRM_GPU_SCHED_STAT_NO_HANG to skip the reset
>>    -> If Intel CI succeeds, it's Reviewed-by: Matthew Brost <matthew.brost@intel.com>
>>
>> For those two patches, it would be great to gather feedback and/or R-b's,
>> particularly from the Intel folks.
>>
>> Thanks for all the reviews so far!
>>
>> ---

[...]

>>        drm/sched: Rename DRM_GPU_SCHED_STAT_NOMINAL to DRM_GPU_SCHED_STAT_RESET
>>        drm/sched: Allow drivers to skip the reset and keep on running
>>        drm/sched: Make timeout KUnit tests faster
>>        drm/sched: Add new test for DRM_GPU_SCHED_STAT_NO_HANG
>>        drm/v3d: Use DRM_GPU_SCHED_STAT_NO_HANG to skip the reset
>>        drm/etnaviv: Use DRM_GPU_SCHED_STAT_NO_HANG to skip the reset
>>        drm/xe: Use DRM_GPU_SCHED_STAT_NO_HANG to skip the reset
>>        drm/panfrost: Use DRM_GPU_SCHED_STAT_NO_HANG to skip the reset
>>
>>   drivers/accel/amdxdna/aie2_ctx.c                 |  2 +-
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_job.c          |  2 +-
>>   drivers/gpu/drm/etnaviv/etnaviv_sched.c          | 16 +++----
>>   drivers/gpu/drm/imagination/pvr_queue.c          |  4 +-
>>   drivers/gpu/drm/lima/lima_sched.c                |  6 +--
>>   drivers/gpu/drm/nouveau/nouveau_exec.c           |  2 +-
>>   drivers/gpu/drm/nouveau/nouveau_sched.c          |  2 +-
>>   drivers/gpu/drm/panfrost/panfrost_job.c          | 10 ++---
>>   drivers/gpu/drm/panthor/panthor_mmu.c            |  2 +-
>>   drivers/gpu/drm/panthor/panthor_sched.c          |  2 +-
>>   drivers/gpu/drm/scheduler/sched_main.c           | 48 +++++++++++++++++++--
>>   drivers/gpu/drm/scheduler/tests/mock_scheduler.c |  7 ++-
>>   drivers/gpu/drm/scheduler/tests/sched_tests.h    |  1 +
>>   drivers/gpu/drm/scheduler/tests/tests_basic.c    | 55 ++++++++++++++++++++++--
>>   drivers/gpu/drm/v3d/v3d_sched.c                  | 18 ++------
>>   drivers/gpu/drm/xe/xe_guc_submit.c               | 14 ++----
>>   include/drm/gpu_scheduler.h                      |  7 ++-
>>   17 files changed, 137 insertions(+), 61 deletions(-)
> 
> Does not apply to drm-misc-next:
> 
> Applying: drm/sched: Rename DRM_GPU_SCHED_STAT_NOMINAL to DRM_GPU_SCHED_STAT_RESET
> error: patch failed: drivers/gpu/drm/etnaviv/etnaviv_sched.c:87
> error: drivers/gpu/drm/etnaviv/etnaviv_sched.c: patch does not apply
> Patch failed at 0001 drm/sched: Rename DRM_GPU_SCHED_STAT_NOMINAL to DRM_GPU_SCHED_STAT_RESET
> 
> Awkward. That file has last been touched months ago. On what branch is
> your series based?

It's based on drm-tip, otherwise, Intel CI wouldn't be able to apply the
series. drm-tip has that Etnaviv fix (commit 61ee19dedb8d "drm/etnaviv:
Protect the scheduler's pending list with its lock"), which drm-misc-
next doesn't have yet.

> 
> Can you rebase?
> 
>  From my POV you could also apply it yourself. Looks all good.

I believe I can apply the series to drm-misc-next and solve the
conflicts in drm-tip with `dim rebuild-tip`.

@drm-misc maintainers, would it be an issue if I apply this series to
drm-misc-next and solve the conflicts?

Best Regards,
- Maíra

> 
> P.
> 
> 
> 
>> ---
>> base-commit: 8b32b5509128873da8ecfc06beefcb58927eb50b
>> change-id: 20250502-sched-skip-reset-bf7c163233da
>>
>