drm/i915/guc: Refactor ADS access to use dma_buf_map
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest19 patches 34 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/19 | dma-buf-map: Add read/write helpersinclude/ | +81 | 7 replies | |
| 2/19 | dma-buf-map: Add helper to initialize second mapinclude/ | +29 | 21 replies | |
| 3/19 | drm/i915/gt: Add helper for shmem copy to dma_buf_mapdrivers/ drivers/ | +35 | 0 replies | |
| 4/19 | drm/i915/guc: Keep dma_buf_map of ads_blob arounddrivers/ drivers/ | +9 | 0 replies | |
| 5/19 | drm/i915/guc: Add read/write helpers for ADS blobdrivers/ | +8 | 0 replies | |
| 6/19 | drm/i915/guc: Convert golden context init to dma_buf_mapdrivers/ | +13 | 0 replies | |
| 7/19 | drm/i915/guc: Convert policies update to dma_buf_mapdrivers/ | +23 | 0 replies | |
| 8/19 | drm/i915/guc: Convert engine record to dma_buf_mapdrivers/ drivers/ drivers/ | +15 | 0 replies | |
| 9/19 | dma-buf-map: Add wrapper over memsetinclude/ | +17 | 4 replies | |
| 10/19 | drm/i915/guc: Convert guc_ads_private_data_reset to dma_buf_mapdrivers/ | +3 | 0 replies | |
| 11/19 | drm/i915/guc: Convert golden context prep to dma_buf_mapdrivers/ | +32 | 0 replies | |
| 12/19 | drm/i915/guc: Replace check for golden context sizedrivers/ | +3 | 0 replies | |
| 13/19 | drm/i915/guc: Convert mapping table to dma_buf_mapdrivers/ | +6 | 0 replies | |
| 14/19 | drm/i915/guc: Convert capture list to dma_buf_mapdrivers/ | +5 | 0 replies | |
| 15/19 | drm/i915/guc: Prepare for error propagationdrivers/ | +18 | 0 replies | |
| 16/19 | drm/i915/guc: Use a single pass to calculate regsetdrivers/ drivers/ | +79 | 2 replies | |
| 17/19 | drm/i915/guc: Convert guc_mmio_reg_state_init to dma_buf_mapdrivers/ | +18 | 0 replies | |
| 18/19 | drm/i915/guc: Convert __guc_ads_init to dma_buf_mapdrivers/ | +14 | 0 replies | |
| 19/19 | drm/i915/guc: Remove plain ads_blob pointerdrivers/ drivers/ | +5 | 0 replies |
Reviews trailers per patch
1 of 19 patches has a Reviewed-by or Acked-by.
| Patch | Daniel Vetter |
|---|---|
| 1/19 | |
| 2/19 | A-b |
| 3/19 | |
| 4/19 | |
| 5/19 | |
| 6/19 | |
| 7/19 | |
| 8/19 | |
| 9/19 | |
| 10/19 | |
| 11/19 | |
| 12/19 | |
| 13/19 | |
| 14/19 | |
| 15/19 | |
| 16/19 | |
| 17/19 | |
| 18/19 | |
| 19/19 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH 00/19] drm/i915/guc: Refactor ADS access to use dma_buf_map
While porting i915 to arm64 we noticed some issues accessing lmem. Some writes were getting corrupted and the final state of the buffer didn't have exactly what we wrote. This became evident when enabling GuC submission: depending on the number of engines the ADS struct was being corrupted and GuC would reject it, refusin to initialize.
From Documentation/core-api/bus-virt-phys-mapping.rst:
This memory is called "PCI memory" or "shared memory" or "IO memory" or whatever, and there is only one way to access it: the readb/writeb and related functions. You should never take the address of such memory, because there is really nothing you can do with such an address: it's not conceptually in the same memory space as "real memory" at all, so you cannot just dereference a pointer. (Sadly, on x86 it **is** in the same memory space, so on x86 it actually works to just deference a pointer, but it's not portable).
When reading or writing words directly to IO memory, in order to be portable the Linux kernel provides the abstraction detailed in section "Differences between I/O access functions" of Documentation/driver-api/device-io.rst.
This limits our ability to simply overlay our structs on top a buffer and directly access it since that buffer may come from IO memory rather than system memory. Hence the approach taken in intel_guc_ads.c needs to be refactored. This is not the only place in i915 that neeed to be changed, but the one causing the most problems, with a real reproducer. This first set of patch focuses on fixing the gem object to pass the ADS
After the addition of a few helpers in the dma_buf_map API, most of intel_guc_ads.c can be converted to use it. The exception is the regset
initialization: we'd incur into a lot of extra indirection when reading/writting each register. So the regset is converted to use a temporary buffer allocated on probe, which is then copied to its final location when finishing the initialization or on gt reset.
Testing on some discrete cards, after this change we can correctly pass the ADS struct to GuC and have it initialized correctly.
thanks
Lucas De Marchi
Lucas De Marchi (19):
dma-buf-map: Add read/write helpers
dma-buf-map: Add helper to initialize second map drm/i915/gt: Add helper for shmem copy to dma_buf_map drm/i915/guc: Keep dma_buf_map of ads_blob around drm/i915/guc: Add read/write helpers for ADS blob drm/i915/guc: Convert golden context init to dma_buf_map drm/i915/guc: Convert policies update to dma_buf_map drm/i915/guc: Convert engine record to dma_buf_map
dma-buf-map: Add wrapper over memset
drm/i915/guc: Convert guc_ads_private_data_reset to dma_buf_map drm/i915/guc: Convert golden context prep to dma_buf_map drm/i915/guc: Replace check for golden context size drm/i915/guc: Convert mapping table to dma_buf_map drm/i915/guc: Convert capture list to dma_buf_map drm/i915/guc: Prepare for error propagation drm/i915/guc: Use a single pass to calculate regset drm/i915/guc: Convert guc_mmio_reg_state_init to dma_buf_map drm/i915/guc: Convert __guc_ads_init to dma_buf_map drm/i915/guc: Remove plain ads_blob pointer
drivers/gpu/drm/i915/gt/shmem_utils.c | 32 ++ drivers/gpu/drm/i915/gt/shmem_utils.h | 3 + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 14 +- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 374 +++++++++++------- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 3 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 11 +- include/linux/dma-buf-map.h | 127 ++++++ 7 files changed, 405 insertions(+), 159 deletions(-)
Signature · 1 line
2.35.0