Skip to content

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

Matthew Brost dri-devel intel-gfx oe-kbuild-all 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest22 patches 28 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/22drm/i915/guc: Fix blocked context accountingdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+1 -10 replies
2/22drm/i915/guc: Fix outstanding G2H accountingdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+5 -32 replies
3/22drm/i915/guc: Unwind context requests in reverse orderdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+4 -40 replies
4/22drm/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/22drm/i915/guc: Workaround reset G2H is received after schedule done G2Hdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+37 -62 replies
6/22drm/i915/execlists: Do not propagate errors to dependent fencesdrivers/gpu/drm/i915/gt/intel_execlists_submission.c+0 -43 replies
7/22drm/i915/selftests: Add a cancel request selftest that triggers a resetdrivers/gpu/drm/i915/selftests/i915_request.c+100 -00 replies
8/22drm/i915/guc: Don't enable scheduling on a banned context, guc_id invalid, not registereddrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+3 -03 replies
9/22drm/i915/selftests: Fix memory corruption in live_lrc_isolationdrivers/gpu/drm/i915/gt/selftest_lrc.c+28 -10 replies
10/22drm/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+184 -00 replies
11/22drm/i915/guc: Take context ref when cancelling requestdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+4 -10 replies
12/22drm/i915/guc: Don't touch guc_state.sched_state without a lockdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+31 -260 replies
13/22drm/i915/guc: Reset LRC descriptor if register returns -ENODEVdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+4 -20 replies
14/22drm/i915: Allocate error capture in atomic contextdrivers/gpu/drm/i915/i915_gpu_error.c+18 -192 replies
15/22drm/i915/guc: Flush G2H work queue during resetdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+2 -161 reply
16/22drm/i915/guc: Release submit fence from an IRQdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c drivers/gpu/drm/i915/i915_request.h+19 -11 reply
17/22drm/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 -141 reply
18/22drm/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 -1082 replies
19/22drm/i915/guc: Proper xarray usage for contexts_lookupdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+73 -114 replies
20/22drm/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 -170 replies
21/22drm/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+45 -370 replies
22/22drm/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+131 -497 replies

Reviews trailers per patch

1 of 22 patches has a Reviewed-by or Acked-by.

PatchDaniel Vetter
1/22R-b
2/22
3/22
4/22
5/22
6/22
7/22
8/22
9/22
10/22
11/22
12/22
13/22
14/22
15/22
16/22
17/22
18/22
19/22
20/22
21/22
22/22

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/22] 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

Matthew Brost (22):
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: Workaround reset G2H is received after schedule done G2H drm/i915/execlists: Do not propagate errors to dependent fences drm/i915/selftests: Add a cancel request selftest that triggers a
reset
drm/i915/guc: Don't enable scheduling on a banned context, guc_id
invalid, not registered
drm/i915/selftests: Fix memory corruption in live_lrc_isolation 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 atomic context drm/i915/guc: Flush G2H work queue during reset drm/i915/guc: Release submit fence from an IRQ 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: Add GuC kernel doc

 drivers/gpu/drm/i915/gt/intel_context.c       |   5 +-
 drivers/gpu/drm/i915/gt/intel_context_types.h |  68 +-
 .../drm/i915/gt/intel_execlists_submission.c  |   4 -
 drivers/gpu/drm/i915/gt/selftest_lrc.c        |  29 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc.h        |  19 +-
 .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 690 +++++++++++-------
 drivers/gpu/drm/i915/gt/uc/selftest_guc.c     | 126 ++++
 drivers/gpu/drm/i915/i915_gpu_error.c         |  37 +-
 drivers/gpu/drm/i915/i915_request.h           |  23 +-
 drivers/gpu/drm/i915/i915_trace.h             |   8 +-
 .../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 +
 14 files changed, 813 insertions(+), 311 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc.c
Signature · 1 line
2.32.0