Skip to content

Backport CT changes + GuC 62.0.0

Matthew Brost igt-dev 1 version New

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest6 of 7 patches 0 repliesNew

v2 from the cover letter

(CI)
- Fix build error
(Michal)
- Fix indentation

6 of 7 patches are in this archive. The cover letter announces 7.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7drm/i915/guc: Drop guc->interrupts.enableddrivers/gpu/drm/i915/gt/uc/intel_guc.c drivers/gpu/drm/i915/gt/uc/intel_guc.h+9 -190 replies
2/7drm/i915/guc: Ensure H2G buffer updates visible before tail updatedrivers/gpu/drm/i915/gt/uc/intel_guc_ct.c+29 -00 replies
3/7drm/i915/guc: Update firmware to v62.0.0drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h +8 more+527 -4210 replies
4/7drm/i915/guc: Relax CTB response timeoutdrivers/gpu/drm/i915/gt/uc/intel_guc_ct.c+7 -30 replies
5/7drm/i915/guc: Add stall timer to non blocking CTB send functiondrivers/gpu/drm/i915/gt/uc/intel_guc_ct.c drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h+59 -70 replies
7/7REVIEW: Full tree diff against internaldrivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h +6 more+135 -1150 replies

Reviews trailers per patch

5 of 6 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMichal WajdeczkoJohn HarrisonDaniele Ceraolo Spurio
SeriesA-b
1/7R-b
2/7R-b
3/7R-b
4/7R-b
5/7R-b
7/7

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v1 thread

Cover letter [igt-dev] [PATCH 0/7] Backport CT changes + GuC 62.0.0

Pulling in 27 patches from upstream, replacing 40ish in DII.

Asking for timely reviews as this was non-trival.

v2:
(CI)
- Fix build error
(Michal)
- Fix indentation

---
baseline: 240f660b1c74da0c0851a475cabc654749ef87f2
pile-commit: abaf8fef45830b03b15b0f8494a8155474d71e84 range-diff:

1324:  3110523b76bc !  359:  8b756c4d4b79 INTEL_DII: drm/i915/guc: Remove sample_forcewake h2g action
1325:  035c450f323f !  360:  c1c3828b03de INTEL_DII: drm/i915/guc: Keep strict GuC ABI definitions separate
   -:  ------------ >  361:  8beb91ff79f6 drm/i915/guc: Drop guc->interrupts.enabled
1326:  aab6a0b3262d !  362:  c7af13c74f31 INTEL_DII: drm/i915/guc: Stop using fence/status from CTB descriptor
1327:  05130ecc0e56 !  363:  18fb8adf94e9 INTEL_DII: drm/i915: Promote ptrdiff() to i915_utils.h
1328:  0cc7c6258d59 !  364:  35f73bf0f282 INTEL_DII: drm/i915/guc: Only rely on own CTB size
1329:  2f7137b39b8b !  365:  2e6eb2ef0ee8 INTEL_DII: drm/i915/guc: Don't repeat CTB layout calculations
1330:  f07b63fd0a32 !  367:  52e2c0c6669a INTEL_DII: drm/i915/guc: Replace CTB array with explicit members
1331:  fcadfd27ace6 !  368:  a86a48dfe01d INTEL_DII: drm/i915/guc: Update sizes of CTB buffers
1333:  20036540f895 !  369:  3b0b949af81f INTEL_DII: drm/i915/guc: Start protecting access to CTB descriptors
   -:  ------------ >  370:  ac8f1ec44029 drm/i915/guc: Ensure H2G buffer updates visible before tail update
1334:  1742c79c2a03 !  371:  1e6c11ad4fa5 INTEL_DII: drm/i915/guc: Stop using mutex while sending CTB messages
1335:  fdd515a150f9 !  372:  6aebcd5d395f INTEL_DII: drm/i915/guc: Don't receive all G2H messages in irq handler
1336:  5601fb5746de !  373:  d0648932905b INTEL_DII: drm/i915/guc: Always copy CT message to new allocation
1351:  225d20e196e2 !  374:  816883d056f9 INTEL_DII: drm/i915/guc: Early initialization of GuC send registers
 360:  b7deff77b146 !  375:  55157b201c6e drm/i915/guc: Use guc_class instead of engine_class in fw interface
1350:  d33a6812e7f0 !  392:  0118b9b391db INTEL_DII: drm/i915/uc: turn on GuC/HuC auto mode by default
1337:  73fd24a01225 !  405:  843baf23fc10 INTEL_DII: drm/i915/guc: Introduce unified HXG messages
   -:  ------------ >  406:  c1dca56e8f6b drm/i915/guc: Update firmware to v62.0.0
1345:  1df4dd521719 !  407:  62056265474c INTEL_DII: drm/i915/doc: Include GuC ABI documentation
 443:  de519e66d617 !  462:  4505ce70286e drm/i915/gt: finish INTEL_GEN and friends conversion
   -:  ------------ >  480:  38b25e8985c4 drm/i915/guc: Relax CTB response timeout
1430:  21e818fa8e77 !  481:  048241cd3d9f INTEL_DII: drm/i915/guc: Improve error message for unsolicited CT response
1434:  aeb67b9f724e !  482:  692a16dd64af INTEL_DII: drm/i915/guc: Increase size of CTB buffers
1431:  738da5fa0523 !  483:  40d936ae2a0f INTEL_DII: drm/i915/guc: Add non blocking CTB send function
   -:  ------------ >  484:  ad33bf22c7dd drm/i915/guc: Add stall timer to non blocking CTB send function
1433:  afcc9816aa04 !  485:  48a800157edc INTEL_DII: drm/i915/guc: Optimize CTB writes and reads
1435:  b4dc9cd018c0 !  486:  fdca0f208fb8 INTEL_DII: drm/i915/guc: Module load failure test for CT buffer creation
1239:  6daebfff7458 ! 1265:  03970bccc0c7 INTEL_DII: drm/i915/gtt: map the PD up front
1241:  5a3f3c99bea9 ! 1267:  914dd2b9dcb1 INTEL_DII: drm/i915/gtt: make flushing conditional
1323:  213a2664f45f ! 1349:  4762fd97d20c INTEL_DII: drm/i915/uc: Allow platforms to have GuC but not HuC
1332:  c8a67a3d9a02 <    -:  ------------ INTEL_DII: drm/i915/guc: Relax CTB response timeout
1338:  24f51bddb897 <    -:  ------------ INTEL_DII: drm/i915/guc: Update MMIO based communication
1339:  d6f198b89263 <    -:  ------------ INTEL_DII: drm/i915/guc: Update CTB response status definition
1340:  5b8d33c706ba <    -:  ------------ INTEL_DII: drm/i915/guc: Support per context scheduling policies
1341:  e518ad395628 <    -:  ------------ INTEL_DII: drm/i915/guc: Add flag for mark broken CTB
1342:  b96b05e5f022 <    -:  ------------ INTEL_DII: drm/i915/guc: New definition of the CTB descriptor
1343:  555f29ee4761 <    -:  ------------ INTEL_DII: drm/i915/guc: New definition of the CTB registration action
1344:  f401ca7786dd <    -:  ------------ INTEL_DII: drm/i915/guc: New CTB based communication
1346:  5166ba4d2cae <    -:  ------------ INTEL_DII: drm/i915/guc: Kill guc_clients.ct_pool
1347:  1babf878f76a <    -:  ------------ INTEL_DII: drm/i915/guc: Kill ads.client_info
1348:  4ce305764206 <    -:  ------------ INTEL_DII: drm/i915/guc: Unified GuC log
1349:  1b3cc34570bc <    -:  ------------ INTEL_DII: drm/i915/guc: Update firmware to v61.1.1
1352:  eb7887da8ec4 ! 1350:  4269443e1706 INTEL_DII: drm/i915/dg1: Load guc and huc
1432:  9975e9fb606c <    -:  ------------ INTEL_DII: drm/i915/guc: Add stall timer to non blocking CTB send function
1449:  45b5613e1737 ! 1441:  09d184364b4a INTEL_DII/FIXME: drm/i915/guc: Ensure G2H response has space in buffer
1450:  ab9ca0f38350 ! 1442:  a68974b65b3a INTEL_DII: drm/i915/guc: Update intel_gt_wait_for_idle to work with GuC
1459:  588e3999d48c ! 1451:  bef9e0e273df INTEL_DII: drm/i915/guc: Reset implementation for new GuC interface
1462:  1fb73eb6d978 ! 1454:  4eb82c68702a INTEL_DII: drm/i915/guc: Suspend/resume implementation for new interface
   -:  ------------ > 1504:  0c2fd46e3a87 INTEL_DII/NOT_UPSTREAM: Fixup GuC submission to understand -EPIPE rather than -EIO
1529:  4e525961f407 ! 1522:  c806261a173e INTEL_DII/FIXME: drm/i915/guc: IOMMU catastrophic error notification handling
1539:  bb3b54126f02 ! 1532:  4029297ef7a7 INTEL_DII: drm/i915/guc: Selftest for GuC flow control
1545:  71145e92888f ! 1538:  bc9bfa3d64de INTEL_DII: drm/i915/guc/slpc: Add modparam and state checkers for slpc
1560:  bff746d9a2a1 ! 1553:  3f5f4ffa21ee INTEL_DII/NOT_UPSTREAM: drm/i915/guc: Dump error capture to dmesg on CTB error
1561:  1732ad9fc5c0 ! 1554:  b27a2bbdb71e INTEL_DII: drm/i915/huc: Update firmware to v7.9.3 for TGL+
1562:  2bfd376916b3 ! 1555:  7fb1d681417f INTEL_DII: drm/i915/guc: Update GuC to 63.0.0
1563:  5a4e17bce95d ! 1556:  856d2a500e69 INTEL_DII: drm/i915/guc: Add support for CTB RETRY message
1568:  4f58f7d759bb ! 1561:  df9dbf66b167 INTEL_DII: drm/i915/guc: Use new CTB config/control actions
1569:  af08ada798ff ! 1562:  0d12035062ef INTEL_DII: drm/i915/guc: Drop obsolete CTB registration ABI
1572:  7b5800a51e10 ! 1565:  2fba65604d90 INTEL_DII: drm/i915/guc: Add query of hwconfig tables
1582:  e9d17234504c ! 1575:  5c6f83a0c16c INTEL_DII: drm/i915/guc: Define CTB based TLB invalidation routines
1596:  e48ad21d948e ! 1589:  1404283fe06d INTEL_DII: drm/i915/pf: Allow controlling PF functionality
1631:  11baa1a37637 ! 1624:  561870d228d4 INTEL_DII: drm/i915/pf: Support for VFPF relay messages
1635:  a703d12db0ce ! 1628:  812b2e8fb5b2 INTEL_DII: drm/i915/pf: Support for MMIO relay messages
1637:  4db2c7732342 ! 1630:  a9eb52e8936b INTEL_DII: drm/i915/pf: Support GuC VF state notifications
1664:  203430a47a52 ! 1657:  a58bbc5596ae INTEL_DII: drm/i915/pf: Adverse events notifications
1668:  c1baa284f7a2 ! 1661:  ccf14ebd912c INTEL_DII: drm/i915/pf: Process VF memory CAT fault notification
1669:  681fcde303a6 ! 1662:  84ed7633ca5a INTEL_DII/NOT_UPSTREAM: drm/i915/guc: Allow to control GuC features
1862:  c89d9525a95b ! 1855:  2d1e6eb14558 INTEL_DII: drm/i915/vf: Ignore GuC CT event from memIRQ if CT is disabled
1925:  8e6cf7ddd6fc ! 1918:  66226bec7caa INTEL_DII/FIXME: drm/i915/gt: Fake interrupts for Wa:16014207253
1984:  e3d815e8594c ! 1977:  d0b15aea416b INTEL_DII: drm/i915/guc: Add function engine / disable GuC
2382:  df7657b25db2 ! 2375:  b244e3f7a66e INTEL_DII: drm/i915/mtl: Use primary GT's irq lock for media GT
2407:  6da2b94bf715 ! 2400:  032a876b710d INTEL_DII: drm/i915/guc: handle interrupts from media GuC
2579:  ba27a2290d49 ! 2572:  8f64d27abff9 INTEL_DII: drm/i915/sim: Adjust timeouts for presilicon environments
 series                                             |   61 +-
 ...c-Use-guc_class-instead-of-engine_class-i.patch |    8 +-
 ...rm-i915-uc-turn-on-GuC-HuC-auto-mode-by-d.patch |   28 -
 ...t-finish-INTEL_GEN-and-friends-conversion.patch |   15 +-
 ...NTEL_DII-drm-i915-gtt-map-the-PD-up-front.patch |   49 +-
 ...II-drm-i915-gtt-make-flushing-conditional.patch |   17 +-
 ...rm-i915-uc-Allow-platforms-to-have-GuC-bu.patch |   55 +-
 0001-INTEL_DII-drm-i915-dg1-Load-guc-and-huc.patch |   11 +-
 ...IXME-drm-i915-guc-Ensure-G2H-response-has.patch |   87 +-
 ...rm-i915-guc-Update-intel_gt_wait_for_idle.patch |    8 +-
 ...rm-i915-guc-Reset-implementation-for-new-.patch |    8 +-
 ...rm-i915-guc-Suspend-resume-implementation.patch |   34 +-
 ...IXME-drm-i915-guc-IOMMU-catastrophic-erro.patch |    6 +-
 ...rm-i915-guc-Selftest-for-GuC-flow-control.patch |   58 +-
 ...rm-i915-guc-slpc-Add-modparam-and-state-c.patch |   19 +-
 ...OT_UPSTREAM-drm-i915-guc-Dump-error-captu.patch |   53 +-
 ...rm-i915-huc-Update-firmware-to-v7.9.3-for.patch |    2 +-
 ...TEL_DII-drm-i915-guc-Update-GuC-to-63.0.0.patch |   28 +-
 ...rm-i915-guc-Add-support-for-CTB-RETRY-mes.patch |   14 +-
 ...rm-i915-guc-Use-new-CTB-config-control-ac.patch |   14 +-
 ...rm-i915-guc-Drop-obsolete-CTB-registratio.patch |   12 +-
 ...drm-i915-guc-Add-query-of-hwconfig-tables.patch |    8 +-
 ...rm-i915-guc-Define-CTB-based-TLB-invalida.patch |   18 +-
 ...rm-i915-pf-Allow-controlling-PF-functiona.patch |    4 +-
 ...rm-i915-pf-Support-for-VFPF-relay-message.patch |   10 +-
 ...rm-i915-pf-Support-for-MMIO-relay-message.patch |    6 +-
 ...rm-i915-pf-Support-GuC-VF-state-notificat.patch |    8 +-
 ...-drm-i915-pf-Adverse-events-notifications.patch |    8 +-
 ...rm-i915-pf-Process-VF-memory-CAT-fault-no.patch |    6 +-
 ...OT_UPSTREAM-drm-i915-guc-Allow-to-control.patch |    4 +-
 ...rm-i915-vf-Ignore-GuC-CT-event-from-memIR.patch |    2 +-
 ...IXME-drm-i915-gt-Fake-interrupts-for-Wa-1.patch |   54 +-
 ...rm-i915-guc-Add-function-engine-disable-G.patch |    8 +-
 ...rm-i915-mtl-Use-primary-GT-s-irq-lock-for.patch |   63 +-
 ...rm-i915-guc-handle-interrupts-from-media-.patch |  127 +-
 ...rm-i915-sim-Adjust-timeouts-for-presilico.patch |   35 +-
 ...15-guc-Remove-sample_forcewake-h2g-action.patch |   19 +-
 ...-i915-guc-Keep-strict-GuC-ABI-definitions.patch |   17 +-
 ...c-Stop-using-fence-status-from-CTB-descri.patch |   13 +-
 ...-drm-i915-Promote-ptrdiff-to-i915_utils.h.patch |   12 +-
 ...01-drm-i915-guc-Only-rely-on-own-CTB-size.patch |   10 +-
 ...-guc-Don-t-repeat-CTB-layout-calculations.patch |   50 +-
 ...c-Replace-CTB-array-with-explicit-members.patch |   17 +-
 ...-drm-i915-guc-Update-sizes-of-CTB-buffers.patch |   11 +-
 ...c-Start-protecting-access-to-CTB-descript.patch |   18 +-
 ...c-Stop-using-mutex-while-sending-CTB-mess.patch |   16 +-
 ...c-Don-t-receive-all-G2H-messages-in-irq-h.patch |   34 +-
 ...c-Always-copy-CT-message-to-new-allocatio.patch |   38 +-
 ...c-Early-initialization-of-GuC-send-regist.patch |   18 +-
 ...-Use-platform-specific-defaults-for-GuC-H.patch |   47 +
 ...m-i915-guc-Introduce-unified-HXG-messages.patch |   13 +-
 ...rm-i915-doc-Include-GuC-ABI-documentation.patch |   13 +-
 ...c-Improve-error-message-for-unsolicited-C.patch |   12 +-
 ...drm-i915-guc-Increase-size-of-CTB-buffers.patch |   24 +-
 ...15-guc-Add-non-blocking-CTB-send-function.patch |  221 ++-
 ...rm-i915-guc-Optimize-CTB-writes-and-reads.patch |  175 +--
 ...c-Module-load-failure-test-for-CT-buffer-.patch |   18 +-
 ...-drm-i915-guc-Drop-guc-interrupts.enabled.patch |   96 ++
 ...c-Ensure-H2G-buffer-updates-visible-befor.patch |   79 +
 0001-drm-i915-guc-Update-firmware-to-v62.0.0.patch | 1510 ++++++++++++++++++++
 0001-drm-i915-guc-Relax-CTB-response-timeout.patch |   54 +
 ...c-Add-stall-timer-to-non-blocking-CTB-sen.patch |  184 +++
 ...OT_UPSTREAM-Fixup-GuC-submission-to-under.patch |   55 +
 ...I-drm-i915-guc-Relax-CTB-response-timeout.patch |   45 -
 ...rm-i915-guc-Update-MMIO-based-communicati.patch |  239 ----
 ...rm-i915-guc-Update-CTB-response-status-de.patch |  108 --
 ...rm-i915-guc-Support-per-context-schedulin.patch |  104 --
 ...drm-i915-guc-Add-flag-for-mark-broken-CTB.patch |   94 --
 ...rm-i915-guc-New-definition-of-the-CTB-des.patch |  271 ----
 ...rm-i915-guc-New-definition-of-the-CTB-reg.patch |  305 ----
 ...-drm-i915-guc-New-CTB-based-communication.patch |  395 -----
 ...DII-drm-i915-guc-Kill-guc_clients.ct_pool.patch |   90 --
 ...TEL_DII-drm-i915-guc-Kill-ads.client_info.patch |   76 -
 0001-INTEL_DII-drm-i915-guc-Unified-GuC-log.patch  |  167 ---
 ...I-drm-i915-guc-Update-firmware-to-v61.1.1.patch |   62 -
 ...rm-i915-guc-Add-stall-timer-to-non-blocki.patch |  142 --
 76 files changed, 2926 insertions(+), 2894 deletions(-)
