Skip to content

Clean up GuC CI failures, simplify locking, and kernel DOC

Matthew Brost dri-devel intel-gfx 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest27 patches 14 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/27drm/i915/guc: Fix blocked context accountingdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+1 -10 replies
2/27drm/i915/guc: Fix outstanding G2H accountingdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+12 -112 replies
3/27drm/i915/guc: Unwind context requests in reverse orderdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+4 -40 replies
4/27drm/i915/guc: Don't drop ce->guc_active.lock when unwinding contextdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+0 -40 replies
5/27drm/i915/guc: Process all G2H message at once in work queuedrivers/gpu/drm/i915/gt/uc/intel_guc_ct.c+3 -30 replies
6/27drm/i915/guc: Workaround reset G2H is received after schedule done G2Hdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+35 -61 reply
7/27Revert "drm/i915/gt: Propagate change in error status to children on unhold"drivers/gpu/drm/i915/gt/intel_execlists_submission.c+0 -40 replies
8/27drm/i915/selftests: Add a cancel request selftest that triggers a resetdrivers/gpu/drm/i915/selftests/i915_request.c+100 -02 replies
9/27drm/i915/guc: Kick tasklet after queuing a requestdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+1 -00 replies
10/27drm/i915/guc: Don't enable scheduling on a banned context, guc_id invalid, not registereddrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+19 -30 replies
11/27drm/i915/guc: Copy whole golden context, set engine state size of subsetdrivers/gpu/drm/i915/gt/uc/intel_guc_ads.c+22 -62 replies
12/27drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2Hdrivers/gpu/drm/i915/gt/intel_context_types.h drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c drivers/gpu/drm/i915/gt/uc/selftest_guc.c +3 more+185 -00 replies
13/27drm/i915/guc: Take context ref when cancelling requestdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+4 -10 replies
14/27drm/i915/guc: Don't touch guc_state.sched_state without a lockdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+32 -260 replies
15/27drm/i915/guc: Reset LRC descriptor if register returns -ENODEVdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+4 -20 replies
16/27drm/i915: Allocate error capture in nowait contextdrivers/gpu/drm/i915/i915_gpu_error.c+19 -202 replies
17/27drm/i915/guc: Flush G2H work queue during resetdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+2 -160 replies
18/27drm/i915/guc: Release submit fence from an irq_workdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c drivers/gpu/drm/i915/i915_request.h+24 -30 replies
19/27drm/i915/guc: Move guc_blocked fence to struct guc_statedrivers/gpu/drm/i915/gt/intel_context.c drivers/gpu/drm/i915/gt/intel_context_types.h drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+14 -140 replies
20/27drm/i915/guc: Rework and simplify lockingdrivers/gpu/drm/i915/gt/intel_context_types.h drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c drivers/gpu/drm/i915/i915_trace.h+89 -1220 replies
21/27drm/i915/guc: Proper xarray usage for contexts_lookupdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+87 -150 replies
22/27drm/i915/guc: Drop pin count check trick between sched_disable and re-pindrivers/gpu/drm/i915/gt/intel_context_types.h drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+34 -210 replies
23/27drm/i915/guc: Move GuC priority fields in context under guc_activedrivers/gpu/drm/i915/gt/intel_context_types.h drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c drivers/gpu/drm/i915/i915_trace.h+46 -371 reply
24/27drm/i915/guc: Move fields protected by guc->contexts_lock into sub structuredrivers/gpu/drm/i915/gt/intel_context.c drivers/gpu/drm/i915/gt/intel_context_types.h drivers/gpu/drm/i915/gt/selftest_hangcheck.c +2 more+69 -670 replies
25/27drm/i915/guc: Drop guc_active move everything into guc_statedrivers/gpu/drm/i915/gt/intel_context.c drivers/gpu/drm/i915/gt/intel_context_types.h drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1 more+49 -580 replies
26/27drm/i915/guc: Add GuC kernel docdrivers/gpu/drm/i915/gt/intel_context_types.h drivers/gpu/drm/i915/gt/uc/intel_guc.h drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +1 more+132 -501 reply
27/27drm/i915/guc: Drop static inline functions intel_guc_submission.cdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+57 -591 reply

Reviews trailers per patch

