Skip to content

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

Matthew Brost intel-gfx 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest21 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/21drm/i915/guc: Fix blocked context accountingdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+1 -10 replies
2/21drm/i915/guc: outstanding G2H accountingdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+5 -30 replies
3/21drm/i915/guc: Unwind context requests in reverse orderdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+4 -40 replies
4/21drm/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/21drm/i915/guc: Workaround reset G2H is received after schedule done G2Hdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+36 -60 replies
6/21drm/i915/selftests: Add a cancel request selftest that triggers a resetdrivers/gpu/drm/i915/selftests/i915_request.c+94 -00 replies
7/21drm/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 -00 replies
8/21drm/i915/selftests: Fix memory corruption in live_lrc_isolationdrivers/gpu/drm/i915/gt/selftest_lrc.c+28 -10 replies
9/21drm/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
10/21drm/i915/guc: Take context ref when cancelling requestdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+4 -10 replies
11/21drm/i915/guc: Don't touch guc_state.sched_state without a lockdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+31 -260 replies
12/21drm/i915/guc: Reset LRC descriptor if register returns -ENODEVdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+4 -20 replies
13/21drm/i915: Allocate error capture in atomic contextdrivers/gpu/drm/i915/i915_gpu_error.c+18 -190 replies
14/21drm/i915/guc: Flush G2H work queue during resetdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+2 -160 replies
15/21drm/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 -10 replies
16/21drm/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
17/21drm/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 -1080 replies
18/21drm/i915/guc: Proper xarray usage for contexts_lookupdrivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+72 -110 replies
19/21drm/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
20/21drm/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
21/21drm/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 -490 replies

Reviews trailers per patch

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

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

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

Read the v1 thread

Cover letter [Intel-gfx] [PATCH 00/21] 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.

Matthew Brost (21):
drm/i915/guc: Fix blocked context accounting
drm/i915/guc: 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/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 +-
 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 | 688 +++++++++++-------
 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 |  94 +++
 .../i915/selftests/intel_scheduler_helpers.c  |  12 +
 .../i915/selftests/intel_scheduler_helpers.h  |   2 +
 13 files changed, 805 insertions(+), 307 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/uc/selftest_guc.c
Signature · 1 line
2.32.0