series +27 -34
index a290bd73f3b8..251e7f188672 100644
@@ -358,7 +358,22 @@
 0001-drm-i915-guc-skip-disabling-CTBs-before-sanitizing-t.patch
 0001-drm-i915-guc-use-probe_error-log-for-CT-enablement-f.patch
 0001-drm-i915-guc-enable-only-the-user-interrupt-when-usi.patch
+0001-drm-i915-guc-Remove-sample_forcewake-h2g-action.patch
+0001-drm-i915-guc-Keep-strict-GuC-ABI-definitions.patch
+0001-drm-i915-guc-Drop-guc-interrupts.enabled.patch
+0001-drm-i915-guc-Stop-using-fence-status-from-CTB-descri.patch
+0001-drm-i915-Promote-ptrdiff-to-i915_utils.h.patch
+0001-drm-i915-guc-Only-rely-on-own-CTB-size.patch
+0001-drm-i915-guc-Don-t-repeat-CTB-layout-calculations.patch
 0001-drm-i915-Initialize-the-mbus_offset-to-fix-Klockwork.patch
+0001-drm-i915-guc-Replace-CTB-array-with-explicit-members.patch
+0001-drm-i915-guc-Update-sizes-of-CTB-buffers.patch
+0001-drm-i915-guc-Start-protecting-access-to-CTB-descript.patch
+0001-drm-i915-guc-Ensure-H2G-buffer-updates-visible-befor.patch
+0001-drm-i915-guc-Stop-using-mutex-while-sending-CTB-mess.patch
+0001-drm-i915-guc-Don-t-receive-all-G2H-messages-in-irq-h.patch
+0001-drm-i915-guc-Always-copy-CT-message-to-new-allocatio.patch
+0001-drm-i915-guc-Early-initialization-of-GuC-send-regist.patch
 0001-drm-i915-guc-Use-guc_class-instead-of-engine_class-i.patch
 0001-drm-i915-gvt-replace-IS_GEN-and-friends-with-GRAPHIC.patch
 0001-drm-i915-display-replace-IS_GEN-in-commented-code.patch
@@ -376,6 +391,7 @@
 0001-drm-i915-dsc-Fix-bigjoiner-check-in-dsc_disable.patch
 0001-drm-i915-adl_p-CDCLK-crawl-support-for-ADL.patch
 0001-drm-i915-adl_p-Same-slices-mask-is-not-same-Dbuf-sta.patch
+0001-drm-i915-uc-Use-platform-specific-defaults-for-GuC-H.patch
 0001-Revert-drm-i915-display-Drop-FIXME-about-turn-off-in.patch
 0001-drm-i915-xelpd-break-feature-inheritance.patch
 0001-drm-i915-adl_p-Add-initial-ADL_P-Workarounds.patch
@@ -388,6 +404,9 @@
 0001-drm-i915-extract-steered-reg-access-to-common-functi.patch
 0001-drm-i915-Add-GT-support-for-multiple-types-of-multic.patch
 0001-drm-i915-Add-support-for-explicit-L3BANK-steering.patch
+0001-drm-i915-guc-Introduce-unified-HXG-messages.patch
+0001-drm-i915-guc-Update-firmware-to-v62.0.0.patch
+0001-drm-i915-doc-Include-GuC-ABI-documentation.patch
 0001-drm-i915-display-Do-not-zero-past-infoframes.vsc.patch
 0001-drm-i915-dmc-Introduce-DMC_FW_MAIN.patch
 0001-drm-i915-xelpd-Pipe-A-DMC-plugging.patch
@@ -460,6 +479,13 @@
 0001-drm-i915-display-Settle-on-adl-x-in-WA-comments.patch
 0001-drm-i915-Limit-Wa_22010178259-to-affected-platforms.patch
 0001-drm-i915-display-xelpd-Extend-Wa_14011508470.patch
+0001-drm-i915-guc-Relax-CTB-response-timeout.patch
+0001-drm-i915-guc-Improve-error-message-for-unsolicited-C.patch
+0001-drm-i915-guc-Increase-size-of-CTB-buffers.patch
+0001-drm-i915-guc-Add-non-blocking-CTB-send-function.patch
+0001-drm-i915-guc-Add-stall-timer-to-non-blocking-CTB-sen.patch
+0001-drm-i915-guc-Optimize-CTB-writes-and-reads.patch
+0001-drm-i915-guc-Module-load-failure-test-for-CT-buffer-.patch
 0001-drm-i915-debugfs-DISPLAY_VER-13-lpsp-capability.patch
 0001-drm-i915-step-s-platform-_revid_tbl-platform-_revids.patch
 0001-drm-i915-Make-pre-production-detection-use-direct-re.patch
@@ -1323,34 +1349,6 @@
 0001-INTEL_DII-END-dg1-pending-features-hacks.patch
 0001-INTEL_DII-START-guc-GuC-features.patch
 0001-INTEL_DII-drm-i915-uc-Allow-platforms-to-have-GuC-bu.patch
-0001-INTEL_DII-drm-i915-guc-Remove-sample_forcewake-h2g-a.patch
-0001-INTEL_DII-drm-i915-guc-Keep-strict-GuC-ABI-definitio.patch
-0001-INTEL_DII-drm-i915-guc-Stop-using-fence-status-from-.patch
-0001-INTEL_DII-drm-i915-Promote-ptrdiff-to-i915_utils.h.patch
-0001-INTEL_DII-drm-i915-guc-Only-rely-on-own-CTB-size.patch
-0001-INTEL_DII-drm-i915-guc-Don-t-repeat-CTB-layout-calcu.patch
-0001-INTEL_DII-drm-i915-guc-Replace-CTB-array-with-explic.patch
-0001-INTEL_DII-drm-i915-guc-Update-sizes-of-CTB-buffers.patch
-0001-INTEL_DII-drm-i915-guc-Relax-CTB-response-timeout.patch
-0001-INTEL_DII-drm-i915-guc-Start-protecting-access-to-CT.patch
-0001-INTEL_DII-drm-i915-guc-Stop-using-mutex-while-sendin.patch
-0001-INTEL_DII-drm-i915-guc-Don-t-receive-all-G2H-message.patch
-0001-INTEL_DII-drm-i915-guc-Always-copy-CT-message-to-new.patch
-0001-INTEL_DII-drm-i915-guc-Introduce-unified-HXG-message.patch
-0001-INTEL_DII-drm-i915-guc-Update-MMIO-based-communicati.patch
-0001-INTEL_DII-drm-i915-guc-Update-CTB-response-status-de.patch
-0001-INTEL_DII-drm-i915-guc-Support-per-context-schedulin.patch
-0001-INTEL_DII-drm-i915-guc-Add-flag-for-mark-broken-CTB.patch
-0001-INTEL_DII-drm-i915-guc-New-definition-of-the-CTB-des.patch
-0001-INTEL_DII-drm-i915-guc-New-definition-of-the-CTB-reg.patch
-0001-INTEL_DII-drm-i915-guc-New-CTB-based-communication.patch
-0001-INTEL_DII-drm-i915-doc-Include-GuC-ABI-documentation.patch
-0001-INTEL_DII-drm-i915-guc-Kill-guc_clients.ct_pool.patch
-0001-INTEL_DII-drm-i915-guc-Kill-ads.client_info.patch
-0001-INTEL_DII-drm-i915-guc-Unified-GuC-log.patch
-0001-INTEL_DII-drm-i915-guc-Update-firmware-to-v61.1.1.patch
-0001-INTEL_DII-drm-i915-uc-turn-on-GuC-HuC-auto-mode-by-d.patch
-0001-INTEL_DII-drm-i915-guc-Early-initialization-of-GuC-s.patch
 0001-INTEL_DII-drm-i915-dg1-Load-guc-and-huc.patch
 0001-INTEL_DII-drm-i915-guc-Request-RP0-before-loading-fi.patch
 0001-INTEL_DII-drm-i915-huc-Use-i915_probe_error-to-repor.patch
@@ -1429,12 +1427,6 @@
 0001-INTEL_DII-START-GuC-submission-support.patch
 0001-INTEL_DII-drm-i915-Introduce-i915_sched_engine-objec.patch
 0001-INTEL_DII-FIXME-drm-i915-Engine-relative-MMIO.patch
-0001-INTEL_DII-drm-i915-guc-Improve-error-message-for-uns.patch
-0001-INTEL_DII-drm-i915-guc-Add-non-blocking-CTB-send-fun.patch
-0001-INTEL_DII-drm-i915-guc-Add-stall-timer-to-non-blocki.patch
-0001-INTEL_DII-drm-i915-guc-Optimize-CTB-writes-and-reads.patch
-0001-INTEL_DII-drm-i915-guc-Increase-size-of-CTB-buffers.patch
-0001-INTEL_DII-drm-i915-guc-Module-load-failure-test-for-.patch
 0001-INTEL_DII-FIXME-drm-i915-guc-Add-new-GuC-interface-d.patch
 0001-INTEL_DII-drm-i915-guc-Remove-GuC-stage-descriptor-a.patch
 0001-INTEL_DII-FIXME-drm-i915-guc-Add-lrc-descriptor-cont.patch
@@ -1511,6 +1503,7 @@
 0001-INTEL_DII-drm-i915-Move-certain-functions-from-engin.patch
 0001-INTEL_DII-UAPI-NEEDSIGT-drm-i915-guc-Implement-BB-bo.patch
 0001-INTEL_DII-FIXME-Workaround-atomic-issue-preempt-boun.patch
+0001-INTEL_DII-NOT_UPSTREAM-Fixup-GuC-submission-to-under.patch
 0001-INTEL_DII-i915-drm-Move-secure-execbuf-check-to-exec.patch
 0001-INTEL_DII-drm-i915-Move-input-exec-fence-handling-to.patch
 0001-INTEL_DII-drm-i915-Move-output-fence-handling-to-i91.patch
0001-drm-i915-guc-Use-guc_class-instead-of-engine_class-i.patch +4 -4
index f059c1cdc001..7a7ee2c65fde 100644
@@ -119,9 +119,9 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/
  #include <linux/types.h>
 +#include "gt/intel_engine_types.h"
  
- #define GUC_CLIENT_PRIORITY_KMD_HIGH	0
- #define GUC_CLIENT_PRIORITY_HIGH	1
-@@ -26,6 +27,12 @@
+ #include "abi/guc_actions_abi.h"
+ #include "abi/guc_errors_abi.h"
+@@ -32,6 +33,12 @@
  #define GUC_VIDEO_ENGINE2		4
  #define GUC_MAX_ENGINES_NUM		(GUC_VIDEO_ENGINE2 + 1)
  
@@ -134,7 +134,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/
  #define GUC_MAX_ENGINE_CLASSES		16
  #define GUC_MAX_INSTANCES_PER_CLASS	32
  
-@@ -123,6 +130,25 @@
+@@ -129,6 +136,25 @@
  #define GUC_ID_TO_ENGINE_INSTANCE(guc_id) \
  	(((guc_id) & GUC_ENGINE_INSTANCE_MASK) >> GUC_ENGINE_INSTANCE_SHIFT)
  