22 of 27 patches have a Reviewed-by or Acked-by.

PatchDaniel VetterDaniele Ceraolo Spurio
1/27R-b
2/27
3/27R-b
4/27R-b
5/27R-b
6/27R-b
7/27R-b
8/27
9/27R-b
10/27R-b
11/27R-b
12/27R-b
13/27R-b
14/27R-b
15/27R-b
16/27
17/27R-b
18/27R-b
19/27R-b
20/27R-b
21/27R-b
22/27R-b
23/27R-b
24/27R-b
25/27R-b
26/27
27/27

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/27] Clean up GuC CI failures, simplify locking, and kernel DOC

Daniel Vetter pointed out that locking in the GuC submission code was overly complicated, let's clean this up a bit before introducing more features in the GuC submission backend.

Also fix some CI failures, port fixes from our internal tree, and add a few more selftests for coverage.

Lastly, add some kernel DOC explaining how the GuC submission backend works.

v2: Fix logic error in 'Workaround reset G2H is received after schedule done G2H', don't propagate errors to dependent fences in execlists submissiom, resolve checkpatch issues, resend to correct lists
v3: Fix issue kicking tasklet, drop guc_active, fix ref counting in xarray, add guc_id sub structure, drop inline fuctions, and various other cleanup suggested by Daniel
v4: Address Daniele's feedback, rebase to tip, resend for CI

Matthew Brost (27):
drm/i915/guc: Fix blocked context accounting
drm/i915/guc: Fix outstanding G2H accounting
drm/i915/guc: Unwind context requests in reverse order drm/i915/guc: Don't drop ce->guc_active.lock when unwinding context drm/i915/guc: Process all G2H message at once in work queue drm/i915/guc: Workaround reset G2H is received after schedule done G2H Revert "drm/i915/gt: Propagate change in error status to children on
unhold"
drm/i915/selftests: Add a cancel request selftest that triggers a
reset
drm/i915/guc: Kick tasklet after queuing a request drm/i915/guc: Don't enable scheduling on a banned context, guc_id
invalid, not registered
drm/i915/guc: Copy whole golden context, set engine state size of
subset
drm/i915/selftests: Add initial GuC selftest for scrubbing lost G2H drm/i915/guc: Take context ref when cancelling request drm/i915/guc: Don't touch guc_state.sched_state without a lock drm/i915/guc: Reset LRC descriptor if register returns -ENODEV drm/i915: Allocate error capture in nowait context drm/i915/guc: Flush G2H work queue during reset drm/i915/guc: Release submit fence from an irq_work drm/i915/guc: Move guc_blocked fence to struct guc_state drm/i915/guc: Rework and simplify locking
drm/i915/guc: Proper xarray usage for contexts_lookup drm/i915/guc: Drop pin count check trick between sched_disable and
re-pin
drm/i915/guc: Move GuC priority fields in context under guc_active drm/i915/guc: Move fields protected by guc->contexts_lock into sub
structure
drm/i915/guc: Drop guc_active move everything into guc_state drm/i915/guc: Add GuC kernel doc
drm/i915/guc: Drop static inline functions intel_guc_submission.c

 drivers/gpu/drm/i915/gt/intel_context.c       |  19 +-
 drivers/gpu/drm/i915/gt/intel_context_types.h |  81 +-
 .../drm/i915/gt/intel_execlists_submission.c  |   4 -
 drivers/gpu/drm/i915/gt/selftest_hangcheck.c  |   6 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc.h        |  19 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c    |  28 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c     |   6 +-
 .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 996 +++++++++++-------
 drivers/gpu/drm/i915/gt/uc/selftest_guc.c     | 127 +++
 drivers/gpu/drm/i915/i915_gpu_error.c         |  39 +-
 drivers/gpu/drm/i915/i915_request.h           |  23 +-
 drivers/gpu/drm/i915/i915_trace.h             |  12 +-
 .../drm/i915/selftests/i915_live_selftests.h  |   1 +
 drivers/gpu/drm/i915/selftests/i915_request.c | 100 ++
 .../i915/selftests/intel_scheduler_helpers.c  |  12 +
 .../i915/selftests/intel_scheduler_helpers.h  |   2 +
 16 files changed, 983 insertions(+), 492 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc.c
Signature · 1 line
2.32.0