0001-INTEL_DII-drm-i915-uc-turn-on-GuC-HuC-auto-mode-by-d.patch deleted +0 -28
deleted file mode 100644
index 80c7e76a65f3..000000000000
@@ -1,28 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniele Ceraolo Spurio <[email protected]>
-Date: Fri, 28 Feb 2020 14:03:06 -0800
-Subject: [PATCH] INTEL_DII: drm/i915/uc: turn on GuC/HuC auto mode by default
-
-This will enable HuC loading for Gen11+ by default if the binaries
-are available on the system. GuC submission still requires explicit
-enabling by the user.
-
-Signed-off-by: Daniele Ceraolo Spurio <[email protected]>
-Cc: Michal Wajdeczko <[email protected]>
-Reviewed-by: John Harrison <[email protected]>
----
- drivers/gpu/drm/i915/i915_params.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
---- a/drivers/gpu/drm/i915/i915_params.h
-+++ b/drivers/gpu/drm/i915/i915_params.h
-@@ -59,7 +59,7 @@ struct drm_printer;
- 	param(int, disable_power_well, -1, 0400) \
- 	param(int, enable_ips, 1, 0600) \
- 	param(int, invert_brightness, 0, 0600) \
--	param(int, enable_guc, 0, 0400) \
-+	param(int, enable_guc, -1, 0400) \
- 	param(int, guc_log_level, -1, 0400) \
- 	param(char *, guc_firmware_path, NULL, 0400) \
- 	param(char *, huc_firmware_path, NULL, 0400) \
0001-drm-i915-gt-finish-INTEL_GEN-and-friends-conversion.patch +1 -14
index 4dde28419129..aa524a37d846 100644
@@ -19,8 +19,7 @@ show up and need to be fixed up ]
 Signed-off-by: Lucas De Marchi <[email protected]>
 ---
  drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +-
- drivers/gpu/drm/i915/gt/uc/intel_guc.c          | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
 --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -34,15 +33,3 @@ diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i
  		err = gen7_ctx_switch_bb_init(engine);
  		if (err)
  			goto err_ring_unpin;
-diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
---- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-@@ -60,7 +60,7 @@ void intel_guc_init_send_regs(struct intel_guc *guc)
- 	enum forcewake_domains fw_domains = 0;
- 	unsigned int i;
- 
--	if (INTEL_GEN(gt->i915) >= 11) {
-+	if (GRAPHICS_VER(gt->i915) >= 11) {
- 		guc->send_regs.base =
- 				i915_mmio_reg_offset(GEN11_SOFT_SCRATCH(0));
- 		guc->send_regs.count = GEN11_SOFT_SCRATCH_COUNT;
0001-INTEL_DII-drm-i915-gtt-map-the-PD-up-front.patch +12 -37

94 lines not on this page · raw message

0001-INTEL_DII-drm-i915-gtt-make-flushing-conditional.patch +16 -1
index 8a13a71002cf..63c12a744ebc 100644
@@ -6,6 +6,8 @@ Subject: [PATCH] INTEL_DII: drm/i915/gtt: make flushing conditional
 Now that PDs can also be mapped as WC, we can forgo all the flushing for
 such mappings.
 
+v2: Update intel_guc_ct.c to use __px_vaddr new arg (Matthew Brost)
+
 Signed-off-by: Matthew Auld <[email protected]>
 ---
  .../drm/i915/gem/selftests/i915_gem_context.c |  2 +-
@@ -14,8 +16,9 @@ Signed-off-by: Matthew Auld <[email protected]>
  drivers/gpu/drm/i915/gt/intel_gtt.c           | 20 ++++++++---
  drivers/gpu/drm/i915/gt/intel_gtt.h           |  4 +--
  drivers/gpu/drm/i915/gt/intel_ppgtt.c         |  6 ++--
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c     |  2 +-
  drivers/gpu/drm/i915/selftests/i915_perf.c    |  2 +-
- 7 files changed, 47 insertions(+), 26 deletions(-)
+ 8 files changed, 48 insertions(+), 27 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -246,6 +249,18 @@ diff --git a/drivers/gpu/drm/i915/gt/intel_ppgtt.c b/drivers/gpu/drm/i915/gt/int
  }
  
  void
+diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
+--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
++++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
+@@ -304,7 +304,7 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct)
+ 	base = intel_guc_ggtt_offset(guc, ct->vma);
+ 
+ 	/* blob should start with send descriptor */
+-	blob = __px_vaddr(ct->vma->obj);
++	blob = __px_vaddr(ct->vma->obj, NULL);
+ 	GEM_BUG_ON(blob != ct->ctbs.send.desc);
+ 
+ 	/* (re)initialize descriptors */
 diff --git a/drivers/gpu/drm/i915/selftests/i915_perf.c b/drivers/gpu/drm/i915/selftests/i915_perf.c
 --- a/drivers/gpu/drm/i915/selftests/i915_perf.c
 +++ b/drivers/gpu/drm/i915/selftests/i915_perf.c
0001-INTEL_DII-drm-i915-uc-Allow-platforms-to-have-GuC-bu.patch +29 -26

68 lines not on this page · raw message

0001-INTEL_DII-drm-i915-dg1-Load-guc-and-huc.patch +6 -5
index c5344eceb49b..315ad6229610 100644
@@ -40,6 +40,7 @@ v33: 61.0.0 (michal)
 v34: Resolve minor conflict with adls upstream rebase.(aswarup)
 v35: Updated to GuC v61.1.1 (JohnH).
 v36: Split GuC/HuC definition entries (JohnH).
+v37: 62.0.0 (Matthew Brost)
 
 Cc: Daniele Ceraolo Spurio <[email protected]>
 Cc: Michal Wajdeczko <[email protected]>
@@ -56,11 +57,11 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/
 @@ -50,6 +50,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
   */
  #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_def) \
- 	fw_def(ALDERLAKE_S,  0, guc_def(tgl,  61, 1, 1)) \
-+	fw_def(DG1,          0, guc_def(dg1,  61, 1, 1)) \
- 	fw_def(ROCKETLAKE,   0, guc_def(tgl,  61, 1, 1)) \
- 	fw_def(TIGERLAKE,    0, guc_def(tgl,  61, 1, 1)) \
- 	fw_def(JASPERLAKE,   0, guc_def(ehl,  61, 1, 1)) \
+ 	fw_def(ALDERLAKE_S,  0, guc_def(tgl,  62, 0, 0)) \
++	fw_def(DG1,          0, guc_def(dg1,  62, 0, 0)) \
+ 	fw_def(ROCKETLAKE,   0, guc_def(tgl,  62, 0, 0)) \
+ 	fw_def(TIGERLAKE,    0, guc_def(tgl,  62, 0, 0)) \
+ 	fw_def(JASPERLAKE,   0, guc_def(ehl,  62, 0, 0)) \
 @@ -65,6 +66,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  
  #define INTEL_HUC_FIRMWARE_DEFS(fw_def, huc_def) \
0001-INTEL_DII-FIXME-drm-i915-guc-Ensure-G2H-response-has.patch +50 -37

193 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Update-intel_gt_wait_for_idle.patch +4 -4
index 3f890f49205c..408728c20cd5 100644
@@ -184,9 +184,9 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc
 +	atomic_t outstanding_submission_g2h;
 +
  	struct {
- 		bool enabled;
  		void (*reset)(struct intel_guc *guc);
-@@ -239,6 +241,8 @@ static inline void intel_guc_disable_msg(struct intel_guc *guc, u32 mask)
+ 		void (*enable)(struct intel_guc *guc);
+@@ -232,6 +234,8 @@ static inline void intel_guc_disable_msg(struct intel_guc *guc, u32 mask)
  	spin_unlock_irq(&guc->irq_lock);
  }
  
@@ -198,10 +198,10 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -111,6 +111,7 @@ void intel_guc_ct_init_early(struct intel_guc_ct *ct)
+@@ -110,6 +110,7 @@ void intel_guc_ct_init_early(struct intel_guc_ct *ct)
  	INIT_LIST_HEAD(&ct->requests.incoming);
  	INIT_WORK(&ct->requests.worker, ct_incoming_request_worker_func);
- 	tasklet_init(&ct->receive_tasklet, ct_receive_tasklet_func, (unsigned long)ct);
+ 	tasklet_setup(&ct->receive_tasklet, ct_receive_tasklet_func);
 +	init_waitqueue_head(&ct->wq);
  }
  
0001-INTEL_DII-drm-i915-guc-Reset-implementation-for-new-.patch +4 -4
index 3d9052a96042..b1f7253d0020 100644
@@ -383,7 +383,7 @@ diff --git a/drivers/gpu/drm/i915/gt/mock_engine.c b/drivers/gpu/drm/i915/gt/moc
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-@@ -147,6 +147,9 @@ static void gen11_disable_guc_interrupts(struct intel_guc *guc)
+@@ -139,6 +139,9 @@ static void gen11_disable_guc_interrupts(struct intel_guc *guc)
  {
  	struct intel_gt *gt = guc_to_gt(guc);
  
@@ -391,9 +391,9 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc
 +		return;
 +
  	spin_lock_irq(&gt->irq_lock);
- 	guc->interrupts.enabled = false;
  
-@@ -586,19 +589,6 @@ int intel_guc_suspend(struct intel_guc *guc)
+ 	intel_uncore_write(gt->uncore, GEN11_GUC_SG_INTR_MASK, ~0);
+@@ -577,19 +580,6 @@ int intel_guc_suspend(struct intel_guc *guc)
  	return 0;
  }
  
@@ -416,7 +416,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
-@@ -243,14 +243,16 @@ static inline void intel_guc_disable_msg(struct intel_guc *guc, u32 mask)
+@@ -236,14 +236,16 @@ static inline void intel_guc_disable_msg(struct intel_guc *guc, u32 mask)
  
  int intel_guc_wait_for_idle(struct intel_guc *guc, long timeout);
  
0001-INTEL_DII-drm-i915-guc-Suspend-resume-implementation.patch +19 -15
index 1d5b5dbdfbdc..eb5a1a4fbb2b 100644
@@ -50,11 +50,11 @@ Reviewed-by: Janusz Krzysztofik <[email protected]> #7
 Reviewed-by: Piotr Piórkowski <[email protected]> #12
 ---
  .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h  |  1 +
- drivers/gpu/drm/i915/gt/uc/intel_guc.c        | 64 ++++++++-----------
+ drivers/gpu/drm/i915/gt/uc/intel_guc.c        | 67 +++++++------------
  .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 14 ++--
  .../gpu/drm/i915/gt/uc/intel_guc_submission.h |  5 ++
- drivers/gpu/drm/i915/gt/uc/intel_uc.c         | 28 +++++---
- 5 files changed, 59 insertions(+), 53 deletions(-)
+ drivers/gpu/drm/i915/gt/uc/intel_uc.c         | 20 ++++--
+ 5 files changed, 53 insertions(+), 54 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h
 --- a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h
@@ -70,7 +70,17 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-@@ -541,51 +541,34 @@ int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset)
+@@ -139,9 +139,6 @@ static void gen11_disable_guc_interrupts(struct intel_guc *guc)
+ {
+ 	struct intel_gt *gt = guc_to_gt(guc);
+ 
+-	if (!guc->interrupts.enabled)
+-		return;
+-
+ 	spin_lock_irq(&gt->irq_lock);
+ 
+ 	intel_uncore_write(gt->uncore, GEN11_GUC_SG_INTR_MASK, ~0);
+@@ -532,51 +529,34 @@ int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset)
   */
  int intel_guc_suspend(struct intel_guc *guc)
  {
@@ -142,7 +152,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc
  	return 0;
  }
  
-@@ -595,7 +578,12 @@ int intel_guc_suspend(struct intel_guc *guc)
+@@ -586,7 +566,12 @@ int intel_guc_suspend(struct intel_guc *guc)
   */
  int intel_guc_resume(struct intel_guc *guc)
  {
@@ -212,17 +222,14 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h b/drivers/gpu/drm
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c
-@@ -597,14 +597,20 @@ void intel_uc_cancel_requests(struct intel_uc *uc)
+@@ -597,14 +597,18 @@ void intel_uc_cancel_requests(struct intel_uc *uc)
  void intel_uc_runtime_suspend(struct intel_uc *uc)
  {
  	struct intel_guc *guc = &uc->guc;
 -	int err;
  
--	if (!intel_guc_is_ready(guc))
-+	if (!intel_guc_is_ready(guc)) {
-+		guc->interrupts.enabled = false;
+ 	if (!intel_guc_is_ready(guc))
  		return;
-+	}
  
 -	err = intel_guc_suspend(guc);
 -	if (err)
@@ -238,17 +245,14 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/
  
  	guc_disable_communication(guc);
  }
-@@ -613,12 +619,18 @@ void intel_uc_suspend(struct intel_uc *uc)
+@@ -613,12 +617,16 @@ void intel_uc_suspend(struct intel_uc *uc)
  {
  	struct intel_guc *guc = &uc->guc;
  	intel_wakeref_t wakeref;
 +	int err;
  
--	if (!intel_guc_is_ready(guc))
-+	if (!intel_guc_is_ready(guc)) {
-+		guc->interrupts.enabled = false;
+ 	if (!intel_guc_is_ready(guc))
  		return;
-+	}
  
 -	with_intel_runtime_pm(uc_to_gt(uc)->uncore->rpm, wakeref)
 -		intel_uc_runtime_suspend(uc);
0001-INTEL_DII-FIXME-drm-i915-guc-IOMMU-catastrophic-erro.patch +3 -3
index 9de8fdcab928..2c3d3a6a74b1 100644
@@ -60,7 +60,7 @@ Reviewed-by: Janusz Krzystofik <[email protected]>
 diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
 --- a/drivers/gpu/drm/i915/Makefile
 +++ b/drivers/gpu/drm/i915/Makefile
-@@ -180,6 +180,7 @@ i915-y += \
+@@ -179,6 +179,7 @@ i915-y += \
  	  i915_scheduler.o \
  	  i915_trace_points.o \
  	  i915_vma.o \
@@ -88,9 +88,9 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  #include "intel_guc_ct.h"
 +#include "intel_pagefault.h"
  #include "gt/intel_gt.h"
+ #include "gem/i915_gem_lmem.h"
  
- static inline struct intel_guc *ct_to_guc(struct intel_guc_ct *ct)
-@@ -963,6 +964,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -998,6 +999,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  			CT_ERROR(ct, "engine failure handler failed %x %*ph\n",
  				  action, 4 * len, payload);
  		break;
0001-INTEL_DII-drm-i915-guc-Selftest-for-GuC-flow-control.patch +28 -30

117 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-slpc-Add-modparam-and-state-c.patch +3 -16
index 9cbd3d89673a..493b19222445 100644
@@ -39,13 +39,12 @@ Signed-off-by: Daniele Ceraolo Spurio <[email protected]>
  .../gpu/drm/i915/gt/uc/intel_guc_submission.h | 16 ++++++++++++++
  drivers/gpu/drm/i915/gt/uc/intel_uc.c         | 13 ++++++++++--
  drivers/gpu/drm/i915/gt/uc/intel_uc.h         |  1 +
- drivers/gpu/drm/i915/i915_params.c            |  2 +-
- 7 files changed, 53 insertions(+), 3 deletions(-)
+ 6 files changed, 52 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-@@ -170,6 +170,7 @@ void intel_guc_init_early(struct intel_guc *guc)
+@@ -158,6 +158,7 @@ void intel_guc_init_early(struct intel_guc *guc)
  	intel_guc_ct_init_early(&guc->ct);
  	intel_guc_log_init_early(&guc->log);
  	intel_guc_submission_init_early(guc);
@@ -56,7 +55,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h
-@@ -71,6 +71,8 @@ struct intel_guc {
+@@ -70,6 +70,8 @@ struct intel_guc {
  
  	bool submission_supported;
  	bool submission_selected;
@@ -176,15 +175,3 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/
  
  #undef uc_state_checkers
  #undef __uc_state_checker
-diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
---- a/drivers/gpu/drm/i915/i915_params.c
-+++ b/drivers/gpu/drm/i915/i915_params.c
-@@ -169,7 +169,7 @@ i915_param_named_unsafe(edp_vswing, int, 0400,
- i915_param_named_unsafe(enable_guc, int, 0400,
- 	"Enable GuC load for GuC submission and/or HuC load. "
- 	"Required functionality can be selected using bitmask values. "
--	"(-1=auto, 0=disable [default], 1=GuC submission, 2=HuC load)");
-+	"(-1=auto, 0=disable [default], 1=GuC submission, 2=HuC load) ");
- 
- i915_param_named(guc_log_level, int, 0400,
- 	"GuC firmware logging level. Requires GuC to be loaded. "
0001-INTEL_DII-NOT_UPSTREAM-drm-i915-guc-Dump-error-captu.patch +30 -23

122 lines not on this page · raw message

0001-INTEL_DII-drm-i915-huc-Update-firmware-to-v7.9.3-for.patch +1 -1
index 4f9dff2e84cc..2802979f103b 100644
@@ -14,7 +14,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/
 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
 @@ -65,10 +65,10 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
- 	fw_def(SKYLAKE,      0, guc_def(skl,  61, 1, 1))
+ 	fw_def(SKYLAKE,      0, guc_def(skl,  62, 0, 0))
  
  #define INTEL_HUC_FIRMWARE_DEFS(fw_def, huc_def) \
 -	fw_def(ALDERLAKE_S,  0, huc_def(tgl,  7, 5, 0)) \
0001-INTEL_DII-drm-i915-guc-Update-GuC-to-63.0.0.patch +14 -14
index bee0627f2ffc..3558cc5477d7 100644
@@ -23,20 +23,20 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/
   * firmware as TGL.
   */
  #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_def) \
--	fw_def(ALDERLAKE_S,  0, guc_def(tgl,  61, 1, 1)) \
--	fw_def(DG1,          0, guc_def(dg1,  61, 1, 1)) \
--	fw_def(ROCKETLAKE,   0, guc_def(tgl,  61, 1, 1)) \
--	fw_def(TIGERLAKE,    0, guc_def(tgl,  61, 1, 1)) \
--	fw_def(JASPERLAKE,   0, guc_def(ehl,  61, 1, 1)) \
--	fw_def(ELKHARTLAKE,  0, guc_def(ehl,  61, 1, 1)) \
--	fw_def(ICELAKE,      0, guc_def(icl,  61, 1, 1)) \
--	fw_def(COMETLAKE,    5, guc_def(cml,  61, 1, 1)) \
--	fw_def(COMETLAKE,    0, guc_def(kbl,  61, 1, 1)) \
--	fw_def(COFFEELAKE,   0, guc_def(kbl,  61, 1, 1)) \
--	fw_def(GEMINILAKE,   0, guc_def(glk,  61, 1, 1)) \
--	fw_def(KABYLAKE,     0, guc_def(kbl,  61, 1, 1)) \
--	fw_def(BROXTON,      0, guc_def(bxt,  61, 1, 1)) \
--	fw_def(SKYLAKE,      0, guc_def(skl,  61, 1, 1))
+-	fw_def(ALDERLAKE_S,  0, guc_def(tgl,  62, 0, 0)) \
+-	fw_def(DG1,          0, guc_def(dg1,  62, 0, 0)) \
+-	fw_def(ROCKETLAKE,   0, guc_def(tgl,  62, 0, 0)) \
+-	fw_def(TIGERLAKE,    0, guc_def(tgl,  62, 0, 0)) \
+-	fw_def(JASPERLAKE,   0, guc_def(ehl,  62, 0, 0)) \
+-	fw_def(ELKHARTLAKE,  0, guc_def(ehl,  62, 0, 0)) \
+-	fw_def(ICELAKE,      0, guc_def(icl,  62, 0, 0)) \
+-	fw_def(COMETLAKE,    5, guc_def(cml,  62, 0, 0)) \
+-	fw_def(COMETLAKE,    0, guc_def(kbl,  62, 0, 0)) \
+-	fw_def(COFFEELAKE,   0, guc_def(kbl,  62, 0, 0)) \
+-	fw_def(GEMINILAKE,   0, guc_def(glk,  62, 0, 0)) \
+-	fw_def(KABYLAKE,     0, guc_def(kbl,  62, 0, 0)) \
+-	fw_def(BROXTON,      0, guc_def(bxt,  62, 0, 0)) \
+-	fw_def(SKYLAKE,      0, guc_def(skl,  62, 0, 0))
 +	fw_def(ALDERLAKE_S,  0, guc_def(tgl,  63, 0, 0)) \
 +	fw_def(DG1,          0, guc_def(dg1,  63, 0, 0)) \
 +	fw_def(ROCKETLAKE,   0, guc_def(tgl,  63, 0, 0)) \
0001-INTEL_DII-drm-i915-guc-Add-support-for-CTB-RETRY-mes.patch +7 -7
index b7e291351e64..f1cdfe98fdaf 100644
@@ -15,15 +15,15 @@ Signed-off-by: Michal Wajdeczko <[email protected]>
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -677,6 +677,7 @@ static int ct_send(struct intel_guc_ct *ct,
- 	struct intel_guc_ct_buffer *ctb = &ct->ctbs.send;
+@@ -704,6 +704,7 @@ static int ct_send(struct intel_guc_ct *ct,
  	struct ct_request request;
  	unsigned long flags;
+ 	unsigned int sleep_period_ms = 1;
 +	bool send_again;
  	u32 fence;
  	int err;
  
-@@ -686,6 +687,9 @@ static int ct_send(struct intel_guc_ct *ct,
+@@ -713,6 +714,9 @@ static int ct_send(struct intel_guc_ct *ct,
  	GEM_BUG_ON(!response_buf && response_buf_size);
  	might_sleep();
  
@@ -33,7 +33,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	/*
  	 * We use a lazy spin wait loop here as we believe that if the CT
  	 * buffers are sized correctly the flow control condition should be
-@@ -730,6 +734,13 @@ static int ct_send(struct intel_guc_ct *ct,
+@@ -760,6 +764,13 @@ static int ct_send(struct intel_guc_ct *ct,
  	if (unlikely(err))
  		goto unlink;
  
@@ -47,7 +47,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	if (FIELD_GET(GUC_HXG_MSG_0_TYPE, *status) != GUC_HXG_TYPE_RESPONSE_SUCCESS) {
  		err = -EIO;
  		goto unlink;
-@@ -752,6 +763,9 @@ static int ct_send(struct intel_guc_ct *ct,
+@@ -782,6 +793,9 @@ static int ct_send(struct intel_guc_ct *ct,
  	list_del(&request.link);
  	spin_unlock_irqrestore(&ct->requests.lock, flags);
  
@@ -57,7 +57,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	return err;
  }
  
-@@ -927,6 +941,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -963,6 +977,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  	GEM_BUG_ON(len < GUC_HXG_MSG_MIN_LEN);
  	GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_ORIGIN, hxg[0]) != GUC_HXG_ORIGIN_GUC);
  	GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_TYPE, hxg[0]) != GUC_HXG_TYPE_RESPONSE_SUCCESS &&
@@ -65,7 +65,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  		   FIELD_GET(GUC_HXG_MSG_0_TYPE, hxg[0]) != GUC_HXG_TYPE_RESPONSE_FAILURE);
  
  	CT_DEBUG(ct, "response fence %u status %#x\n", fence, hxg[0]);
-@@ -1129,6 +1144,7 @@ static int ct_handle_hxg(struct intel_guc_ct *ct, struct ct_incoming_msg *msg)
+@@ -1165,6 +1180,7 @@ static int ct_handle_hxg(struct intel_guc_ct *ct, struct ct_incoming_msg *msg)
  		break;
  	case GUC_HXG_TYPE_RESPONSE_SUCCESS:
  	case GUC_HXG_TYPE_RESPONSE_FAILURE:
0001-INTEL_DII-drm-i915-guc-Use-new-CTB-config-control-ac.patch +7 -7
index 9ba387fc66b8..fe9fb44f8ad8 100644
@@ -75,7 +75,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -126,18 +126,6 @@ void intel_guc_ct_init_early(struct intel_guc_ct *ct)
+@@ -125,18 +125,6 @@ void intel_guc_ct_init_early(struct intel_guc_ct *ct)
  	init_waitqueue_head(&ct->wq);
  }
  
@@ -94,7 +94,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  static void guc_ct_buffer_desc_init(struct guc_ct_buffer_desc *desc)
  {
  	memset(desc, 0, sizeof(*desc));
-@@ -170,65 +158,65 @@ static void guc_ct_buffer_init(struct intel_guc_ct_buffer *ctb,
+@@ -169,65 +157,65 @@ static void guc_ct_buffer_init(struct intel_guc_ct_buffer *ctb,
  	guc_ct_buffer_reset(ctb);
  }
  
@@ -198,7 +198,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	return err;
  }
  
-@@ -314,7 +302,7 @@ void intel_guc_ct_fini(struct intel_guc_ct *ct)
+@@ -313,7 +301,7 @@ void intel_guc_ct_fini(struct intel_guc_ct *ct)
  int intel_guc_ct_enable(struct intel_guc_ct *ct)
  {
  	struct intel_guc *guc = ct_to_guc(ct);
@@ -207,7 +207,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	void *blob;
  	int err;
  
-@@ -339,19 +327,21 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct)
+@@ -338,19 +326,21 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct)
  	 */
  	desc = base + ptrdiff(ct->ctbs.recv.desc, blob);
  	cmds = base + ptrdiff(ct->ctbs.recv.cmds, blob);
@@ -233,9 +233,9 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
 -		goto err_deregister;
 +		goto err_out;
  
- 	ct->requests.last_fence = 1;
  	ct->enabled = true;
-@@ -361,8 +351,6 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct)
+ 	ct->stall_time = KTIME_MAX;
+@@ -359,8 +349,6 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct)
  
  	return 0;
  
@@ -244,7 +244,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  err_out:
  	CT_PROBE_ERROR(ct, "Failed to enable CTB (%pe)\n", ERR_PTR(err));
  	if (!ct->dead_ct_reported) {
-@@ -385,8 +373,7 @@ void intel_guc_ct_disable(struct intel_guc_ct *ct)
+@@ -383,8 +371,7 @@ void intel_guc_ct_disable(struct intel_guc_ct *ct)
  	ct->enabled = false;
  
  	if (intel_guc_is_fw_running(guc)) {
0001-INTEL_DII-drm-i915-guc-Drop-obsolete-CTB-registratio.patch +6 -6
index 3cb0bcbe5156..3347e67f2bf0 100644
@@ -38,7 +38,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 - *  |   +-------+--------------------------------------------------------------+
 - *  |   | 27:16 | DATA0 = MBZ                                                  |
 - *  |   +-------+--------------------------------------------------------------+
-- *  |   |  15:0 | ACTION = _`GUC_ACTION_HOST2GUC_REGISTER_CTB` = 0x5200        |
+- *  |   |  15:0 | ACTION = _`GUC_ACTION_HOST2GUC_REGISTER_CTB` = 0x4505        |
 - *  +---+-------+--------------------------------------------------------------+
 - *  | 1 | 31:12 | RESERVED = MBZ                                               |
 - *  |   +-------+--------------------------------------------------------------+
@@ -53,7 +53,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 - *  +---+-------+--------------------------------------------------------------+
 - *  | 3 |  31:0 | **BUFF_ADDF** - GGTT address of the `CT Buffer`_             |
 - *  +---+-------+--------------------------------------------------------------+
--*
+- *
 - *  +---+-------+--------------------------------------------------------------+
 - *  |   | Bits  | Description                                                  |
 - *  +===+=======+==============================================================+
@@ -64,7 +64,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 - *  |   |  27:0 | DATA0 = MBZ                                                  |
 - *  +---+-------+--------------------------------------------------------------+
 - */
--#define GUC_ACTION_HOST2GUC_REGISTER_CTB		0x4505 // FIXME 0x5200
+-#define GUC_ACTION_HOST2GUC_REGISTER_CTB		0x4505
 -
 -#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_LEN		(GUC_HXG_REQUEST_MSG_MIN_LEN + 3u)
 -#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_0_MBZ		GUC_HXG_REQUEST_MSG_0_DATA0
@@ -95,7 +95,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 - *  |   +-------+--------------------------------------------------------------+
 - *  |   | 27:16 | DATA0 = MBZ                                                  |
 - *  |   +-------+--------------------------------------------------------------+
-- *  |   |  15:0 | ACTION = _`GUC_ACTION_HOST2GUC_DEREGISTER_CTB` = 0x5201      |
+- *  |   |  15:0 | ACTION = _`GUC_ACTION_HOST2GUC_DEREGISTER_CTB` = 0x4506      |
 - *  +---+-------+--------------------------------------------------------------+
 - *  | 1 | 31:12 | RESERVED = MBZ                                               |
 - *  |   +-------+--------------------------------------------------------------+
@@ -105,7 +105,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 - *  |   +-------+--------------------------------------------------------------+
 - *  |   |   7:0 | RESERVED = MBZ                                               |
 - *  +---+-------+--------------------------------------------------------------+
--*
+- *
 - *  +---+-------+--------------------------------------------------------------+
 - *  |   | Bits  | Description                                                  |
 - *  +===+=======+==============================================================+
@@ -116,7 +116,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 - *  |   |  27:0 | DATA0 = MBZ                                                  |
 - *  +---+-------+--------------------------------------------------------------+
 - */
--#define GUC_ACTION_HOST2GUC_DEREGISTER_CTB		0x4506 // FIXME 0x5201
+-#define GUC_ACTION_HOST2GUC_DEREGISTER_CTB		0x4506
 -
 -#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_LEN		(GUC_HXG_REQUEST_MSG_MIN_LEN + 1u)
 -#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_0_MBZ	GUC_HXG_REQUEST_MSG_0_DATA0
0001-INTEL_DII-drm-i915-guc-Add-query-of-hwconfig-tables.patch +4 -4
index 6b97d7ce271c..6a267923c9d6 100644
@@ -38,7 +38,7 @@ Signed-off-by: John Harrison <[email protected]>
 diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
 --- a/drivers/gpu/drm/i915/Makefile
 +++ b/drivers/gpu/drm/i915/Makefile
-@@ -197,6 +197,7 @@ i915-y += gt/uc/intel_uc.o \
+@@ -196,6 +196,7 @@ i915-y += gt/uc/intel_uc.o \
  	  gt/uc/intel_guc_rc.o \
  	  gt/uc/intel_guc_slpc.o \
  	  gt/uc/intel_guc_submission.o \
@@ -60,10 +60,10 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h b/drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h
 --- a/drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h
 +++ b/drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h
-@@ -7,6 +7,10 @@
- #define _ABI_GUC_ERRORS_ABI_H
+@@ -8,6 +8,10 @@
  
  enum intel_guc_response_status {
+ 	INTEL_GUC_RESPONSE_STATUS_SUCCESS = 0x0,
 +	INTEL_GUC_RESPONSE_NOT_SUPPORTED = 0x20,
 +	INTEL_GUC_RESPONSE_NO_ATTRIBUTE_TABLE = 0x201,
 +	INTEL_GUC_RESPONSE_NO_DECRYPTION_KEY = 0x202,
@@ -74,7 +74,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h b/drivers/gpu/drm/i
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-@@ -455,13 +455,14 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *request, u32 len,
+@@ -443,13 +443,14 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *request, u32 len,
  	/*
  	 * No GuC command should ever take longer than 10ms.
  	 * Fast commands should still complete in 10us.
0001-INTEL_DII-drm-i915-guc-Define-CTB-based-TLB-invalida.patch +9 -9
index b20178ffa0b5..819ad2c9f13d 100644
@@ -66,7 +66,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-@@ -832,6 +832,77 @@ int intel_guc_self_cfg64(struct intel_guc *guc, u16 key, u64 value)
+@@ -820,6 +820,77 @@ int intel_guc_self_cfg64(struct intel_guc *guc, u16 key, u64 value)
  	return __guc_self_cfg(guc, key, 2, value);
  }
  
@@ -155,9 +155,9 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc
 +	u32 next_seqno;
 +
  	struct {
- 		bool enabled;
  		void (*reset)(struct intel_guc *guc);
-@@ -117,6 +120,11 @@ struct intel_guc {
+ 		void (*enable)(struct intel_guc *guc);
+@@ -116,6 +119,11 @@ struct intel_guc {
  	I915_SELFTEST_DECLARE(bool inject_corrupt_h2g;)
  };
  
@@ -169,7 +169,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc
  static inline struct intel_guc *log_to_guc(struct intel_guc_log *log)
  {
  	return container_of(log, struct intel_guc, log);
-@@ -226,6 +234,9 @@ int intel_guc_allocate_and_map_vma(struct intel_guc *guc, u32 size,
+@@ -219,6 +227,9 @@ int intel_guc_allocate_and_map_vma(struct intel_guc *guc, u32 size,
  int intel_guc_self_cfg32(struct intel_guc *guc, u16 key, u32 value);
  int intel_guc_self_cfg64(struct intel_guc *guc, u16 key, u64 value);
  
@@ -179,7 +179,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc
  static inline bool intel_guc_is_supported(const struct intel_guc *guc)
  {
  	return intel_uc_fw_is_supported(&guc->fw);
-@@ -303,6 +314,7 @@ int intel_guc_engine_failure_process_msg(struct intel_guc *guc,
+@@ -296,6 +307,7 @@ int intel_guc_engine_failure_process_msg(struct intel_guc *guc,
  					 const u32 *msg, u32 len);
  int intel_guc_error_capture_process_msg(struct intel_guc *guc,
  					 const u32 *msg, u32 len);
@@ -190,7 +190,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -1043,7 +1043,7 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -1079,7 +1079,7 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  	return 0;
  }
  
@@ -199,7 +199,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  {
  	unsigned long flags;
  	struct ct_incoming_msg *request;
-@@ -1051,11 +1051,11 @@ static bool ct_process_incoming_requests(struct intel_guc_ct *ct)
+@@ -1087,11 +1087,11 @@ static bool ct_process_incoming_requests(struct intel_guc_ct *ct)
  	int err;
  
  	spin_lock_irqsave(&ct->requests.lock, flags);
@@ -213,7 +213,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	spin_unlock_irqrestore(&ct->requests.lock, flags);
  
  	if (!request)
-@@ -1081,7 +1081,7 @@ static void ct_incoming_request_worker_func(struct work_struct *w)
+@@ -1117,7 +1117,7 @@ static void ct_incoming_request_worker_func(struct work_struct *w)
  		container_of(w, struct intel_guc_ct, requests.worker);
  	bool done;
  
@@ -222,7 +222,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	if (!done)
  		queue_work(system_unbound_wq, &ct->requests.worker);
  }
-@@ -1102,14 +1102,30 @@ static int ct_handle_event(struct intel_guc_ct *ct, struct ct_incoming_msg *requ
+@@ -1138,14 +1138,30 @@ static int ct_handle_event(struct intel_guc_ct *ct, struct ct_incoming_msg *requ
  	switch (action) {
  	case INTEL_GUC_ACTION_SCHED_CONTEXT_MODE_DONE:
  	case INTEL_GUC_ACTION_DEREGISTER_CONTEXT_DONE:
0001-INTEL_DII-drm-i915-pf-Allow-controlling-PF-functiona.patch +2 -2
index 8759706f5d46..029b1eb5b0ec 100644
@@ -46,8 +46,8 @@ diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_para
  i915_param_named_unsafe(enable_guc, int, 0400,
  	"Enable GuC load for GuC submission and/or HuC load. "
  	"Required functionality can be selected using bitmask values. "
--	"(-1=auto, 0=disable [default], 1=GuC submission, 2=HuC load) ");
-+	"(-1=auto, 0=disable [default], 1=GuC submission, 2=HuC load, "
+-	"(-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load)");
++	"(-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load, "
 +	"4=SR-IOV PF)");
  
  i915_param_named(guc_log_level, int, 0400,
0001-INTEL_DII-drm-i915-pf-Support-for-VFPF-relay-message.patch +5 -5
index c025843412fb..012271345fd9 100644
@@ -65,7 +65,7 @@ Acked-by: Piotr Piórkowski <[email protected]> #16
 diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
 --- a/drivers/gpu/drm/i915/Makefile
 +++ b/drivers/gpu/drm/i915/Makefile
-@@ -215,6 +215,7 @@ iov-y += \
+@@ -214,6 +214,7 @@ iov-y += \
  	gt/iov/intel_iov.o \
  	gt/iov/intel_iov_debugfs.o \
  	gt/iov/intel_iov_provisioning.o \
@@ -996,15 +996,15 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_pf_abi.h b/drivers/gpu/d
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -11,6 +11,7 @@
- #include "intel_guc_ct.h"
+@@ -12,6 +12,7 @@
  #include "intel_pagefault.h"
  #include "gt/intel_gt.h"
+ #include "gem/i915_gem_lmem.h"
 +#include "gt/iov/intel_iov_relay.h"
  
  enum {
  	CT_DEAD_ALIVE = 0,
-@@ -974,6 +975,8 @@ static int ct_handle_response(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -1010,6 +1011,8 @@ static int ct_handle_response(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *request)
  {
  	struct intel_guc *guc = ct_to_guc(ct);
@@ -1013,7 +1013,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	const u32 *hxg;
  	const u32 *payload;
  	u32 hxg_len, action, len;
-@@ -1028,6 +1031,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -1064,6 +1067,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  	case INTEL_GUC_ACTION_PAGE_FAULT_NOTIFICATION:
  		ret = intel_pagefault_process_page_fault_msg(guc, payload, len);
  		break;
0001-INTEL_DII-drm-i915-pf-Support-for-MMIO-relay-message.patch +3 -3
index 9943f42a022c..260c97cd5c8a 100644
@@ -294,15 +294,15 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h b/drivers/gpu/drm/
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -12,6 +12,7 @@
- #include "intel_pagefault.h"
+@@ -13,6 +13,7 @@
  #include "gt/intel_gt.h"
+ #include "gem/i915_gem_lmem.h"
  #include "gt/iov/intel_iov_relay.h"
 +#include "gt/iov/intel_iov_service.h"
  
  enum {
  	CT_DEAD_ALIVE = 0,
-@@ -1034,6 +1035,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -1070,6 +1071,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  	case GUC_ACTION_GUC2PF_RELAY_FROM_VF:
  		ret = intel_iov_relay_process_guc2pf(&iov->relay, hxg, hxg_len);
  		break;
0001-INTEL_DII-drm-i915-pf-Support-GuC-VF-state-notificat.patch +4 -4
index c8393deac78c..2332cfd84f2b 100644
@@ -27,7 +27,7 @@ Acked-by: Piotr Piórkowski <[email protected]>
 diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
 --- a/drivers/gpu/drm/i915/Makefile
 +++ b/drivers/gpu/drm/i915/Makefile
-@@ -217,6 +217,7 @@ iov-y += \
+@@ -216,6 +216,7 @@ iov-y += \
  	gt/iov/intel_iov_provisioning.o \
  	gt/iov/intel_iov_relay.o \
  	gt/iov/intel_iov_service.o \
@@ -181,15 +181,15 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_pf_abi.h b/drivers/gpu/d
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -13,6 +13,7 @@
- #include "gt/intel_gt.h"
+@@ -14,6 +14,7 @@
+ #include "gem/i915_gem_lmem.h"
  #include "gt/iov/intel_iov_relay.h"
  #include "gt/iov/intel_iov_service.h"
 +#include "gt/iov/intel_iov_state.h"
  
  enum {
  	CT_DEAD_ALIVE = 0,
-@@ -1032,6 +1033,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -1068,6 +1069,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  	case INTEL_GUC_ACTION_PAGE_FAULT_NOTIFICATION:
  		ret = intel_pagefault_process_page_fault_msg(guc, payload, len);
  		break;
0001-INTEL_DII-drm-i915-pf-Adverse-events-notifications.patch +4 -4
index bbc8a05cb421..de2189322554 100644
@@ -21,7 +21,7 @@ Signed-off-by: Michal Wajdeczko <[email protected]>
 diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
 --- a/drivers/gpu/drm/i915/Makefile
 +++ b/drivers/gpu/drm/i915/Makefile
-@@ -214,6 +214,7 @@ iov-y += \
+@@ -213,6 +213,7 @@ iov-y += \
  	i915_sriov_sysfs.o \
  	gt/iov/intel_iov.o \
  	gt/iov/intel_iov_debugfs.o \
@@ -152,15 +152,15 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_pf_abi.h b/drivers/gpu/d
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -11,6 +11,7 @@
- #include "intel_guc_ct.h"
+@@ -12,6 +12,7 @@
  #include "intel_pagefault.h"
  #include "gt/intel_gt.h"
+ #include "gem/i915_gem_lmem.h"
 +#include "gt/iov/intel_iov_event.h"
  #include "gt/iov/intel_iov_relay.h"
  #include "gt/iov/intel_iov_service.h"
  #include "gt/iov/intel_iov_state.h"
-@@ -1036,6 +1037,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -1072,6 +1073,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  	case GUC_ACTION_GUC2PF_VF_STATE_NOTIFY:
  		ret = intel_iov_state_process_guc2pf(iov, hxg, hxg_len);
  		break;
0001-INTEL_DII-drm-i915-pf-Process-VF-memory-CAT-fault-no.patch +3 -3
index 849946344e63..3280dff26aa6 100644
@@ -181,15 +181,15 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_actions_pf_abi.h b/drivers/gpu/d
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -12,6 +12,7 @@
- #include "intel_pagefault.h"
+@@ -13,6 +13,7 @@
  #include "gt/intel_gt.h"
+ #include "gem/i915_gem_lmem.h"
  #include "gt/iov/intel_iov_event.h"
 +#include "gt/iov/intel_iov_fault.h"
  #include "gt/iov/intel_iov_relay.h"
  #include "gt/iov/intel_iov_service.h"
  #include "gt/iov/intel_iov_state.h"
-@@ -1043,6 +1044,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -1079,6 +1080,9 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  	case GUC_ACTION_GUC2PF_RELAY_FROM_VF:
  		ret = intel_iov_relay_process_guc2pf(&iov->relay, hxg, hxg_len);
  		break;
0001-INTEL_DII-NOT_UPSTREAM-drm-i915-guc-Allow-to-control.patch +2 -2
index 886b3d5614cd..dc28776e4398 100644
@@ -21,7 +21,7 @@ Signed-off-by: Michal Wajdeczko <[email protected]>
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-@@ -232,6 +232,8 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc)
+@@ -220,6 +220,8 @@ static u32 guc_ctl_feature_flags(struct intel_guc *guc)
  	if (intel_uc_uses_guc_slpc(&gt->uc))
  		flags |= GUC_CTL_ENABLE_SLPC;
  
@@ -34,7 +34,7 @@ diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_para
 --- a/drivers/gpu/drm/i915/i915_params.c
 +++ b/drivers/gpu/drm/i915/i915_params.c
 @@ -172,6 +172,9 @@ i915_param_named_unsafe(enable_guc, int, 0400,
- 	"(-1=auto, 0=disable [default], 1=GuC submission, 2=HuC load, "
+ 	"(-1=auto [default], 0=disable, 1=GuC submission, 2=HuC load, "
  	"4=SR-IOV PF)");
  
 +i915_param_named_unsafe(guc_feature_flags, uint, 0400,
0001-INTEL_DII-drm-i915-vf-Ignore-GuC-CT-event-from-memIR.patch +1 -1
index 3f813040a9d8..325172357ee8 100644
@@ -29,7 +29,7 @@ Reviewed-by: Lucas De Marchi <[email protected]>
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -1255,7 +1255,15 @@ static void ct_receive_tasklet_func(unsigned long data)
+@@ -1295,7 +1295,15 @@ static void ct_receive_tasklet_func(struct tasklet_struct *t)
  void intel_guc_ct_event_handler(struct intel_guc_ct *ct)
  {
  	if (unlikely(!ct->enabled)) {
0001-INTEL_DII-FIXME-drm-i915-gt-Fake-interrupts-for-Wa-1.patch +22 -32

149 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Add-function-engine-disable-G.patch +4 -4
index 8ff18d477a73..52d63ed25a60 100644
@@ -124,9 +124,9 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc
 +	int sched_enable_ref;
 +
  	struct {
- 		bool enabled;
  		void (*reset)(struct intel_guc *guc);
-@@ -356,6 +359,8 @@ int intel_guc_engine_failure_process_msg(struct intel_guc *guc,
+ 		void (*enable)(struct intel_guc *guc);
+@@ -349,6 +352,8 @@ int intel_guc_engine_failure_process_msg(struct intel_guc *guc,
  int intel_guc_error_capture_process_msg(struct intel_guc *guc,
  					 const u32 *msg, u32 len);
  void intel_guc_tlb_invalidation_done_process_msg(struct intel_guc *guc, u32 seqno);
@@ -138,7 +138,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -1018,6 +1018,13 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -1053,6 +1053,13 @@ static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  			CT_ERROR(ct, "schedule context failed %x %*ph\n",
  				  action, 4 * len, payload);
  		break;
@@ -152,7 +152,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	case INTEL_GUC_ACTION_CONTEXT_RESET_NOTIFICATION:
  		ret = intel_guc_context_reset_process_msg(guc, payload, len);
  		if (unlikely(ret))
-@@ -1132,6 +1139,7 @@ static int ct_handle_event(struct intel_guc_ct *ct, struct ct_incoming_msg *requ
+@@ -1167,6 +1174,7 @@ static int ct_handle_event(struct intel_guc_ct *ct, struct ct_incoming_msg *requ
  	 * circular dependency if the space was returned there.
  	 */
  	switch (action) {
0001-INTEL_DII-drm-i915-mtl-Use-primary-GT-s-irq-lock-for.patch +25 -38

152 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-handle-interrupts-from-media-.patch +102 -25

181 lines not on this page · raw message

0001-INTEL_DII-drm-i915-sim-Adjust-timeouts-for-presilico.patch +15 -20
index ebb85ac8c8d7..7e5237457c04 100644
@@ -83,7 +83,7 @@ Acked-by: Venkata Ramana Nayana <[email protected]>
  drivers/gpu/drm/i915/gt/selftest_execlists.c  |  2 +-
  drivers/gpu/drm/i915/gt/selftest_timeline.c   |  4 +--
  drivers/gpu/drm/i915/gt/uc/intel_guc.c        |  4 +--
- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c     |  8 +++--
+ drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c     |  6 ++--
  drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c     |  4 ++-
  .../gpu/drm/i915/gt/uc/selftest_doorbells.c   |  6 ++--
  drivers/gpu/drm/i915/i915_debugfs.c           |  3 +-
@@ -95,7 +95,7 @@ Acked-by: Venkata Ramana Nayana <[email protected]>
  drivers/gpu/drm/i915/selftests/i915_request.c |  8 +++--
  drivers/gpu/drm/i915/selftests/igt_spinner.c  |  2 +-
  .../drm/i915/selftests/intel_semaphore_hw.c   |  3 +-
- 21 files changed, 121 insertions(+), 47 deletions(-)
+ 21 files changed, 119 insertions(+), 47 deletions(-)
 
 diff --git a/drivers/gpu/drm/i915/display/intel_de.h b/drivers/gpu/drm/i915/display/intel_de.h
 --- a/drivers/gpu/drm/i915/display/intel_de.h
@@ -245,7 +245,7 @@ diff --git a/drivers/gpu/drm/i915/gt/selftest_timeline.c b/drivers/gpu/drm/i915/
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-@@ -868,7 +868,7 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *request, u32 len,
+@@ -855,7 +855,7 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *request, u32 len,
  		FIELD_GET(GUC_HXG_MSG_0_TYPE, header) != GUC_HXG_TYPE_NO_RESPONSE_BUSY; })
  
  busy_loop:
@@ -254,7 +254,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc
  		if (unlikely(ret && --loop)) {
  			drm_dbg(&i915->drm, "mmio request %#x: still busy, countdown %u\n",
  				request[0], loop);
-@@ -1322,7 +1322,7 @@ static int guc_send_invalidate_tlb(struct intel_guc *guc, u32 *action, u32 size)
+@@ -1309,7 +1309,7 @@ static int guc_send_invalidate_tlb(struct intel_guc *guc, u32 *action, u32 size)
  	intel_boost_fake_int_timer(guc_to_gt(guc), true);
  
  #define OUTSTANDING_GUC_TIMEOUT_PERIOD  (HZ / 10)
@@ -266,12 +266,12 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -538,11 +538,11 @@ static int wait_for_ct_request_update(struct intel_guc_ct *ct,
- #define done (FIELD_GET(GUC_HXG_MSG_0_ORIGIN, READ_ONCE(req->status)) == GUC_HXG_ORIGIN_GUC)
- 	err = wait_for_us(done, 10);
+@@ -554,11 +554,11 @@ static int wait_for_ct_request_update(struct intel_guc_ct *ct,
+ 	intel_boost_fake_int_timer(ct_to_gt(ct), true);
+ 	err = wait_for_us(done, GUC_CTB_RESPONSE_TIMEOUT_SHORT_MS);
  	if (err)
--		err = wait_for(done, timeout);
-+		err = wait_for(done, timeout * PRESI_GET_MULTIPLIER(1));
+-		err = wait_for(done, GUC_CTB_RESPONSE_TIMEOUT_LONG_MS);
++		err = wait_for(done, GUC_CTB_RESPONSE_TIMEOUT_LONG_MS * PRESI_GET_MULTIPLIER(1));
  #undef done
  
  	if (unlikely(err))
@@ -280,20 +280,15 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  
  	intel_boost_fake_int_timer(ct_to_gt(ct), false);
  
-@@ -550,10 +550,12 @@ static int wait_for_ct_request_update(struct intel_guc_ct *ct,
- 	return err;
- }
- 
-+#define PRESI_CTB_TIMEOUT \
-+	(((s64)MAX_US_STALL_CTB) * PRESI_GET_MULTIPLIER(MAX_US_STALL_CTB))
+@@ -569,7 +569,7 @@ static int wait_for_ct_request_update(struct intel_guc_ct *ct,
+ #define GUC_CTB_TIMEOUT_MS	1500
  static inline bool ct_deadlocked(struct intel_guc_ct *ct)
  {
- 	bool ret = ktime_us_delta(ktime_get(), ct->stall_time) >
--		MAX_US_STALL_CTB;
-+		PRESI_CTB_TIMEOUT;
+-	long timeout = GUC_CTB_TIMEOUT_MS;
++	long timeout = GUC_CTB_TIMEOUT_MS * PRESI_GET_MULTIPLIER(1);
+ 	bool ret = ktime_ms_delta(ktime_get(), ct->stall_time) > timeout;
  
  	if (unlikely(ret)) {
- 		/*
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
@@ -334,7 +329,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/selftest_doorbells.c b/drivers/gpu/drm/i
 diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
 --- a/drivers/gpu/drm/i915/i915_debugfs.c
 +++ b/drivers/gpu/drm/i915/i915_debugfs.c
-@@ -789,7 +789,8 @@ gt_drop_caches(struct intel_gt *gt, u64 val)
+@@ -772,7 +772,8 @@ gt_drop_caches(struct intel_gt *gt, u64 val)
  		intel_gt_retire_requests(gt);
  
  	if (val & DROP_RESET_ACTIVE &&
0001-drm-i915-guc-Remove-sample_forcewake-h2g-action.patch renamed from 0001-INTEL_DII-drm-i915-guc-Remove-sample_forcewake-h2g-a.patch +12 -7
similarity index 82%
rename from 0001-INTEL_DII-drm-i915-guc-Remove-sample_forcewake-h2g-a.patch
rename to 0001-drm-i915-guc-Remove-sample_forcewake-h2g-action.patch
index 04595295e11e..deaf6fa4a3dd 100644
@@ -1,16 +1,21 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Rodrigo Vivi <[email protected]>
-Date: Fri, 16 Oct 2020 12:20:42 -0400
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Remove sample_forcewake h2g action
+Date: Wed, 2 Jun 2021 22:16:14 -0700
+Subject: [PATCH] drm/i915/guc: Remove sample_forcewake h2g action
 
 This action is no-op in the GuC side for a few versions already
 and it is getting entirely removed soon, in an upcoming version.
 
 Time to remove before we face communication issues.
 
-Cc:  Vinay Belgaumkar <[email protected]>
+Cc: Vinay Belgaumkar <[email protected]>
 Signed-off-by: Rodrigo Vivi <[email protected]>
-Reviewed-by: Vinay Belgaumkar <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Acked-by: Michal Wajdeczko <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 28bef5bc559ab211ef3306a850c201190518c961)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc.c      | 16 ----------------
  drivers/gpu/drm/i915/gt/uc/intel_guc.h      |  1 -
@@ -21,7 +26,7 @@ Reviewed-by: Vinay Belgaumkar <[email protected]>
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-@@ -470,22 +470,6 @@ int intel_guc_to_host_process_recv_msg(struct intel_guc *guc,
+@@ -469,22 +469,6 @@ int intel_guc_to_host_process_recv_msg(struct intel_guc *guc,
  	return 0;
  }
  
@@ -58,7 +63,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
-@@ -342,9 +342,6 @@ struct guc_ct_buffer_desc {
+@@ -302,9 +302,6 @@ struct guc_ct_buffer_desc {
  #define GUC_CT_MSG_ACTION_SHIFT			16
  #define GUC_CT_MSG_ACTION_MASK			0xFFFF
  
@@ -68,7 +73,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/
  #define GUC_POWER_UNSPECIFIED	0
  #define GUC_POWER_D0		1
  #define GUC_POWER_D1		2
-@@ -598,7 +595,6 @@ enum intel_guc_action {
+@@ -558,7 +555,6 @@ enum intel_guc_action {
  	INTEL_GUC_ACTION_ENTER_S_STATE = 0x501,
  	INTEL_GUC_ACTION_EXIT_S_STATE = 0x502,
  	INTEL_GUC_ACTION_SLPC_REQUEST = 0x3003,
0001-drm-i915-guc-Keep-strict-GuC-ABI-definitions.patch renamed from 0001-INTEL_DII-drm-i915-guc-Keep-strict-GuC-ABI-definitio.patch +10 -7
similarity index 97%
rename from 0001-INTEL_DII-drm-i915-guc-Keep-strict-GuC-ABI-definitio.patch
rename to 0001-drm-i915-guc-Keep-strict-GuC-ABI-definitions.patch
index 730208fc3fdb..1efb494298c7 100644
@@ -1,8 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Mon, 18 Jan 2021 14:53:07 +0100
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Keep strict GuC ABI definitions
- separate
+Date: Wed, 2 Jun 2021 22:16:15 -0700
+Subject: [PATCH] drm/i915/guc: Keep strict GuC ABI definitions
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,7 +11,11 @@ set of our helpers. In anticipation of upcoming changes to the GuC
 interface try to keep them separate in smaller maintainable files.
 
 Signed-off-by: Michal Wajdeczko <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
 Reviewed-by: Michał Winiarski <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 0a8e247dc1fa7a4b1e91b41f833f2a5f14c6d3f3)
 ---
  .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h  |  51 +++++
  .../gt/uc/abi/guc_communication_ctb_abi.h     | 106 +++++++++
@@ -299,9 +302,9 @@ new file mode 100644
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
-@@ -11,6 +11,12 @@
+@@ -10,6 +10,12 @@
+ #include <linux/compiler.h>
  #include <linux/types.h>
- #include "gt/intel_engine_types.h"
  
 +#include "abi/guc_actions_abi.h"
 +#include "abi/guc_errors_abi.h"
@@ -312,7 +315,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/
  #define GUC_CLIENT_PRIORITY_KMD_HIGH	0
  #define GUC_CLIENT_PRIORITY_HIGH	1
  #define GUC_CLIENT_PRIORITY_KMD_NORMAL	2
-@@ -247,101 +253,6 @@ struct guc_stage_desc {
+@@ -207,101 +213,6 @@ struct guc_stage_desc {
  	u64 desc_private;
  } __packed;
  
@@ -414,7 +417,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/
  #define GUC_POWER_UNSPECIFIED	0
  #define GUC_POWER_D0		1
  #define GUC_POWER_D1		2
-@@ -517,119 +428,17 @@ struct guc_shared_ctx_data {
+@@ -477,119 +388,17 @@ struct guc_shared_ctx_data {
  	struct guc_ctx_report preempt_ctx_report[GUC_MAX_ENGINES_NUM];
  } __packed;
  
0001-drm-i915-guc-Stop-using-fence-status-from-CTB-descri.patch renamed from 0001-INTEL_DII-drm-i915-guc-Stop-using-fence-status-from-.patch +7 -6
similarity index 91%
rename from 0001-INTEL_DII-drm-i915-guc-Stop-using-fence-status-from-.patch
rename to 0001-drm-i915-guc-Stop-using-fence-status-from-CTB-descri.patch
index 54b0cdc533cd..0908253cb765 100644
@@ -1,16 +1,17 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Sun, 20 Dec 2020 23:38:19 +0100
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Stop using fence/status from CTB
- descriptor
+Date: Wed, 2 Jun 2021 22:16:17 -0700
+Subject: [PATCH] drm/i915/guc: Stop using fence/status from CTB descriptor
 
 Stop using fence/status from CTB descriptor as future GuC ABI will
 no longer support replies over CTB descriptor.
 
-v2: rebased
-
 Signed-off-by: Michal Wajdeczko <[email protected]>
-Acked-by: Matthew Brost <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 882be6e0b705681ec210d80e7abc0e7e4c8aad28)
 ---
  .../gt/uc/abi/guc_communication_ctb_abi.h     |  4 +-
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c     | 72 ++-----------------
0001-drm-i915-Promote-ptrdiff-to-i915_utils.h.patch renamed from 0001-INTEL_DII-drm-i915-Promote-ptrdiff-to-i915_utils.h.patch +8 -4
similarity index 71%
rename from 0001-INTEL_DII-drm-i915-Promote-ptrdiff-to-i915_utils.h.patch
rename to 0001-drm-i915-Promote-ptrdiff-to-i915_utils.h.patch
index 63b38add40b5..6c6a61c901a1 100644
@@ -1,12 +1,16 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Sun, 21 Feb 2021 17:18:16 +0100
-Subject: [PATCH] INTEL_DII: drm/i915: Promote ptrdiff() to i915_utils.h
+Date: Wed, 2 Jun 2021 22:16:18 -0700
+Subject: [PATCH] drm/i915: Promote ptrdiff() to i915_utils.h
 
 Generic helpers should be placed in i915_utils.h.
 
 Signed-off-by: Michal Wajdeczko <[email protected]>
-Acked-by: Matthew Brost <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit d6e9c965607c3c51b965b7e804537000332cb666)
 ---
  drivers/gpu/drm/i915/i915_utils.h | 5 +++++
  drivers/gpu/drm/i915/i915_vma.h   | 5 -----
@@ -30,7 +34,7 @@ diff --git a/drivers/gpu/drm/i915/i915_utils.h b/drivers/gpu/drm/i915/i915_utils
 diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h
 --- a/drivers/gpu/drm/i915/i915_vma.h
 +++ b/drivers/gpu/drm/i915/i915_vma.h
-@@ -175,11 +175,6 @@ static inline void i915_vma_put(struct i915_vma *vma)
+@@ -148,11 +148,6 @@ static inline void i915_vma_put(struct i915_vma *vma)
  	i915_gem_object_put(vma->obj);
  }
  
0001-drm-i915-guc-Only-rely-on-own-CTB-size.patch renamed from 0001-INTEL_DII-drm-i915-guc-Only-rely-on-own-CTB-size.patch +7 -3
similarity index 92%
rename from 0001-INTEL_DII-drm-i915-guc-Only-rely-on-own-CTB-size.patch
rename to 0001-drm-i915-guc-Only-rely-on-own-CTB-size.patch
index 51155c87197f..1d79d134827c 100644
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Sun, 21 Feb 2021 19:44:30 +0100
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Only rely on own CTB size
+Date: Wed, 2 Jun 2021 22:16:19 -0700
+Subject: [PATCH] drm/i915/guc: Only rely on own CTB size
 
 In upcoming GuC firmware, CTB size will be removed from the CTB
 descriptor so we must keep it locally for any calculations.
@@ -9,7 +9,11 @@ descriptor so we must keep it locally for any calculations.
 While around, improve some debug messages and helpers.
 
 Signed-off-by: Michal Wajdeczko <[email protected]>
-Acked-by: Matthew Brost <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 99b2f5f51c6bcf311df2ee992942b6b1b463225d)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 55 +++++++++++++++++------
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h |  2 +
0001-drm-i915-guc-Don-t-repeat-CTB-layout-calculations.patch renamed from 0001-INTEL_DII-drm-i915-guc-Don-t-repeat-CTB-layout-calcu.patch +45 -5

69 lines not on this page · raw message

0001-drm-i915-guc-Replace-CTB-array-with-explicit-members.patch renamed from 0001-INTEL_DII-drm-i915-guc-Replace-CTB-array-with-explic.patch +12 -5
similarity index 89%
rename from 0001-INTEL_DII-drm-i915-guc-Replace-CTB-array-with-explic.patch
rename to 0001-drm-i915-guc-Replace-CTB-array-with-explicit-members.patch
index 9de03f4a8a4d..de372342316d 100644
@@ -1,15 +1,22 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Sun, 21 Feb 2021 21:41:10 +0100
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Replace CTB array with explicit
- members
+Date: Thu, 3 Jun 2021 16:04:07 -0700
+Subject: [PATCH] drm/i915/guc: Replace CTB array with explicit members
 
 Upcoming GuC firmware will always require just two CTBs and we
 also plan to configure them with different sizes, so definining
 them as array is no longer suitable.
 
+v2: Use %p for ptrdiff print
+v3: Use %tx for ptrdiff print
+
 Signed-off-by: Michal Wajdeczko <[email protected]>
-Acked-by: Matthew Brost <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Reported-by: kernel test robot <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit b43f0fc8b8c81e3001526c7205f12d8a931a48dd)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 46 ++++++++++++-----------
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h |  7 +++-
@@ -72,7 +79,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
 @@ -257,28 +264,25 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct)
  
  	/* blob should start with send descriptor */
- 	blob = __px_vaddr(ct->vma->obj, NULL);
+ 	blob = __px_vaddr(ct->vma->obj);
 -	GEM_BUG_ON(blob != ct->ctbs[CTB_SEND].desc);
 +	GEM_BUG_ON(blob != ct->ctbs.send.desc);
  
0001-drm-i915-guc-Update-sizes-of-CTB-buffers.patch renamed from 0001-INTEL_DII-drm-i915-guc-Update-sizes-of-CTB-buffers.patch +7 -4
similarity index 92%
rename from 0001-INTEL_DII-drm-i915-guc-Update-sizes-of-CTB-buffers.patch
rename to 0001-drm-i915-guc-Update-sizes-of-CTB-buffers.patch
index b5b332bff5c7..dabf4af91d78 100644
@@ -1,15 +1,18 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Thu, 11 Mar 2021 15:24:51 +0100
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Update sizes of CTB buffers
+Date: Thu, 3 Jun 2021 16:04:08 -0700
+Subject: [PATCH] drm/i915/guc: Update sizes of CTB buffers
 
 Future GuC will require CTB buffers sizes to be multiple of 4K.
 Make these changes now as this shouldn't impact us too much.
 
 Signed-off-by: Michal Wajdeczko <[email protected]>
-Cc: John Harrison <[email protected]>
-Cc: Matthew Brost <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
 Reviewed-by: Matthew Brost <[email protected]>
+Cc: John Harrison <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit df12d1c3014f5a2f37e561a5331cf4bb7563b937)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 60 ++++++++++++-----------
  1 file changed, 32 insertions(+), 28 deletions(-)
0001-drm-i915-guc-Start-protecting-access-to-CTB-descript.patch renamed from 0001-INTEL_DII-drm-i915-guc-Start-protecting-access-to-CT.patch +11 -7
similarity index 80%
rename from 0001-INTEL_DII-drm-i915-guc-Start-protecting-access-to-CT.patch
rename to 0001-drm-i915-guc-Start-protecting-access-to-CTB-descript.patch
index 16530aa09917..4d2069ce0835 100644
@@ -1,17 +1,21 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Tue, 23 Feb 2021 19:12:55 +0100
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Start protecting access to CTB
- descriptors
+Date: Wed, 2 Jun 2021 22:16:24 -0700
+Subject: [PATCH] drm/i915/guc: Start protecting access to CTB descriptors
 
 We want to stop using guc.send_mutex while sending CTB messages
 so we have to start protecting access to CTB send descriptor.
 
-For completeness protect also CTB send descriptor.
+For completeness protect also CTB receive descriptor.
 
 Add spinlock to struct intel_guc_ct_buffer and start using it.
 
 Signed-off-by: Michal Wajdeczko <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 7c567bbf6f267c7379ddbba7afba7608d6e8e39f)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 14 ++++++++++++--
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h |  2 ++
@@ -29,7 +33,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	spin_lock_init(&ct->requests.lock);
  	INIT_LIST_HEAD(&ct->requests.pending);
  	INIT_LIST_HEAD(&ct->requests.incoming);
-@@ -479,17 +481,22 @@ static int ct_send(struct intel_guc_ct *ct,
+@@ -473,17 +475,22 @@ static int ct_send(struct intel_guc_ct *ct,
  	GEM_BUG_ON(len & ~GUC_CT_MSG_LEN_MASK);
  	GEM_BUG_ON(!response_buf && response_buf_size);
  
@@ -54,7 +58,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	if (unlikely(err))
  		goto unlink;
  
-@@ -825,6 +832,7 @@ static int ct_handle_request(struct intel_guc_ct *ct, const u32 *msg)
+@@ -819,6 +826,7 @@ static int ct_handle_request(struct intel_guc_ct *ct, const u32 *msg)
  void intel_guc_ct_event_handler(struct intel_guc_ct *ct)
  {
  	u32 msg[GUC_CT_MSG_LEN_MASK + 1]; /* one extra dw for the header */
@@ -62,7 +66,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	int err = 0;
  
  	if (unlikely(!ct->enabled)) {
-@@ -833,7 +841,9 @@ void intel_guc_ct_event_handler(struct intel_guc_ct *ct)
+@@ -827,7 +835,9 @@ void intel_guc_ct_event_handler(struct intel_guc_ct *ct)
  	}
  
  	do {
0001-drm-i915-guc-Stop-using-mutex-while-sending-CTB-mess.patch renamed from 0001-INTEL_DII-drm-i915-guc-Stop-using-mutex-while-sendin.patch +10 -6
similarity index 66%
rename from 0001-INTEL_DII-drm-i915-guc-Stop-using-mutex-while-sendin.patch
rename to 0001-drm-i915-guc-Stop-using-mutex-while-sending-CTB-mess.patch
index a124cfb0a18f..ab85f7093447 100644
@@ -1,14 +1,18 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Tue, 23 Feb 2021 19:18:34 +0100
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Stop using mutex while sending CTB
- messages
+Date: Wed, 2 Jun 2021 22:16:26 -0700
+Subject: [PATCH] drm/i915/guc: Stop using mutex while sending CTB messages
 
 We are no longer using descriptor to hold G2H replies and we are
 protecting access to the descriptor and command buffer by the
 separate spinlock, so we can stop using mutex.
 
 Signed-off-by: Michal Wajdeczko <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 2e496ac200c13ab1de6dc504a2566c612b493a4e)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 4 ----
  1 file changed, 4 deletions(-)
@@ -16,7 +20,7 @@ Signed-off-by: Michal Wajdeczko <[email protected]>
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -537,7 +537,6 @@ static int ct_send(struct intel_guc_ct *ct,
+@@ -560,7 +560,6 @@ static int ct_send(struct intel_guc_ct *ct,
  int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
  		      u32 *response_buf, u32 response_buf_size)
  {
@@ -24,7 +28,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	u32 status = ~0; /* undefined */
  	int ret;
  
-@@ -546,8 +545,6 @@ int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
+@@ -569,8 +568,6 @@ int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
  		return -ENODEV;
  	}
  
@@ -33,7 +37,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	ret = ct_send(ct, action, len, response_buf, response_buf_size, &status);
  	if (unlikely(ret < 0)) {
  		CT_ERROR(ct, "Sending action %#x failed (err=%d status=%#X)\n",
-@@ -557,7 +554,6 @@ int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
+@@ -580,7 +577,6 @@ int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
  			 action[0], ret, ret);
  	}
  
0001-drm-i915-guc-Don-t-receive-all-G2H-messages-in-irq-h.patch renamed from 0001-INTEL_DII-drm-i915-guc-Don-t-receive-all-G2H-message.patch +19 -15
similarity index 78%
rename from 0001-INTEL_DII-drm-i915-guc-Don-t-receive-all-G2H-message.patch
rename to 0001-drm-i915-guc-Don-t-receive-all-G2H-messages-in-irq-h.patch
index d0399380e738..47c67cab8496 100644
@@ -1,13 +1,17 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Thu, 1 Apr 2021 22:01:40 +0200
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Don't receive all G2H messages in
- irq handler
+Date: Wed, 2 Jun 2021 22:16:27 -0700
+Subject: [PATCH] drm/i915/guc: Don't receive all G2H messages in irq handler
 
 In irq handler try to receive just single G2H message, let other
 messages to be received from tasklet.
 
 Signed-off-by: Michal Wajdeczko <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 65dd4ed0f4e1ce2ccf8ddc66a6ee026b20f0c24c)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 67 ++++++++++++++++-------
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h |  3 +
@@ -16,23 +20,23 @@ Signed-off-by: Michal Wajdeczko <[email protected]>
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -81,6 +81,7 @@ enum { CTB_SEND = 0, CTB_RECV = 1 };
+@@ -82,6 +82,7 @@ enum { CTB_SEND = 0, CTB_RECV = 1 };
  
  enum { CTB_OWNER_HOST = 0 };
  
-+static void ct_receive_tasklet_func(unsigned long data);
++static void ct_receive_tasklet_func(struct tasklet_struct *t);
  static void ct_incoming_request_worker_func(struct work_struct *w);
  
  /**
-@@ -95,6 +96,7 @@ void intel_guc_ct_init_early(struct intel_guc_ct *ct)
+@@ -96,6 +97,7 @@ void intel_guc_ct_init_early(struct intel_guc_ct *ct)
  	INIT_LIST_HEAD(&ct->requests.pending);
  	INIT_LIST_HEAD(&ct->requests.incoming);
  	INIT_WORK(&ct->requests.worker, ct_incoming_request_worker_func);
-+	tasklet_init(&ct->receive_tasklet, ct_receive_tasklet_func, (unsigned long)ct);
++	tasklet_setup(&ct->receive_tasklet, ct_receive_tasklet_func);
  }
  
  static inline const char *guc_ct_buffer_type_to_str(u32 type)
-@@ -244,6 +246,7 @@ void intel_guc_ct_fini(struct intel_guc_ct *ct)
+@@ -245,6 +247,7 @@ void intel_guc_ct_fini(struct intel_guc_ct *ct)
  {
  	GEM_BUG_ON(ct->enabled);
  
@@ -40,7 +44,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	i915_vma_unpin_and_release(&ct->vma, I915_VMA_RELEASE_MAP);
  	memset(ct, 0, sizeof(*ct));
  }
-@@ -629,7 +632,7 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
+@@ -652,7 +655,7 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
  	CT_DEBUG(ct, "received %*ph\n", 4 * len, data);
  
  	desc->head = head * 4;
@@ -49,7 +53,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  
  corrupted:
  	CT_ERROR(ct, "Corrupted descriptor addr=%#x head=%u tail=%u size=%u\n",
-@@ -665,10 +668,10 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
+@@ -688,10 +691,10 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
  	u32 status;
  	u32 datalen;
  	struct ct_request *req;
@@ -61,7 +65,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  
  	/* Response payload shall at least include fence and status */
  	if (unlikely(len < 2)) {
-@@ -688,7 +691,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
+@@ -711,7 +714,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
  
  	CT_DEBUG(ct, "response fence %u status %#x\n", fence, status);
  
@@ -70,7 +74,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	list_for_each_entry(req, &ct->requests.pending, link) {
  		if (unlikely(fence != req->fence)) {
  			CT_DEBUG(ct, "request %u awaits response\n",
-@@ -707,7 +710,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
+@@ -730,7 +733,7 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
  		found = true;
  		break;
  	}
@@ -79,7 +83,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  
  	if (!found)
  		CT_ERROR(ct, "Unsolicited response %*ph\n", msgsize, msg);
-@@ -821,31 +824,55 @@ static int ct_handle_request(struct intel_guc_ct *ct, const u32 *msg)
+@@ -844,31 +847,55 @@ static int ct_handle_request(struct intel_guc_ct *ct, const u32 *msg)
  	return 0;
  }
  
@@ -115,9 +119,9 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
 +		tasklet_hi_schedule(&ct->receive_tasklet);
 +}
 +
-+static void ct_receive_tasklet_func(unsigned long data)
++static void ct_receive_tasklet_func(struct tasklet_struct *t)
 +{
-+	struct intel_guc_ct *ct = (struct intel_guc_ct *)data;
++	struct intel_guc_ct *ct = from_tasklet(ct, t, receive_tasklet);
 +
 +	ct_try_receive_message(ct);
 +}
0001-drm-i915-guc-Always-copy-CT-message-to-new-allocatio.patch renamed from 0001-INTEL_DII-drm-i915-guc-Always-copy-CT-message-to-new.patch +20 -18
similarity index 88%
rename from 0001-INTEL_DII-drm-i915-guc-Always-copy-CT-message-to-new.patch
rename to 0001-drm-i915-guc-Always-copy-CT-message-to-new-allocatio.patch
index 7d0ee4c1855d..1b69952c4590 100644
@@ -1,8 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Wed, 7 Apr 2021 21:32:18 +0200
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Always copy CT message to new
- allocation
+Date: Wed, 2 Jun 2021 22:16:28 -0700
+Subject: [PATCH] drm/i915/guc: Always copy CT message to new allocation
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,10 +12,13 @@ create new allocation for such request, always copy incoming CT
 message to new allocation. Also by doing it while reading CT
 header, we can safely fallback if that atomic allocation fails.
 
-v2: add comments, improve ct_process_request
-
 Signed-off-by: Michal Wajdeczko <[email protected]>
-Acked-by: Piotr Piórkowski <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Cc: Piotr Piórkowski <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 8d99e09c5d1c20a3763e84d5f09619fa33e33186)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 180 ++++++++++++++--------
  1 file changed, 120 insertions(+), 60 deletions(-)
@@ -24,7 +26,7 @@ Acked-by: Piotr Piórkowski <[email protected]>
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -72,8 +72,9 @@ struct ct_request {
+@@ -73,8 +73,9 @@ struct ct_request {
  	u32 *response_buf;
  };
  
@@ -35,7 +37,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	u32 msg[];
  };
  
-@@ -575,7 +576,26 @@ static inline bool ct_header_is_response(u32 header)
+@@ -598,7 +599,26 @@ static inline bool ct_header_is_response(u32 header)
  	return !!(header & GUC_CT_MSG_IS_RESPONSE);
  }
  
@@ -63,7 +65,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  {
  	struct intel_guc_ct_buffer *ctb = &ct->ctbs.recv;
  	struct guc_ct_buffer_desc *desc = ctb->desc;
-@@ -586,6 +606,7 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
+@@ -609,6 +629,7 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
  	s32 available;
  	unsigned int len;
  	unsigned int i;
@@ -71,7 +73,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  
  	if (unlikely(desc->is_in_error))
  		return -EPIPE;
-@@ -601,8 +622,10 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
+@@ -624,8 +645,10 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
  
  	/* tail == head condition indicates empty */
  	available = tail - head;
@@ -84,7 +86,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  
  	/* beware of buffer wrap case */
  	if (unlikely(available < 0))
-@@ -610,14 +633,14 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
+@@ -633,14 +656,14 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
  	CT_DEBUG(ct, "available %d (%u:%u)\n", available, head, tail);
  	GEM_BUG_ON(available < 0);
  
@@ -102,7 +104,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  			 4 * (head + available - 1 > size ?
  			      size - head : available - 1), &cmds[head],
  			 4 * (head + available - 1 > size ?
-@@ -625,11 +648,24 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
+@@ -648,11 +671,24 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
  		goto corrupted;
  	}
  
@@ -129,7 +131,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  
  	desc->head = head * 4;
  	return available - len;
-@@ -659,33 +695,33 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
+@@ -682,33 +718,33 @@ static int ct_read(struct intel_guc_ct *ct, u32 *data)
   *                   ^-----------------------len-----------------------^
   */
  
@@ -170,7 +172,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  		return -EPROTO;
  	}
  
-@@ -699,12 +735,13 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
+@@ -722,12 +758,13 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
  			continue;
  		}
  		if (unlikely(datalen > req->response_len)) {
@@ -188,7 +190,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  		req->response_len = datalen;
  		WRITE_ONCE(req->status, status);
  		found = true;
-@@ -712,45 +749,61 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
+@@ -735,45 +772,61 @@ static int ct_handle_response(struct intel_guc_ct *ct, const u32 *msg)
  	}
  	spin_unlock_irqrestore(&ct->requests.lock, flags);
  
@@ -264,7 +266,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	if (request)
  		list_del(&request->link);
  	done = !!list_empty(&ct->requests.incoming);
-@@ -759,14 +812,13 @@ static bool ct_process_incoming_requests(struct intel_guc_ct *ct)
+@@ -782,14 +835,13 @@ static bool ct_process_incoming_requests(struct intel_guc_ct *ct)
  	if (!request)
  		return true;
  
@@ -285,7 +287,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  	return done;
  }
  
-@@ -799,22 +851,11 @@ static void ct_incoming_request_worker_func(struct work_struct *w)
+@@ -822,22 +874,11 @@ static void ct_incoming_request_worker_func(struct work_struct *w)
   *                   ^-----------------------len-----------------------^
   */
  
@@ -310,7 +312,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
  
  	spin_lock_irqsave(&ct->requests.lock, flags);
  	list_add_tail(&request->link, &ct->requests.incoming);
-@@ -824,22 +865,41 @@ static int ct_handle_request(struct intel_guc_ct *ct, const u32 *msg)
+@@ -847,22 +888,41 @@ static int ct_handle_request(struct intel_guc_ct *ct, const u32 *msg)
  	return 0;
  }
  
0001-drm-i915-guc-Early-initialization-of-GuC-send-regist.patch renamed from 0001-INTEL_DII-drm-i915-guc-Early-initialization-of-GuC-s.patch +11 -7
similarity index 74%
rename from 0001-INTEL_DII-drm-i915-guc-Early-initialization-of-GuC-s.patch
rename to 0001-drm-i915-guc-Early-initialization-of-GuC-send-regist.patch
index fd87433c2cb2..6dfc0461d776 100644
@@ -1,15 +1,19 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Sun, 2 Aug 2020 17:51:56 +0200
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Early initialization of GuC send
- registers
+Date: Wed, 2 Jun 2021 22:16:29 -0700
+Subject: [PATCH] drm/i915/guc: Early initialization of GuC send registers
 
 Base offset and count of the GuC scratch registers, used for
 sending MMIO messages to GuC, can be initialized earlier with
 other GuC members that also depends on platform.
 
 Signed-off-by: Michal Wajdeczko <[email protected]>
-Reviewed-by: Daniele Ceraolo Spurio <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Cc: Daniele Ceraolo Spurio <[email protected]>
+Signed-off-by: Daniel Vetter <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit e09be87af54f703a67f6b573f6a12b8349c5c8f5)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc.c | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
@@ -17,11 +21,11 @@ Reviewed-by: Daniele Ceraolo Spurio <[email protected]>
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
-@@ -61,15 +61,8 @@ void intel_guc_init_send_regs(struct intel_guc *guc)
+@@ -60,15 +60,8 @@ void intel_guc_init_send_regs(struct intel_guc *guc)
  	enum forcewake_domains fw_domains = 0;
  	unsigned int i;
  
--	if (GRAPHICS_VER(gt->i915) >= 11) {
+-	if (INTEL_GEN(gt->i915) >= 11) {
 -		guc->send_regs.base =
 -				i915_mmio_reg_offset(GEN11_SOFT_SCRATCH(0));
 -		guc->send_regs.count = GEN11_SOFT_SCRATCH_COUNT;
@@ -35,7 +39,7 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc
  
  	for (i = 0; i < guc->send_regs.count; i++) {
  		fw_domains |= intel_uncore_forcewake_for_reg(gt->uncore,
-@@ -182,11 +175,18 @@ void intel_guc_init_early(struct intel_guc *guc)
+@@ -172,11 +165,18 @@ void intel_guc_init_early(struct intel_guc *guc)
  		guc->interrupts.reset = gen11_reset_guc_interrupts;
  		guc->interrupts.enable = gen11_enable_guc_interrupts;
  		guc->interrupts.disable = gen11_disable_guc_interrupts;
0001-drm-i915-uc-Use-platform-specific-defaults-for-GuC-H.patch new file +47 -0

47 lines not on this page · raw message

0001-drm-i915-guc-Introduce-unified-HXG-messages.patch renamed from 0001-INTEL_DII-drm-i915-guc-Introduce-unified-HXG-message.patch +8 -5
similarity index 96%
rename from 0001-INTEL_DII-drm-i915-guc-Introduce-unified-HXG-message.patch
rename to 0001-drm-i915-guc-Introduce-unified-HXG-messages.patch
index e22cdaf867ee..de9ded8d2adb 100644
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Mon, 18 Jan 2021 17:23:16 +0100
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Introduce unified HXG messages
+Date: Tue, 15 Jun 2021 17:13:00 -0700
+Subject: [PATCH] drm/i915/guc: Introduce unified HXG messages
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -10,10 +10,13 @@ New GuC firmware will unify format of MMIO and CTB H2G messages.
 Introduce their definitions now to allow gradual transition of
 our code to match new changes.
 
-v2: minor kernel-doc fixes
-
+Signed-off-by: Matthew Brost <[email protected]>
 Signed-off-by: Michal Wajdeczko <[email protected]>
-Reviewed-by: Michał Winiarski <[email protected]>
+Cc: Michał Winiarski <[email protected]>
+Reviewed-by: Daniele Ceraolo Spurio <[email protected]>
+Signed-off-by: Matt Roper <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit 088b4d4a48ee97e993fc6b4381d23776f0782bc6)
 ---
  .../gpu/drm/i915/gt/uc/abi/guc_messages_abi.h | 213 ++++++++++++++++++
  1 file changed, 213 insertions(+)
0001-drm-i915-doc-Include-GuC-ABI-documentation.patch renamed from 0001-INTEL_DII-drm-i915-doc-Include-GuC-ABI-documentation.patch +9 -4
similarity index 66%
rename from 0001-INTEL_DII-drm-i915-doc-Include-GuC-ABI-documentation.patch
rename to 0001-drm-i915-doc-Include-GuC-ABI-documentation.patch
index e92174655c75..905a541837b5 100644
@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Michal Wajdeczko <[email protected]>
-Date: Wed, 12 May 2021 20:00:09 +0200
-Subject: [PATCH] INTEL_DII: drm/i915/doc: Include GuC ABI documentation
+Date: Tue, 15 Jun 2021 17:13:02 -0700
+Subject: [PATCH] drm/i915/doc: Include GuC ABI documentation
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -9,7 +9,12 @@ Content-Transfer-Encoding: 8bit
 GuC ABI documentation is now ready to be included in i915.rst
 
 Signed-off-by: Michal Wajdeczko <[email protected]>
-Acked-by: Piotr Piórkowski <[email protected]>
+Signed-off-by: Matthew Brost <[email protected]>
+Cc: Piotr Piórkowski <[email protected]>
+Reviewed-by: Matthew Brost <[email protected]>
+Signed-off-by: Matt Roper <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit bfde26df7af4e8ea894008dfda1d7d54a834dcd4)
 ---
  Documentation/gpu/i915.rst | 8 ++++++++
  1 file changed, 8 insertions(+)
@@ -17,7 +22,7 @@ Acked-by: Piotr Piórkowski <[email protected]>
 diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
 --- a/Documentation/gpu/i915.rst
 +++ b/Documentation/gpu/i915.rst
-@@ -515,6 +515,14 @@ GuC-based command submission
+@@ -518,6 +518,14 @@ GuC-based command submission
  .. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
     :doc: GuC-based command submission
  
0001-drm-i915-guc-Improve-error-message-for-unsolicited-C.patch renamed from 0001-INTEL_DII-drm-i915-guc-Improve-error-message-for-uns.patch +8 -4
similarity index 72%
rename from 0001-INTEL_DII-drm-i915-guc-Improve-error-message-for-uns.patch
rename to 0001-drm-i915-guc-Improve-error-message-for-unsolicited-C.patch
index e1377f5d49ed..a64e751d3f03 100644
@@ -1,14 +1,18 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matthew Brost <[email protected]>
-Date: Thu, 18 Feb 2021 12:17:01 -0800
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Improve error message for
- unsolicited CT response
+Date: Thu, 8 Jul 2021 09:20:50 -0700
+Subject: [PATCH] drm/i915/guc: Improve error message for unsolicited CT
+ response
 
 Improve the error message when a unsolicited CT response is received by
 printing fence that couldn't be found, the last fence, and all requests
 with a response outstanding.
 
 Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Michal Wajdeczko <[email protected]>
+Signed-off-by: John Harrison <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit dd9c0f3cbbe6fdfe7402b9c6ea35f04b260901bf)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
@@ -16,7 +20,7 @@ Signed-off-by: Matthew Brost <[email protected]>
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -711,12 +711,16 @@ static int ct_handle_response(struct intel_guc_ct *ct, struct ct_incoming_msg *r
+@@ -733,12 +733,16 @@ static int ct_handle_response(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  		found = true;
  		break;
  	}
0001-drm-i915-guc-Increase-size-of-CTB-buffers.patch renamed from 0001-INTEL_DII-drm-i915-guc-Increase-size-of-CTB-buffers.patch +11 -13
similarity index 74%
rename from 0001-INTEL_DII-drm-i915-guc-Increase-size-of-CTB-buffers.patch
rename to 0001-drm-i915-guc-Increase-size-of-CTB-buffers.patch
index ff5b38d8da27..dacd1a360a47 100644
@@ -1,21 +1,19 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Matthew Brost <[email protected]>
-Date: Wed, 1 May 2019 09:12:00 -0700
-Subject: [PATCH] INTEL_DII: drm/i915/guc: Increase size of CTB buffers
+Date: Thu, 8 Jul 2021 09:20:51 -0700
+Subject: [PATCH] drm/i915/guc: Increase size of CTB buffers
 
 With the introduction of non-blocking CTBs more than one CTB can be in
 flight at a time. Increasing the size of the CTBs should reduce how
 often software hits the case where no space is available in the CTB
 buffer.
 
-v3: Fixed comment about layout of CTB memory, increased size of G2H
-memory.
-v4: Rebased after porting CTB updates from upstream (JohnH).
-v5: rebased on ctbs improvements (Michal)
-v6: rebased on 4k ctbs (Michal)
-
 Cc: John Harrison <[email protected]>
 Signed-off-by: Matthew Brost <[email protected]>
+Reviewed-by: Michal Wajdeczko <[email protected]>
+Signed-off-by: John Harrison <[email protected]>
+Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
+(cherry picked from commit c26e289f1d8d5b8716f825ac5d798897aca5a124)
 ---
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 11 ++++++++---
  1 file changed, 8 insertions(+), 3 deletions(-)
@@ -23,14 +21,14 @@ Signed-off-by: Matthew Brost <[email protected]>
 diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
 +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c
-@@ -63,11 +63,16 @@ static inline struct drm_device *ct_to_drm(struct intel_guc_ct *ct)
+@@ -59,11 +59,16 @@ static inline struct drm_device *ct_to_drm(struct intel_guc_ct *ct)
   *      +--------+-----------------------------------------------+------+
   *
   * Size of each `CT Buffer`_ must be multiple of 4K.
 - * As we don't expect too many messages, for now use minimum sizes.
 + * We don't expect too many messages in flight at any time, unless we are
 + * using the GuC submission. In that case each request requires a minimum
-+ * 16 bytes which gives us a maximum 256 queue'd requests. Hopefully this
++ * 2 dwords which gives us a maximum 256 queue'd requests. Hopefully this
 + * enough space to avoid backpressure on the driver. We increase the size
 + * of the receive buffer (relative to the send) to ensure a G2H response
 + * CTB has a landing spot.
@@ -40,9 +38,9 @@ diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c b/drivers/gpu/drm/i915/gt
 -#define CTB_G2H_BUFFER_SIZE	(SZ_4K)
 +#define CTB_G2H_BUFFER_SIZE	(4 * CTB_H2G_BUFFER_SIZE)
  
- #define MAX_US_STALL_CTB	1000000
- 
-@@ -761,7 +766,7 @@ static int ct_read(struct intel_guc_ct *ct, struct ct_incoming_msg **msg)
+ struct ct_request {
+ 	struct list_head link;
+@@ -644,7 +649,7 @@ static int ct_read(struct intel_guc_ct *ct, struct ct_incoming_msg **msg)
  	/* beware of buffer wrap case */
  	if (unlikely(available < 0))
  		available += size;
0001-drm-i915-guc-Add-non-blocking-CTB-send-function.patch renamed from 0001-INTEL_DII-drm-i915-guc-Add-non-blocking-CTB-send-fun.patch +106 -115

115 lines not on this page · raw message

0001-drm-i915-guc-Optimize-CTB-writes-and-reads.patch renamed from 0001-INTEL_DII-drm-i915-guc-Optimize-CTB-writes-and-reads.patch +91 -84

175 lines not on this page · raw message

0001-drm-i915-guc-Module-load-failure-test-for-CT-buffer-.patch renamed from 0001-INTEL_DII-drm-i915-guc-Module-load-failure-test-for-.patch +13 -5
similarity index 55%
rename from 0001-INTEL_DII-drm-i915-guc-Module-load-failure-test-for-.patch
rename to 0001-drm-i915-guc-Module-load-failure-test-for-CT-buffer-.patch
index 80f918632cb7..cb7f341e0cbc 100644

Lines of this file are not shown. View the raw message.

0001-drm-i915-guc-Drop-guc-interrupts.enabled.patch new file +96 -0

96 lines not on this page · raw message

0001-drm-i915-guc-Ensure-H2G-buffer-updates-visible-befor.patch new file +79 -0

79 lines not on this page · raw message

0001-drm-i915-guc-Update-firmware-to-v62.0.0.patch new file +1510 -0

1,510 lines not on this page · raw message

0001-drm-i915-guc-Relax-CTB-response-timeout.patch new file +54 -0

54 lines not on this page · raw message

0001-drm-i915-guc-Add-stall-timer-to-non-blocking-CTB-sen.patch new file +184 -0

184 lines not on this page · raw message

0001-INTEL_DII-NOT_UPSTREAM-Fixup-GuC-submission-to-under.patch new file +55 -0

55 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Relax-CTB-response-timeout.patch deleted +0 -45

45 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Update-MMIO-based-communicati.patch deleted +0 -239

239 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Update-CTB-response-status-de.patch deleted +0 -108

108 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Support-per-context-schedulin.patch deleted +0 -104

104 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Add-flag-for-mark-broken-CTB.patch deleted +0 -94

94 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-New-definition-of-the-CTB-des.patch deleted +0 -271

271 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-New-definition-of-the-CTB-reg.patch deleted +0 -305

305 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-New-CTB-based-communication.patch deleted +0 -395

395 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Kill-guc_clients.ct_pool.patch deleted +0 -90

90 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Kill-ads.client_info.patch deleted +0 -76

76 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Unified-GuC-log.patch deleted +0 -167

167 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Update-firmware-to-v61.1.1.patch deleted +0 -62

62 lines not on this page · raw message

0001-INTEL_DII-drm-i915-guc-Add-stall-timer-to-non-blocki.patch deleted +0 -142

142 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

--
git-pile 0.98-dev

Part of the diff is not shown here. View the raw message.