drm/msm: sparse / "VM_BIND" support
Subsystems (7)
Rob Clark
maintainerv9 cover drm/msm: sparse / "VM_BIND" support
Conversion to DRM GPU VA Manager[1], and adding support for Vulkan Sparse
Memory[2] in the form of:
1. A new VM_BIND submitqueue type for executing VM MSM_SUBMIT_BO_OP_MAP/ MAP_NULL/UNMAP commands
2. A new VM_BIND ioctl to allow submitting batches of one or more MAP/MAP_NULL/UNMAP commands to a VM_BIND submitqueue
I did not implement support for synchronous VM_BIND commands. Since userspace could just immediately wait for the SUBMIT to complete, I don't think we need this extra complexity in the kernel. Synchronous/immediate VM_BIND operations could be implemented with a 2nd VM_BIND submitqueue.
The corresponding mesa MR: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32533
Changes in v9:
- Rework VM_BIND throttling to not use gpu-sched's waitqueue
- Link to v8: https://lore.kernel.org/all/[email protected]/
Changes in v8:
- Just a rebase and collecting tags
- Link to v7: https://lore.kernel.org/all/[email protected]/
Changes in v7:
- Rebase on, and use, gpuvm locking helpers[4], included in this
series.
- Various small fixes
- Link to v6: https://lore.kernel.org/all/[email protected]/
Changes in v6:
- Drop io-pgtable-arm patch as it has already been picked up in the iommu tree.
- Rework to drop gpuvm changes. To mitigate the limitation of gpuvm when it comes to lazy unmap (and to avoid ~5ms of unmap per pageflip!) a vma_ref refcount is added. This refcount is incremented when a BO is pinned for scanout, and for userspace handles and dma-bufs. The VMA is torn down when this count drops to zero, breaking the reference loop between the VM_BO and BO. But as long as a pin or userspace handle is keeping a reference to the BO live, we allow the harmless reference loop to live. (This is only for kernel managed VMs, which includes the kms VM.) If no userspace process has some sort of handle to the BO, it is unlikely to be reused again. (The exception is GET_FB, but in that case the vma_ref >= 1 due to pin for scan- out.)
- Drop gpu sched changes for throttling and move this into the driver. We can re-visit a more generic solution when some other driver realizes they need the same thing.
- Link to v5: https://lore.kernel.org/all/[email protected]/
Changes in v5:
- Improved drm/sched enqueue_credit comments, and better define the return from drm_sched_entity_push_job()
- Improve DRM_GPUVM_VA_WEAK_REF comments, and additional WARN_ON()s to make it clear that some of the gpuvm functionality is not available in this mode.
- Link to v4: https://lore.kernel.org/all/[email protected]/
Changes in v4:
- Various locking/etc fixes
- Optimize the pgtable preallocation. If userspace sorts the VM_BIND ops then the kernel detects ops that fall into the same 2MB last level PTD to avoid duplicate page preallocation.
- Add way to throttle pushing jobs to the scheduler, to cap the amount of potentially temporary prealloc'd pgtable pages.
- Add vm_log to devcoredump for debugging. If the vm_log_shift module param is set, keep a log of the last 1<<vm_log_shift VM updates for easier debugging of faults/crashes.
- Link to v3: https://lore.kernel.org/all/[email protected]/
Changes in v3:
- Switched to seperate VM_BIND ioctl. This makes the UABI a bit cleaner, but OTOH the userspace code was cleaner when the end result of either type of VkQueue lead to the same ioctl. So I'm a bit on the fence.
- Switched to doing the gpuvm bookkeeping synchronously, and only deferring the pgtable updates. This avoids needing to hold any resv locks in the fence signaling path, resolving the last shrinker related lockdep complaints. OTOH it means userspace can trigger invalid pgtable updates with multiple VM_BIND queues. In this case, we ensure that unmaps happen completely (to prevent userspace from using this to access free'd pages), mark the context as unusable, and move on with life.
- Link to v2: https://lore.kernel.org/all/[email protected]/
Changes in v2:
- Dropped Bibek Kumar Patro's arm-smmu patches[3], which have since been
merged.
- Pre-allocate all the things, and drop HACK patch which disabled shrinker.
This includes ensuring that vm_bo objects are allocated up front, pre-
allocating VMA objects, and pre-allocating pages used for pgtable updates.
The latter utilizes io_pgtable_cfg callbacks for pgtable alloc/free, that
were initially added for panthor.
- Add back support for BO dumping for devcoredump.
- Link to v1 (RFC): https://lore.kernel.org/dri-devel/[email protected]/T/#t
[1] https://www.kernel.org/doc/html/next/gpu/drm-mm.html#drm-gpuvm
[2] https://docs.vulkan.org/spec/latest/chapters/sparsemem.html
[3] https://patchwork.kernel.org/project/linux-arm-kernel/list/?series=909700
[4] https://lore.kernel.org/all/[email protected]/
Rob Clark (42):
drm/gpuvm: Fix doc comments
drm/gpuvm: Add locking helpers
drm/gem: Add ww_acquire_ctx support to drm_gem_lru_scan() drm/msm: Rename msm_file_private -> msm_context drm/msm: Improve msm_context comments
drm/msm: Rename msm_gem_address_space -> msm_gem_vm drm/msm: Remove vram carveout support
drm/msm: Collapse vma allocation and initialization drm/msm: Collapse vma close and delete
drm/msm: Don't close VMAs on purge
drm/msm: Stop passing vm to msm_framebuffer drm/msm: Refcount framebuffer pins
drm/msm: drm_gpuvm conversion
drm/msm: Convert vm locking
drm/msm: Use drm_gpuvm types more
drm/msm: Split out helper to get iommu prot flags drm/msm: Add mmu support for non-zero offset drm/msm: Add PRR support
drm/msm: Rename msm_gem_vma_purge() -> _unmap() drm/msm: Drop queued submits on lastclose() drm/msm: Lazily create context VM
drm/msm: Add opt-in for VM_BIND
drm/msm: Mark VM as unusable on GPU hangs drm/msm: Add _NO_SHARE flag
drm/msm: Crashdump prep for sparse mappings drm/msm: rd dumping prep for sparse mappings drm/msm: Crashdump support for sparse
drm/msm: rd dumping support for sparse
drm/msm: Extract out syncobj helpers
drm/msm: Use DMA_RESV_USAGE_BOOKKEEP/KERNEL drm/msm: Add VM_BIND submitqueue
drm/msm: Support IO_PGTABLE_QUIRK_NO_WARN_ON drm/msm: Support pgtable preallocation
drm/msm: Split out map/unmap ops
drm/msm: Add VM_BIND ioctl
drm/msm: Add VM logging for VM_BIND updates drm/msm: Add VMA unmap reason
drm/msm: Add mmu prealloc tracepoint
drm/msm: use trylock for debugfs
drm/msm: Bump UAPI version
drm/msm: Defer VMA unmap for fb unpins
drm/msm: Add VM_BIND throttling
drivers/gpu/drm/drm_gem.c | 14 +- drivers/gpu/drm/drm_gpuvm.c | 132 +- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 25 +- drivers/gpu/drm/msm/adreno/a2xx_gpummu.c | 5 +- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 17 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 17 +- drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 22 +- drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 10 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 32 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 49 +- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 6 +- drivers/gpu/drm/msm/adreno/a6xx_preempt.c | 10 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 4 - drivers/gpu/drm/msm/adreno/adreno_gpu.c | 98 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 23 +- .../drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 11 +- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 20 +- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 18 +- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 22 +- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 2 - drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 6 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 28 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 18 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 19 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 18 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 14 +- drivers/gpu/drm/msm/msm_drv.c | 185 +- drivers/gpu/drm/msm/msm_drv.h | 30 +- drivers/gpu/drm/msm/msm_fb.c | 33 +- drivers/gpu/drm/msm/msm_fbdev.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 536 +++--- drivers/gpu/drm/msm/msm_gem.h | 296 +++- drivers/gpu/drm/msm/msm_gem_prime.c | 65 + drivers/gpu/drm/msm/msm_gem_shrinker.c | 104 +- drivers/gpu/drm/msm/msm_gem_submit.c | 300 ++-- drivers/gpu/drm/msm/msm_gem_vma.c | 1513 ++++++++++++++++- drivers/gpu/drm/msm/msm_gpu.c | 208 ++- drivers/gpu/drm/msm/msm_gpu.h | 144 +- drivers/gpu/drm/msm/msm_gpu_trace.h | 14 + drivers/gpu/drm/msm/msm_iommu.c | 302 +++- drivers/gpu/drm/msm/msm_kms.c | 18 +- drivers/gpu/drm/msm/msm_kms.h | 2 +- drivers/gpu/drm/msm/msm_mmu.h | 38 +- drivers/gpu/drm/msm/msm_rd.c | 62 +- drivers/gpu/drm/msm/msm_ringbuffer.c | 10 +- drivers/gpu/drm/msm/msm_submitqueue.c | 96 +- drivers/gpu/drm/msm/msm_syncobj.c | 172 ++ drivers/gpu/drm/msm/msm_syncobj.h | 37 + include/drm/drm_gem.h | 10 +- include/drm/drm_gpuvm.h | 8 + include/uapi/drm/msm_drm.h | 149 +- 58 files changed, 3731 insertions(+), 1260 deletions(-) create mode 100644 drivers/gpu/drm/msm/msm_syncobj.c create mode 100644 drivers/gpu/drm/msm/msm_syncobj.h
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 1/42 drm/gpuvm: Fix doc comments
Correctly summerize drm_gpuvm_sm_map/unmap, and fix the parameter order and names. Just something I noticed in passing.
v2: Don't rename the arg names in prototypes to match function
declarations [Danilo]
--- drivers/gpu/drm/drm_gpuvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gpuvm.c +3 -3
@@ -2299,13 +2299,13 @@ __drm_gpuvm_sm_unmap(struct drm_gpuvm *gpuvm, }/** -* drm_gpuvm_sm_map() - creates the &drm_gpuva_op split/merge steps +* drm_gpuvm_sm_map() - calls the &drm_gpuva_op split/merge steps * @gpuvm: the &drm_gpuvm representing the GPU VA space +* @priv: pointer to a driver private data structure * @req_addr: the start address of the new mapping * @req_range: the range of the new mapping * @req_obj: the &drm_gem_object to map * @req_offset: the offset within the &drm_gem_object -* @priv: pointer to a driver private data structure * * This function iterates the given range of the GPU VA space. It utilizes the * &drm_gpuvm_ops to call back into the driver providing the split and merge
@@ -2349,7 +2349,7 @@ drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, void *priv,EXPORT_SYMBOL_GPL (drm_gpuvm_sm_map);/** -* drm_gpuvm_sm_unmap() - creates the &drm_gpuva_ops to split on unmap +* drm_gpuvm_sm_unmap() - calls the &drm_gpuva_ops to split on unmap * @gpuvm: the &drm_gpuvm representing the GPU VA space * @priv: pointer to a driver private data structure * @req_addr: the start address of the range to unmap
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 2/42 drm/gpuvm: Add locking helpers
In reply to Rob ClarkFor UNMAP/REMAP steps we could be needing to lock objects that are not explicitly listed in the VM_BIND ioctl in order to tear-down unmapped VAs. These helpers handle locking/preparing the needed objects.
Note that these functions do not strictly require the VM changes to be applied before the next drm_gpuvm_sm_map_lock()/_unmap_lock() call. In the case that VM changes from an earlier drm_gpuvm_sm_map()/_unmap() call result in a differing sequence of steps when the VM changes are actually applied, it will be the same set of GEM objects involved, so the locking is still correct.
v2: Rename to drm_gpuvm_sm_*_exec_locked() [Danilo]
v3: Expand comments to show expected usage, and explain how the usage
is safe in the case of overlapping driver VM_BIND ops.
--- drivers/gpu/drm/drm_gpuvm.c | 126 ++++++++++++++++++++++++++++++++++++ include/drm/drm_gpuvm.h | 8 +++ 2 files changed, 134 insertions(+)
drivers/gpu/drm/drm_gpuvm.c +126 -0
@@ -2390,6 +2390,132 @@ drm_gpuvm_sm_unmap(struct drm_gpuvm *gpuvm, void *priv, }EXPORT_SYMBOL_GPL (drm_gpuvm_sm_unmap); +static int +drm_gpuva_sm_step_lock (struct drm_gpuva_op *op,void *priv) +{ +struct drm_exec *exec = priv; + +switch (op->op) { +case DRM_GPUVA_OP_REMAP : +if (op->remap.unmap->va->gem.obj) +return drm_exec_lock_obj (exec, op->remap.unmap->va->gem.obj); +return 0 ; +case DRM_GPUVA_OP_UNMAP : +if (op->unmap.va->gem.obj) +return drm_exec_lock_obj (exec, op->unmap.va->gem.obj); +return 0 ; +default : +return 0 ; + } +} + +static const struct drm_gpuvm_ops lock_ops = { + .sm_step_map = drm_gpuva_sm_step_lock, + .sm_step_remap = drm_gpuva_sm_step_lock, + .sm_step_unmap = drm_gpuva_sm_step_lock, +}; + +/** +* drm_gpuvm_sm_map_exec_lock() - locks the objects touched by a drm_gpuvm_sm_map() +* @gpuvm: the &drm_gpuvm representing the GPU VA space +* @exec: the &drm_exec locking context +* @num_fences: for newly mapped objects, the # of fences to reserve +* @req_addr: the start address of the range to unmap +* @req_range: the range of the mappings to unmap +* @req_obj: the &drm_gem_object to map +* @req_offset: the offset within the &drm_gem_object +* +* This function locks (drm_exec_lock_obj()) objects that will be unmapped/ +* remapped, and locks+prepares (drm_exec_prepare_object()) objects that +* will be newly mapped. +* +* The expected usage is: +* +* vm_bind { +* struct drm_exec exec; +* +* // IGNORE_DUPLICATES is required, INTERRUPTIBLE_WAIT is recommended: +* drm_exec_init(&exec, IGNORE_DUPLICATES | INTERRUPTIBLE_WAIT, 0); +* +* drm_exec_until_all_locked (&exec) { +* for_each_vm_bind_operation { +* switch (op->op) { +* case DRIVER_OP_UNMAP: +* ret = drm_gpuvm_sm_unmap_exec_lock(gpuvm, &exec, op->addr, op->range); +* break; +* case DRIVER_OP_MAP: +* ret = drm_gpuvm_sm_map_exec_lock(gpuvm, &exec, num_fences, +* op->addr, op->range, +* obj, op->obj_offset); +* break; +* } +* +* drm_exec_retry_on_contention(&exec); +* if (ret) +* return ret; +* } +* } +* } +* +* This enables all locking to be performed before the driver begins modifying +* the VM. This is safe to do in the case of overlapping DRIVER_VM_BIND_OPs, +* where an earlier op can alter the sequence of steps generated for a later +* op, because the later altered step will involve the same GEM object(s) +* already seen in the earlier locking step. For example: +* +* 1) An earlier driver DRIVER_OP_UNMAP op removes the need for a +* DRM_GPUVA_OP_REMAP/UNMAP step. This is safe because we've already +* locked the GEM object in the earlier DRIVER_OP_UNMAP op. +* +* 2) An earlier DRIVER_OP_MAP op overlaps with a later DRIVER_OP_MAP/UNMAP +* op, introducing a DRM_GPUVA_OP_REMAP/UNMAP that wouldn't have been +* required without the earlier DRIVER_OP_MAP. This is safe because we've +* already locked the GEM object in the earlier DRIVER_OP_MAP step. +* +* Returns: 0 on success or a negative error codec +*/ +int +drm_gpuvm_sm_map_exec_lock (struct drm_gpuvm *gpuvm, +struct drm_exec *exec,unsigned int num_fences, +u64 req_addr,u64 req_range, +struct drm_gem_object *req_obj,u64 req_offset) +{ +if (req_obj) { +int ret =drm_exec_prepare_obj (exec, req_obj, num_fences); +if (ret) +return ret; + } + +return __drm_gpuvm_sm_map (gpuvm, &lock_ops, exec, + req_addr, req_range, + req_obj, req_offset); + +} +EXPORT_SYMBOL_GPL (drm_gpuvm_sm_map_exec_lock); + +/** +* drm_gpuvm_sm_unmap_exec_lock() - locks the objects touched by drm_gpuvm_sm_unmap() +* @gpuvm: the &drm_gpuvm representing the GPU VA space +* @exec: the &drm_exec locking context +* @req_addr: the start address of the range to unmap +* @req_range: the range of the mappings to unmap +* +* This function locks (drm_exec_lock_obj()) objects that will be unmapped/ +* remapped by drm_gpuvm_sm_unmap(). +* +* See drm_gpuvm_sm_map_exec_lock() for expected usage. +* +* Returns: 0 on success or a negative error code +*/ +int +drm_gpuvm_sm_unmap_exec_lock (struct drm_gpuvm *gpuvm,struct drm_exec *exec, +u64 req_addr,u64 req_range) +{ +return __drm_gpuvm_sm_unmap (gpuvm, &lock_ops, exec, + req_addr, req_range); +} +EXPORT_SYMBOL_GPL (drm_gpuvm_sm_unmap_exec_lock); +static struct drm_gpuva_op *gpuva_op_alloc (struct drm_gpuvm *gpuvm) {
include/drm/drm_gpuvm.h +8 -0
@@ -1211,6 +1211,14 @@ int drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, void *priv,int drm_gpuvm_sm_unmap (struct drm_gpuvm *gpuvm,void *priv,u64 addr,u64 range); +int drm_gpuvm_sm_map_exec_lock (struct drm_gpuvm *gpuvm, +struct drm_exec *exec,unsigned int num_fences, +u64 req_addr,u64 req_range, +struct drm_gem_object *obj,u64 offset); + +int drm_gpuvm_sm_unmap_exec_lock (struct drm_gpuvm *gpuvm,struct drm_exec *exec, +u64 req_addr,u64 req_range); +void drm_gpuva_map (struct drm_gpuvm *gpuvm,struct drm_gpuva *va,struct drm_gpuva_op_map *op);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 3/42 drm/gem: Add ww_acquire_ctx support to drm_gem_lru_scan()
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
If the callback is going to have to attempt to grab more locks, it is useful to have an ww_acquire_ctx to avoid locking order problems.
Why not use the drm_exec helper instead? Mainly because (a) where ww_acquire_init() is called is awkward, and (b) we don't really need to retry after backoff, we can just move on to the next object.
--- drivers/gpu/drm/drm_gem.c | 14 +++++++++++--- drivers/gpu/drm/msm/msm_gem_shrinker.c | 24 +++++++++++++----------- include/drm/drm_gem.h | 10 ++++++---- 3 files changed, 30 insertions(+), 18 deletions(-)
drivers/gpu/drm/drm_gem.c +11 -3
@@ -1460,12 +1460,14 @@ EXPORT_SYMBOL(drm_gem_lru_move_tail);* @nr_to_scan: The number of pages to try to reclaim * @remaining: The number of pages left to reclaim, should be initialized by caller * @shrink: Callback to try to shrink/reclaim the object. +* @ticket: Optional ww_acquire_ctx context to use for locking */ unsigned long drm_gem_lru_scan (struct drm_gem_lru *lru,unsigned int nr_to_scan,unsigned long *remaining, -bool (*shrink)(struct drm_gem_object *obj)) +bool (*shrink)(struct drm_gem_object *obj,struct ww_acquire_ctx *ticket), +struct ww_acquire_ctx *ticket) {struct drm_gem_lru still_in_lru;struct drm_gem_object *obj;
@@ -1498,17 +1500,20 @@ drm_gem_lru_scan(struct drm_gem_lru *lru,*/ mutex_unlock (lru->lock); +if (ticket) +ww_acquire_init (ticket, &reservation_ww_class); +/* * Note that this still needs to be trylock, since we can * hit shrinker in response to trying to get backing pages * for this obj (ie. while it's lock is already held) */ -if (!dma_resv_trylock (obj->resv)) { +if (!ww_mutex_trylock (&obj->resv->lock, ticket)) { *remaining += obj->size >>PAGE_SHIFT ; goto tail; } -if (shrink (obj)) { +if (shrink (obj, ticket)) { freed += obj->size >>PAGE_SHIFT ;/*
@@ -1522,6 +1527,9 @@ drm_gem_lru_scan(struct drm_gem_lru *lru,dma_resv_unlock (obj->resv); +if (ticket) +ww_acquire_fini (ticket); + tail:drm_gem_object_put (obj);mutex_lock (lru->lock);
drivers/gpu/drm/msm/msm_gem_shrinker.c +13 -11
@@ -44,7 +44,7 @@ msm_gem_shrinker_count(struct shrinker *shrinker, struct shrink_control *sc) }static bool -purge (struct drm_gem_object *obj) +purge (struct drm_gem_object *obj,struct ww_acquire_ctx *ticket) {if (!is_purgeable (to_msm_bo (obj)))return false;
@@ -58,7 +58,7 @@ purge(struct drm_gem_object *obj) }static bool -evict (struct drm_gem_object *obj) +evict (struct drm_gem_object *obj,struct ww_acquire_ctx *ticket) {if (is_unevictable (to_msm_bo (obj)))return false;
@@ -79,21 +79,21 @@ wait_for_idle(struct drm_gem_object *obj) }static bool -active_purge (struct drm_gem_object *obj) +active_purge (struct drm_gem_object *obj,struct ww_acquire_ctx *ticket) {if (!wait_for_idle (obj))return false; -return purge (obj); +return purge (obj, ticket); }static bool -active_evict (struct drm_gem_object *obj) +active_evict (struct drm_gem_object *obj,struct ww_acquire_ctx *ticket) {if (!wait_for_idle (obj))return false; -return evict (obj); +return evict (obj, ticket); } static unsigned long
@@ -102,7 +102,7 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc)struct msm_drm_private *priv = shrinker->private_data;struct {struct drm_gem_lru *lru; -bool (*shrink)(struct drm_gem_object *obj); +bool (*shrink)(struct drm_gem_object *obj,struct ww_acquire_ctx *ticket);bool cond;unsigned long freed;unsigned long remaining;
@@ -122,8 +122,9 @@ msm_gem_shrinker_scan(struct shrinker *shrinker, struct shrink_control *sc)continue ; stages[i].freed =drm_gem_lru_scan (stages[i].lru, nr, - &stages[i].remaining, - stages[i].shrink); + &stages[i].remaining, + stages[i].shrink, +NULL ); nr -= stages[i].freed; freed += stages[i].freed; remaining += stages[i].remaining;
@@ -164,7 +165,7 @@ msm_gem_shrinker_shrink(struct drm_device *dev, unsigned long nr_to_scan)static const int vmap_shrink_limit =15 ;static bool -vmap_shrink (struct drm_gem_object *obj) +vmap_shrink (struct drm_gem_object *obj,struct ww_acquire_ctx *ticket) {if (!is_vunmapable (to_msm_bo (obj)))return false;
@@ -192,7 +193,8 @@ msm_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr) unmapped +=drm_gem_lru_scan (lrus[idx], vmap_shrink_limit - unmapped, &remaining, - vmap_shrink); + vmap_shrink, +NULL ); } *(unsigned long *)ptr += unmapped;
include/drm/drm_gem.h +6 -4
@@ -559,10 +559,12 @@ void drm_gem_lru_init(struct drm_gem_lru *lru, struct mutex *lock);void drm_gem_lru_remove (struct drm_gem_object *obj);void drm_gem_lru_move_tail_locked (struct drm_gem_lru *lru,struct drm_gem_object *obj);void drm_gem_lru_move_tail (struct drm_gem_lru *lru,struct drm_gem_object *obj); -unsigned long drm_gem_lru_scan (struct drm_gem_lru *lru, -unsigned int nr_to_scan, -unsigned long *remaining, -bool (*shrink)(struct drm_gem_object *obj)); +unsigned long +drm_gem_lru_scan (struct drm_gem_lru *lru, +unsigned int nr_to_scan, +unsigned long *remaining, +bool (*shrink)(struct drm_gem_object *obj,struct ww_acquire_ctx *ticket), +struct ww_acquire_ctx *ticket);int drm_gem_evict_locked (struct drm_gem_object *obj);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 4/42 drm/msm: Rename msm_file_private -> msm_context
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
This is a more descriptive name.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 6 ++-- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 4 +-- drivers/gpu/drm/msm/msm_drv.c | 14 ++++----- drivers/gpu/drm/msm/msm_gem.c | 2 +- drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- drivers/gpu/drm/msm/msm_gpu.c | 4 +-- drivers/gpu/drm/msm/msm_gpu.h | 39 ++++++++++++------------- drivers/gpu/drm/msm/msm_submitqueue.c | 27 +++++++++-------- 9 files changed, 49 insertions(+), 51 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -1
@@ -111,7 +111,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gpu, struct msm_ringbuffer *ring, struct msm_gem_submit *submit) { bool sysprof = refcount_read(&a6xx_gpu->base.base.sysprof_active) > 1; -struct msm_file_private *ctx = submit->queue->ctx; +struct msm_context *ctx = submit->queue->ctx;struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;phys_addr_t ttbr;u32 asid;
drivers/gpu/drm/msm/adreno/adreno_gpu.c +3 -3
@@ -351,7 +351,7 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags,return 0 ; } -int adreno_get_param (struct msm_gpu *gpu,struct msm_file_private *ctx, +int adreno_get_param (struct msm_gpu *gpu,struct msm_context *ctx,uint32_t param,uint64_t *value,uint32_t *len) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);
@@ -439,7 +439,7 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_file_private *ctx, } } -int adreno_set_param (struct msm_gpu *gpu,struct msm_file_private *ctx, +int adreno_set_param (struct msm_gpu *gpu,struct msm_context *ctx,uint32_t param,uint64_t value,uint32_t len) {struct drm_device *drm = gpu->dev;
@@ -485,7 +485,7 @@ int adreno_set_param(struct msm_gpu *gpu, struct msm_file_private *ctx,case MSM_PARAM_SYSPROF :if (!capable (CAP_SYS_ADMIN ))return UERR (EPERM , drm,"invalid permissions" ); -return msm_file_private_set_sysprof (ctx, gpu, value); +return msm_context_set_sysprof (ctx, gpu, value);default :return UERR (EINVAL , drm,"%s: invalid param: %u" , gpu->name, param); }
drivers/gpu/drm/msm/adreno/adreno_gpu.h +2 -2
@@ -581,9 +581,9 @@ static inline int adreno_is_a7xx(struct adreno_gpu *gpu)/* Put vm_start above 32b to catch issues with not setting xyz_BASE_HI */ #define ADRENO_VM_START 0x100000000ULLu64 adreno_private_address_space_size (struct msm_gpu *gpu); -int adreno_get_param (struct msm_gpu *gpu,struct msm_file_private *ctx, +int adreno_get_param (struct msm_gpu *gpu,struct msm_context *ctx,uint32_t param,uint64_t *value,uint32_t *len); -int adreno_set_param (struct msm_gpu *gpu,struct msm_file_private *ctx, +int adreno_set_param (struct msm_gpu *gpu,struct msm_context *ctx,uint32_t param,uint64_t value,uint32_t len);const struct firmware *adreno_request_fw (struct adreno_gpu *adreno_gpu,const char *fwname);
drivers/gpu/drm/msm/msm_drv.c +7 -7
@@ -337,7 +337,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file) {static atomic_t ident =ATOMIC_INIT (0 );struct msm_drm_private *priv = dev->dev_private; -struct msm_file_private *ctx; +struct msm_context *ctx; ctx =kzalloc (sizeof (*ctx),GFP_KERNEL );if (!ctx)
@@ -367,23 +367,23 @@ static int msm_open(struct drm_device *dev, struct drm_file *file)return context_init (dev, file); } -static void context_close (struct msm_file_private *ctx) +static void context_close (struct msm_context *ctx) {msm_submitqueue_close (ctx); -msm_file_private_put (ctx); +msm_context_put (ctx); }static void msm_postclose (struct drm_device *dev,struct drm_file *file) {struct msm_drm_private *priv = dev->dev_private; -struct msm_file_private *ctx = file->driver_priv; +struct msm_context *ctx = file->driver_priv;/* * It is not possible to set sysprof param to non-zero if gpu * is not initialized: */ if (priv->gpu) -msm_file_private_set_sysprof (ctx, priv->gpu,0 ); +msm_context_set_sysprof (ctx, priv->gpu,0 );context_close (ctx); }
@@ -515,7 +515,7 @@ static int msm_ioctl_gem_info_iova(struct drm_device *dev, uint64_t *iova) {struct msm_drm_private *priv = dev->dev_private; -struct msm_file_private *ctx = file->driver_priv; +struct msm_context *ctx = file->driver_priv;if (!priv->gpu)return -EINVAL ;
@@ -535,7 +535,7 @@ static int msm_ioctl_gem_info_set_iova(struct drm_device *dev, uint64_t iova) {struct msm_drm_private *priv = dev->dev_private; -struct msm_file_private *ctx = file->driver_priv; +struct msm_context *ctx = file->driver_priv;if (!priv->gpu)return -EINVAL ;
drivers/gpu/drm/msm/msm_gem.c +1 -1
@@ -44,7 +44,7 @@ static void update_device_mem(struct msm_drm_private *priv, ssize_t size)static void update_ctx_mem (struct drm_file *file,ssize_t size) { -struct msm_file_private *ctx = file->driver_priv; +struct msm_context *ctx = file->driver_priv;uint64_t ctx_mem =atomic64_add_return (size, &ctx->ctx_mem);rcu_read_lock ();/* Locks file->pid! */
drivers/gpu/drm/msm/msm_gem_submit.c +1 -1
@@ -651,7 +651,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, {struct msm_drm_private *priv = dev->dev_private;struct drm_msm_gem_submit *args = data; -struct msm_file_private *ctx = file->driver_priv; +struct msm_context *ctx = file->driver_priv;struct msm_gem_submit *submit =NULL ;struct msm_gpu *gpu = priv->gpu;struct msm_gpu_submitqueue *queue;
drivers/gpu/drm/msm/msm_gpu.c +2 -2
@@ -148,7 +148,7 @@ int msm_gpu_pm_suspend(struct msm_gpu *gpu)return 0 ; } -void msm_gpu_show_fdinfo (struct msm_gpu *gpu,struct msm_file_private *ctx, +void msm_gpu_show_fdinfo (struct msm_gpu *gpu,struct msm_context *ctx,struct drm_printer *p) {drm_printf (p,"drm-engine-gpu:\t%llu ns\n" , ctx->elapsed_ns);
@@ -342,7 +342,7 @@ static void retire_submits(struct msm_gpu *gpu);static void get_comm_cmdline (struct msm_gem_submit *submit,char **comm,char **cmd) { -struct msm_file_private *ctx = submit->queue->ctx; +struct msm_context *ctx = submit->queue->ctx;struct task_struct *task;WARN_ON (!mutex_is_locked (&submit->gpu->lock));
drivers/gpu/drm/msm/msm_gpu.h +19 -20
@@ -22,7 +22,7 @@struct msm_gem_submit ;struct msm_gpu_perfcntr ;struct msm_gpu_state ; -struct msm_file_private ; +struct msm_context ;struct msm_gpu_config {const char *ioname;
@@ -44,9 +44,9 @@ struct msm_gpu_config {* + z180_gpu */ struct msm_gpu_funcs { -int (*get_param)(struct msm_gpu *gpu,struct msm_file_private *ctx, +int (*get_param)(struct msm_gpu *gpu,struct msm_context *ctx,uint32_t param,uint64_t *value,uint32_t *len); -int (*set_param)(struct msm_gpu *gpu,struct msm_file_private *ctx, +int (*set_param)(struct msm_gpu *gpu,struct msm_context *ctx,uint32_t param,uint64_t value,uint32_t len);int (*hw_init)(struct msm_gpu *gpu);
@@ -341,7 +341,7 @@ struct msm_gpu_perfcntr {#define NR_SCHED_PRIORITIES (1 + DRM_SCHED_PRIORITY_LOW - DRM_SCHED_PRIORITY_HIGH)/** -* struct msm_file_private - per-drm_file context +* struct msm_context - per-drm_file context * * @queuelock: synchronizes access to submitqueues list * @submitqueues: list of &msm_gpu_submitqueue created by userspace
@@ -351,7 +351,7 @@ struct msm_gpu_perfcntr {* @ref: reference count * @seqno: unique per process seqno */ -struct msm_file_private { +struct msm_context {rwlock_t queuelock;struct list_head submitqueues;int queueid;
@@ -506,7 +506,7 @@ struct msm_gpu_submitqueue {u32 ring_nr;int faults;uint32_t last_fence; -struct msm_file_private *ctx; +struct msm_context *ctx;struct list_head node;struct idr fence_idr;struct spinlock idr_lock;
@@ -602,33 +602,32 @@ static inline void gpu_write64(struct msm_gpu *gpu, u32 reg, u64 val)int msm_gpu_pm_suspend (struct msm_gpu *gpu);int msm_gpu_pm_resume (struct msm_gpu *gpu); -void msm_gpu_show_fdinfo (struct msm_gpu *gpu,struct msm_file_private *ctx, +void msm_gpu_show_fdinfo (struct msm_gpu *gpu,struct msm_context *ctx,struct drm_printer *p); -int msm_submitqueue_init (struct drm_device *drm,struct msm_file_private *ctx); -struct msm_gpu_submitqueue *msm_submitqueue_get (struct msm_file_private *ctx, +int msm_submitqueue_init (struct drm_device *drm,struct msm_context *ctx); +struct msm_gpu_submitqueue *msm_submitqueue_get (struct msm_context *ctx,u32 id);int msm_submitqueue_create (struct drm_device *drm, -struct msm_file_private *ctx, +struct msm_context *ctx,u32 prio,u32 flags,u32 *id); -int msm_submitqueue_query (struct drm_device *drm,struct msm_file_private *ctx, +int msm_submitqueue_query (struct drm_device *drm,struct msm_context *ctx,struct drm_msm_submitqueue_query *args); -int msm_submitqueue_remove (struct msm_file_private *ctx,u32 id); -void msm_submitqueue_close (struct msm_file_private *ctx); +int msm_submitqueue_remove (struct msm_context *ctx,u32 id); +void msm_submitqueue_close (struct msm_context *ctx);void msm_submitqueue_destroy (struct kref *kref); -int msm_file_private_set_sysprof (struct msm_file_private *ctx, -struct msm_gpu *gpu,int sysprof); -void __msm_file_private_destroy (struct kref *kref); +int msm_context_set_sysprof (struct msm_context *ctx,struct msm_gpu *gpu,int sysprof); +void __msm_context_destroy (struct kref *kref); -static inline void msm_file_private_put (struct msm_file_private *ctx) +static inline void msm_context_put (struct msm_context *ctx) { -kref_put (&ctx->ref, __msm_file_private_destroy); +kref_put (&ctx->ref, __msm_context_destroy); } -static inline struct msm_file_private *msm_file_private_get ( -struct msm_file_private *ctx) +static inline struct msm_context *msm_context_get ( +struct msm_context *ctx) {kref_get (&ctx->ref);return ctx;
drivers/gpu/drm/msm/msm_submitqueue.c +13 -14
@@ -7,8 +7,7 @@#include "msm_gpu.h" -int msm_file_private_set_sysprof (struct msm_file_private *ctx, -struct msm_gpu *gpu,int sysprof) +int msm_context_set_sysprof (struct msm_context *ctx,struct msm_gpu *gpu,int sysprof) {/* * Since pm_runtime and sysprof_active are both refcounts, we
@@ -46,10 +45,10 @@ int msm_file_private_set_sysprof(struct msm_file_private *ctx,return 0 ; } -void __msm_file_private_destroy (struct kref *kref) +void __msm_context_destroy (struct kref *kref) { -struct msm_file_private *ctx =container_of (kref, - struct msm_file_private, ref); +struct msm_context *ctx =container_of (kref, + struct msm_context, ref);int i;for (i =0 ; i <ARRAY_SIZE (ctx->entities); i++) {
@@ -73,12 +72,12 @@ void msm_submitqueue_destroy(struct kref *kref)idr_destroy (&queue->fence_idr); -msm_file_private_put (queue->ctx); +msm_context_put (queue->ctx);kfree (queue); } -struct msm_gpu_submitqueue *msm_submitqueue_get (struct msm_file_private *ctx, +struct msm_gpu_submitqueue *msm_submitqueue_get (struct msm_context *ctx,u32 id) {struct msm_gpu_submitqueue *entry;
@@ -101,7 +100,7 @@ struct msm_gpu_submitqueue *msm_submitqueue_get(struct msm_file_private *ctx,return NULL ; } -void msm_submitqueue_close (struct msm_file_private *ctx) +void msm_submitqueue_close (struct msm_context *ctx) {struct msm_gpu_submitqueue *entry, *tmp;
@@ -119,7 +118,7 @@ void msm_submitqueue_close(struct msm_file_private *ctx) }static struct drm_sched_entity * -get_sched_entity (struct msm_file_private *ctx,struct msm_ringbuffer *ring, +get_sched_entity (struct msm_context *ctx,struct msm_ringbuffer *ring,unsigned ring_nr,enum drm_sched_priority sched_prio) {static DEFINE_MUTEX (entity_lock);
@@ -155,7 +154,7 @@ get_sched_entity(struct msm_file_private *ctx, struct msm_ringbuffer *ring,return ctx->entities[idx]; } -int msm_submitqueue_create (struct drm_device *drm,struct msm_file_private *ctx, +int msm_submitqueue_create (struct drm_device *drm,struct msm_context *ctx,u32 prio,u32 flags,u32 *id) {struct msm_drm_private *priv = drm->dev_private;
@@ -200,7 +199,7 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx,write_lock (&ctx->queuelock); - queue->ctx =msm_file_private_get (ctx); + queue->ctx =msm_context_get (ctx); queue->id = ctx->queueid++;if (id)
@@ -221,7 +220,7 @@ int msm_submitqueue_create(struct drm_device *drm, struct msm_file_private *ctx,* Create the default submit-queue (id==0), used for backwards compatibility * for userspace that pre-dates the introduction of submitqueues. */ -int msm_submitqueue_init (struct drm_device *drm,struct msm_file_private *ctx) +int msm_submitqueue_init (struct drm_device *drm,struct msm_context *ctx) {struct msm_drm_private *priv = drm->dev_private;int default_prio, max_priority;
@@ -261,7 +260,7 @@ static int msm_submitqueue_query_faults(struct msm_gpu_submitqueue *queue,return ret ? -EFAULT :0 ; } -int msm_submitqueue_query (struct drm_device *drm,struct msm_file_private *ctx, +int msm_submitqueue_query (struct drm_device *drm,struct msm_context *ctx,struct drm_msm_submitqueue_query *args) {struct msm_gpu_submitqueue *queue;
@@ -282,7 +281,7 @@ int msm_submitqueue_query(struct drm_device *drm, struct msm_file_private *ctx,return ret; } -int msm_submitqueue_remove (struct msm_file_private *ctx,u32 id) +int msm_submitqueue_remove (struct msm_context *ctx,u32 id) {struct msm_gpu_submitqueue *entry;
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 5/42 drm/msm: Improve msm_context comments
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Just some tidying up.
--- drivers/gpu/drm/msm/msm_gpu.h | 44 +++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 15 deletions(-)
drivers/gpu/drm/msm/msm_gpu.h +29 -15
@@ -342,25 +342,39 @@ struct msm_gpu_perfcntr {/** * struct msm_context - per-drm_file context -* -* @queuelock: synchronizes access to submitqueues list -* @submitqueues: list of &msm_gpu_submitqueue created by userspace -* @queueid: counter incremented each time a submitqueue is created, -* used to assign &msm_gpu_submitqueue.id -* @aspace: the per-process GPU address-space -* @ref: reference count -* @seqno: unique per process seqno */ struct msm_context { +/** @queuelock: synchronizes access to submitqueues list */ rwlock_t queuelock; + +/** @submitqueues: list of &msm_gpu_submitqueue created by userspace */ struct list_head submitqueues; + +/** +* @queueid: +* +* Counter incremented each time a submitqueue is created, used to +* assign &msm_gpu_submitqueue.id +*/ int queueid; + +/** @aspace: the per-process GPU address-space */ struct msm_gem_address_space *aspace; + +/** @kref: the reference count */ struct kref ref; + +/** +* @seqno: +* +* A unique per-process sequence number. Used to detect context +* switches, without relying on keeping a, potentially dangling, +* pointer to the previous context. +*/ int seqno;/** -* sysprof: +* @sysprof: * * The value of MSM_PARAM_SYSPROF set by userspace. This is * intended to be used by system profiling tools like Mesa's
@@ -378,21 +392,21 @@ struct msm_context {int sysprof;/** -* comm: Overridden task comm, see MSM_PARAM_COMM +* @comm: Overridden task comm, see MSM_PARAM_COMM * * Accessed under msm_gpu::lock */ char *comm;/** -* cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE +* @cmdline: Overridden task cmdline, see MSM_PARAM_CMDLINE * * Accessed under msm_gpu::lock */ char *cmdline;/** -* elapsed: +* @elapsed: * * The total (cumulative) elapsed time GPU was busy with rendering * from this context in ns.
@@ -400,7 +414,7 @@ struct msm_context {uint64_t elapsed_ns;/** -* cycles: +* @cycles: * * The total (cumulative) GPU cycles elapsed attributed to this * context.
@@ -408,7 +422,7 @@ struct msm_context {uint64_t cycles;/** -* entities: +* @entities: * * Table of per-priority-level sched entities used by submitqueues * associated with this &drm_file. Because some userspace apps
@@ -421,7 +435,7 @@ struct msm_context {struct drm_sched_entity *entities[NR_SCHED_PRIORITIES *MSM_GPU_MAX_RINGS ];/** -* ctx_mem: +* @ctx_mem: * * Total amount of memory of GEM buffers with handles attached for * this context.
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 6/42 drm/msm: Rename msm_gem_address_space -> msm_gem_vm
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Re-aligning naming to better match drm_gpuvm terminology will make things less confusing at the end of the drm_gpuvm conversion.
This is just rename churn, no functional change.
--- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 18 ++-- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 4 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 4 +- drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 22 ++--- drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 10 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 26 +++--- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 45 +++++---- drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 6 +- drivers/gpu/drm/msm/adreno/a6xx_preempt.c | 10 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 46 ++++----- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 18 ++-- .../drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 14 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 18 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 18 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 14 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 4 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 6 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 24 ++--- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 12 +-- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 4 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 18 ++-- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 12 +-- drivers/gpu/drm/msm/dsi/dsi_host.c | 14 +-- drivers/gpu/drm/msm/msm_drv.c | 8 +- drivers/gpu/drm/msm/msm_drv.h | 10 +- drivers/gpu/drm/msm/msm_fb.c | 10 +- drivers/gpu/drm/msm/msm_fbdev.c | 2 +- drivers/gpu/drm/msm/msm_gem.c | 74 +++++++-------- drivers/gpu/drm/msm/msm_gem.h | 34 +++---- drivers/gpu/drm/msm/msm_gem_submit.c | 6 +- drivers/gpu/drm/msm/msm_gem_vma.c | 93 +++++++++---------- drivers/gpu/drm/msm/msm_gpu.c | 46 ++++----- drivers/gpu/drm/msm/msm_gpu.h | 16 ++-- drivers/gpu/drm/msm/msm_kms.c | 16 ++-- drivers/gpu/drm/msm/msm_kms.h | 2 +- drivers/gpu/drm/msm/msm_ringbuffer.c | 4 +- drivers/gpu/drm/msm/msm_submitqueue.c | 2 +- 41 files changed, 348 insertions(+), 352 deletions(-)
drivers/gpu/drm/msm/adreno/a2xx_gpu.c +9 -9
@@ -113,7 +113,7 @@ static int a2xx_hw_init(struct msm_gpu *gpu)uint32_t *ptr, len;int i, ret; -a2xx_gpummu_params (gpu->aspace->mmu, &pt_base, &tran_error); +a2xx_gpummu_params (gpu->vm->mmu, &pt_base, &tran_error);DBG ("%s" , gpu->name);
@@ -466,19 +466,19 @@ static struct msm_gpu_state *a2xx_gpu_state_get(struct msm_gpu *gpu)return state; } -static struct msm_gem_address_space * -a2xx_create_address_space (struct msm_gpu *gpu,struct platform_device *pdev) +static struct msm_gem_vm * +a2xx_create_vm (struct msm_gpu *gpu,struct platform_device *pdev) {struct msm_mmu *mmu =a2xx_gpummu_new (&pdev->dev, gpu); -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm; - aspace =msm_gem_address_space_create (mmu,"gpu" ,SZ_16M , + vm =msm_gem_vm_create (mmu,"gpu" ,SZ_16M ,0xfff *SZ_64K ); -if (IS_ERR (aspace) && !IS_ERR (mmu)) +if (IS_ERR (vm) && !IS_ERR (mmu)) mmu->funcs->destroy (mmu); -return aspace; +return vm; }static u32 a2xx_get_rptr (struct msm_gpu *gpu,struct msm_ringbuffer *ring)
@@ -504,7 +504,7 @@ static const struct adreno_gpu_funcs funcs = {#endif .gpu_state_get = a2xx_gpu_state_get, .gpu_state_put = adreno_gpu_state_put, - .create_address_space = a2xx_create_address_space, + .create_vm = a2xx_create_vm, .get_rptr = a2xx_get_rptr, }, };
@@ -551,7 +551,7 @@ struct msm_gpu *a2xx_gpu_init(struct drm_device *dev)else adreno_gpu->registers = a220_registers; -if (!gpu->aspace) { +if (!gpu->vm) {dev_err (dev->dev,"No memory protection without MMU\n" );if (!allow_vram_carveout) { ret = -ENXIO ;
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +2 -2
@@ -526,7 +526,7 @@ static const struct adreno_gpu_funcs funcs = { .gpu_busy = a3xx_gpu_busy, .gpu_state_get = a3xx_gpu_state_get, .gpu_state_put = adreno_gpu_state_put, - .create_address_space = adreno_create_address_space, + .create_vm = adreno_create_vm, .get_rptr = a3xx_get_rptr, }, };
@@ -581,7 +581,7 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) goto fail; } -if (!gpu->aspace) { +if (!gpu->vm) {/* TODO we think it is possible to configure the GPU to * restrict access to VRAM carveout. But the required * registers are unknown. For now just bail out and
drivers/gpu/drm/msm/adreno/a4xx_gpu.c +2 -2
@@ -645,7 +645,7 @@ static const struct adreno_gpu_funcs funcs = { .gpu_busy = a4xx_gpu_busy, .gpu_state_get = a4xx_gpu_state_get, .gpu_state_put = adreno_gpu_state_put, - .create_address_space = adreno_create_address_space, + .create_vm = adreno_create_vm, .get_rptr = a4xx_get_rptr, }, .get_timestamp = a4xx_get_timestamp,
@@ -695,7 +695,7 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) adreno_gpu->uche_trap_base =0xffff0000ffff0000ull ; -if (!gpu->aspace) { +if (!gpu->vm) {/* TODO we think it is possible to configure the GPU to * restrict access to VRAM carveout. But the required * registers are unknown. For now just bail out and
drivers/gpu/drm/msm/adreno/a5xx_debugfs.c +2 -2
@@ -116,13 +116,13 @@ reset_set(void *data, u64 val) adreno_gpu->fw[ADRENO_FW_PFP ] =NULL ;if (a5xx_gpu->pm4_bo) { -msm_gem_unpin_iova (a5xx_gpu->pm4_bo, gpu->aspace); +msm_gem_unpin_iova (a5xx_gpu->pm4_bo, gpu->vm);drm_gem_object_put (a5xx_gpu->pm4_bo); a5xx_gpu->pm4_bo =NULL ; }if (a5xx_gpu->pfp_bo) { -msm_gem_unpin_iova (a5xx_gpu->pfp_bo, gpu->aspace); +msm_gem_unpin_iova (a5xx_gpu->pfp_bo, gpu->vm);drm_gem_object_put (a5xx_gpu->pfp_bo); a5xx_gpu->pfp_bo =NULL ; }
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +11 -11
@@ -622,7 +622,7 @@ static int a5xx_ucode_load(struct msm_gpu *gpu) a5xx_gpu->shadow =msm_gem_kernel_new (gpu->dev,sizeof (u32) * gpu->nr_rings,MSM_BO_WC |MSM_BO_MAP_PRIV , - gpu->aspace, &a5xx_gpu->shadow_bo, + gpu->vm, &a5xx_gpu->shadow_bo, &a5xx_gpu->shadow_iova);if (IS_ERR (a5xx_gpu->shadow))
@@ -1042,22 +1042,22 @@ static void a5xx_destroy(struct msm_gpu *gpu)a5xx_preempt_fini (gpu);if (a5xx_gpu->pm4_bo) { -msm_gem_unpin_iova (a5xx_gpu->pm4_bo, gpu->aspace); +msm_gem_unpin_iova (a5xx_gpu->pm4_bo, gpu->vm);drm_gem_object_put (a5xx_gpu->pm4_bo); }if (a5xx_gpu->pfp_bo) { -msm_gem_unpin_iova (a5xx_gpu->pfp_bo, gpu->aspace); +msm_gem_unpin_iova (a5xx_gpu->pfp_bo, gpu->vm);drm_gem_object_put (a5xx_gpu->pfp_bo); }if (a5xx_gpu->gpmu_bo) { -msm_gem_unpin_iova (a5xx_gpu->gpmu_bo, gpu->aspace); +msm_gem_unpin_iova (a5xx_gpu->gpmu_bo, gpu->vm);drm_gem_object_put (a5xx_gpu->gpmu_bo); }if (a5xx_gpu->shadow_bo) { -msm_gem_unpin_iova (a5xx_gpu->shadow_bo, gpu->aspace); +msm_gem_unpin_iova (a5xx_gpu->shadow_bo, gpu->vm);drm_gem_object_put (a5xx_gpu->shadow_bo); }
@@ -1457,7 +1457,7 @@ static int a5xx_crashdumper_init(struct msm_gpu *gpu, struct a5xx_crashdumper *dumper) { dumper->ptr =msm_gem_kernel_new (gpu->dev, -SZ_1M ,MSM_BO_WC , gpu->aspace, +SZ_1M ,MSM_BO_WC , gpu->vm, &dumper->bo, &dumper->iova);if (!IS_ERR (dumper->ptr))
@@ -1557,7 +1557,7 @@ static void a5xx_gpu_state_get_hlsq_regs(struct msm_gpu *gpu,if (a5xx_crashdumper_run (gpu, &dumper)) {kfree (a5xx_state->hlsqregs); -msm_gem_kernel_put (dumper.bo, gpu->aspace); +msm_gem_kernel_put (dumper.bo, gpu->vm);return ; }
@@ -1565,7 +1565,7 @@ static void a5xx_gpu_state_get_hlsq_regs(struct msm_gpu *gpu,memcpy (a5xx_state->hlsqregs, dumper.ptr + (256 *SZ_1K ), count *sizeof (u32)); -msm_gem_kernel_put (dumper.bo, gpu->aspace); +msm_gem_kernel_put (dumper.bo, gpu->vm); }static struct msm_gpu_state *a5xx_gpu_state_get (struct msm_gpu *gpu)
@@ -1713,7 +1713,7 @@ static const struct adreno_gpu_funcs funcs = { .gpu_busy = a5xx_gpu_busy, .gpu_state_get = a5xx_gpu_state_get, .gpu_state_put = a5xx_gpu_state_put, - .create_address_space = adreno_create_address_space, + .create_vm = adreno_create_vm, .get_rptr = a5xx_get_rptr, }, .get_timestamp = a5xx_get_timestamp,
@@ -1786,8 +1786,8 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)return ERR_PTR (ret); } -if (gpu->aspace) -msm_mmu_set_fault_handler (gpu->aspace->mmu, gpu, a5xx_fault_handler); +if (gpu->vm) +msm_mmu_set_fault_handler (gpu->vm->mmu, gpu, a5xx_fault_handler);/* Set up the preemption specific bits and pieces for each ringbuffer */ a5xx_preempt_init (gpu);
drivers/gpu/drm/msm/adreno/a5xx_power.c +1 -1
@@ -363,7 +363,7 @@ void a5xx_gpmu_ucode_init(struct msm_gpu *gpu) bosize = (cmds_size + (cmds_size /TYPE4_MAX_PAYLOAD ) +1 ) <<2 ; ptr =msm_gem_kernel_new (drm, bosize, -MSM_BO_WC |MSM_BO_GPU_READONLY , gpu->aspace, +MSM_BO_WC |MSM_BO_GPU_READONLY , gpu->vm, &a5xx_gpu->gpmu_bo, &a5xx_gpu->gpmu_iova);if (IS_ERR (ptr))return ;
drivers/gpu/drm/msm/adreno/a5xx_preempt.c +5 -5
@@ -255,7 +255,7 @@ static int preempt_init_ring(struct a5xx_gpu *a5xx_gpu, ptr =msm_gem_kernel_new (gpu->dev,A5XX_PREEMPT_RECORD_SIZE +A5XX_PREEMPT_COUNTER_SIZE , -MSM_BO_WC |MSM_BO_MAP_PRIV , gpu->aspace, &bo, &iova); +MSM_BO_WC |MSM_BO_MAP_PRIV , gpu->vm, &bo, &iova);if (IS_ERR (ptr))return PTR_ERR (ptr);
@@ -263,9 +263,9 @@ static int preempt_init_ring(struct a5xx_gpu *a5xx_gpu,/* The buffer to store counters needs to be unprivileged */ counters =msm_gem_kernel_new (gpu->dev,A5XX_PREEMPT_COUNTER_SIZE , -MSM_BO_WC , gpu->aspace, &counters_bo, &counters_iova); +MSM_BO_WC , gpu->vm, &counters_bo, &counters_iova);if (IS_ERR (counters)) { -msm_gem_kernel_put (bo, gpu->aspace); +msm_gem_kernel_put (bo, gpu->vm);return PTR_ERR (counters); }
@@ -296,8 +296,8 @@ void a5xx_preempt_fini(struct msm_gpu *gpu)int i;for (i =0 ; i < gpu->nr_rings; i++) { -msm_gem_kernel_put (a5xx_gpu->preempt_bo[i], gpu->aspace); -msm_gem_kernel_put (a5xx_gpu->preempt_counters_bo[i], gpu->aspace); +msm_gem_kernel_put (a5xx_gpu->preempt_bo[i], gpu->vm); +msm_gem_kernel_put (a5xx_gpu->preempt_counters_bo[i], gpu->vm); } }
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +13 -13
@@ -1259,15 +1259,15 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu)static void a6xx_gmu_memory_free (struct a6xx_gmu *gmu) { -msm_gem_kernel_put (gmu->hfi.obj, gmu->aspace); -msm_gem_kernel_put (gmu->debug.obj, gmu->aspace); -msm_gem_kernel_put (gmu->icache.obj, gmu->aspace); -msm_gem_kernel_put (gmu->dcache.obj, gmu->aspace); -msm_gem_kernel_put (gmu->dummy.obj, gmu->aspace); -msm_gem_kernel_put (gmu->log.obj, gmu->aspace); - - gmu->aspace->mmu->funcs->detach (gmu->aspace->mmu); -msm_gem_address_space_put (gmu->aspace); +msm_gem_kernel_put (gmu->hfi.obj, gmu->vm); +msm_gem_kernel_put (gmu->debug.obj, gmu->vm); +msm_gem_kernel_put (gmu->icache.obj, gmu->vm); +msm_gem_kernel_put (gmu->dcache.obj, gmu->vm); +msm_gem_kernel_put (gmu->dummy.obj, gmu->vm); +msm_gem_kernel_put (gmu->log.obj, gmu->vm); + + gmu->vm->mmu->funcs->detach (gmu->vm->mmu); +msm_gem_vm_put (gmu->vm); } static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, struct a6xx_gmu_bo *bo,
@@ -1296,7 +1296,7 @@ static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, struct a6xx_gmu_bo *bo,if (IS_ERR (bo->obj))return PTR_ERR (bo->obj); - ret =msm_gem_get_and_pin_iova_range (bo->obj, gmu->aspace, &bo->iova, + ret =msm_gem_get_and_pin_iova_range (bo->obj, gmu->vm, &bo->iova, range_start, range_end);if (ret) {drm_gem_object_put (bo->obj);
@@ -1321,9 +1321,9 @@ static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu)if (IS_ERR (mmu))return PTR_ERR (mmu); - gmu->aspace =msm_gem_address_space_create (mmu,"gmu" ,0x0 ,0x80000000 ); -if (IS_ERR (gmu->aspace)) -return PTR_ERR (gmu->aspace); + gmu->vm =msm_gem_vm_create (mmu,"gmu" ,0x0 ,0x80000000 ); +if (IS_ERR (gmu->vm)) +return PTR_ERR (gmu->vm);return 0 ; }
drivers/gpu/drm/msm/adreno/a6xx_gmu.h +1 -1
@@ -62,7 +62,7 @@ struct a6xx_gmu {/* For serializing communication with the GMU: */ struct mutex lock; -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;void __iomem *mmio;void __iomem *rscc;
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +22 -23
125 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +3 -3
@@ -132,7 +132,7 @@ static int a6xx_crashdumper_init(struct msm_gpu *gpu, struct a6xx_crashdumper *dumper) { dumper->ptr =msm_gem_kernel_new (gpu->dev, -SZ_1M ,MSM_BO_WC , gpu->aspace, +SZ_1M ,MSM_BO_WC , gpu->vm, &dumper->bo, &dumper->iova);if (!IS_ERR (dumper->ptr))
@@ -1619,7 +1619,7 @@ struct msm_gpu_state *a6xx_gpu_state_get(struct msm_gpu *gpu)a7xx_get_clusters (gpu, a6xx_state, dumper);a7xx_get_dbgahb_clusters (gpu, a6xx_state, dumper); -msm_gem_kernel_put (dumper->bo, gpu->aspace); +msm_gem_kernel_put (dumper->bo, gpu->vm); }a7xx_get_post_crashdumper_registers (gpu, a6xx_state);
@@ -1631,7 +1631,7 @@ struct msm_gpu_state *a6xx_gpu_state_get(struct msm_gpu *gpu)a6xx_get_clusters (gpu, a6xx_state, dumper);a6xx_get_dbgahb_clusters (gpu, a6xx_state, dumper); -msm_gem_kernel_put (dumper->bo, gpu->aspace); +msm_gem_kernel_put (dumper->bo, gpu->vm); } }
drivers/gpu/drm/msm/adreno/a6xx_preempt.c +5 -5
@@ -344,7 +344,7 @@ static int preempt_init_ring(struct a6xx_gpu *a6xx_gpu, ptr =msm_gem_kernel_new (gpu->dev,PREEMPT_RECORD_SIZE (adreno_gpu), -MSM_BO_WC |MSM_BO_MAP_PRIV , gpu->aspace, &bo, &iova); +MSM_BO_WC |MSM_BO_MAP_PRIV , gpu->vm, &bo, &iova);if (IS_ERR (ptr))return PTR_ERR (ptr);
@@ -362,7 +362,7 @@ static int preempt_init_ring(struct a6xx_gpu *a6xx_gpu, ptr =msm_gem_kernel_new (gpu->dev,PREEMPT_SMMU_INFO_SIZE ,MSM_BO_WC |MSM_BO_MAP_PRIV |MSM_BO_GPU_READONLY , - gpu->aspace, &bo, &iova); + gpu->vm, &bo, &iova);if (IS_ERR (ptr))return PTR_ERR (ptr);
@@ -377,7 +377,7 @@ static int preempt_init_ring(struct a6xx_gpu *a6xx_gpu,struct a7xx_cp_smmu_info *smmu_info_ptr = ptr; -msm_iommu_pagetable_params (gpu->aspace->mmu, &ttbr, &asid); +msm_iommu_pagetable_params (gpu->vm->mmu, &ttbr, &asid); smmu_info_ptr->magic =GEN7_CP_SMMU_INFO_MAGIC ; smmu_info_ptr->ttbr0 = ttbr;
@@ -405,7 +405,7 @@ void a6xx_preempt_fini(struct msm_gpu *gpu)int i;for (i =0 ; i < gpu->nr_rings; i++) -msm_gem_kernel_put (a6xx_gpu->preempt_bo[i], gpu->aspace); +msm_gem_kernel_put (a6xx_gpu->preempt_bo[i], gpu->vm); }void a6xx_preempt_init (struct msm_gpu *gpu)
@@ -431,7 +431,7 @@ void a6xx_preempt_init(struct msm_gpu *gpu) a6xx_gpu->preempt_postamble_ptr =msm_gem_kernel_new (gpu->dev,PAGE_SIZE ,MSM_BO_WC |MSM_BO_MAP_PRIV |MSM_BO_GPU_READONLY , - gpu->aspace, &a6xx_gpu->preempt_postamble_bo, + gpu->vm, &a6xx_gpu->preempt_postamble_bo, &a6xx_gpu->preempt_postamble_iova);preempt_prepare_postamble (a6xx_gpu);
drivers/gpu/drm/msm/adreno/adreno_gpu.c +23 -23
104 lines not on this page · raw message
drivers/gpu/drm/msm/adreno/adreno_gpu.h +9 -9
@@ -580,7 +580,7 @@ static inline int adreno_is_a7xx(struct adreno_gpu *gpu)/* Put vm_start above 32b to catch issues with not setting xyz_BASE_HI */ #define ADRENO_VM_START 0x100000000ULL -u64 adreno_private_address_space_size (struct msm_gpu *gpu); +u64 adreno_private_vm_size (struct msm_gpu *gpu);int adreno_get_param (struct msm_gpu *gpu,struct msm_context *ctx,uint32_t param,uint64_t *value,uint32_t *len); int adreno_set_param(struct msm_gpu *gpu, struct msm_context *ctx,
@@ -623,14 +623,14 @@ void adreno_show_object(struct drm_printer *p, void **ptr, int len,* Common helper function to initialize the default address space for arm-smmu * attached targets */ -struct msm_gem_address_space * -adreno_create_address_space (struct msm_gpu *gpu, -struct platform_device *pdev); - -struct msm_gem_address_space * -adreno_iommu_create_address_space (struct msm_gpu *gpu, -struct platform_device *pdev, -unsigned long quirks); +struct msm_gem_vm * +adreno_create_vm (struct msm_gpu *gpu, +struct platform_device *pdev); + +struct msm_gem_vm * +adreno_iommu_create_vm (struct msm_gpu *gpu, +struct platform_device *pdev, +unsigned long quirks); int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags, struct adreno_smmu_fault_info *info, const char *block,
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +7 -7
@@ -566,7 +566,7 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct dpu_encoder_phys *phys_enc struct drm_writeback_job *job) {const struct msm_format *format; -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;struct dpu_hw_wb_cfg *wb_cfg;int ret;struct dpu_encoder_phys_wb *wb_enc =to_dpu_encoder_phys_wb (phys_enc);
@@ -576,13 +576,13 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct dpu_encoder_phys *phys_enc wb_enc->wb_job = job; wb_enc->wb_conn = job->connector; - aspace = phys_enc->dpu_kms->base.aspace; + vm = phys_enc->dpu_kms->base.vm; wb_cfg = &wb_enc->wb_cfg;memset (wb_cfg,0 ,sizeof (struct dpu_hw_wb_cfg )); - ret =msm_framebuffer_prepare (job->fb, aspace, false); + ret =msm_framebuffer_prepare (job->fb, vm, false);if (ret) {DPU_ERROR ("prep fb failed, %d\n" , ret);return ;
@@ -596,7 +596,7 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct dpu_encoder_phys *phys_encreturn ; } -dpu_format_populate_addrs (aspace, job->fb, &wb_cfg->dest); +dpu_format_populate_addrs (vm, job->fb, &wb_cfg->dest); wb_cfg->dest.width = job->fb->width; wb_cfg->dest.height = job->fb->height;
@@ -619,14 +619,14 @@ static void dpu_encoder_phys_wb_cleanup_wb_job(struct dpu_encoder_phys *phys_enc struct drm_writeback_job *job) {struct dpu_encoder_phys_wb *wb_enc =to_dpu_encoder_phys_wb (phys_enc); -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;if (!job->fb)return ; - aspace = phys_enc->dpu_kms->base.aspace; + vm = phys_enc->dpu_kms->base.vm; -msm_framebuffer_cleanup (job->fb, aspace, false); +msm_framebuffer_cleanup (job->fb, vm, false); wb_enc->wb_job =NULL ; wb_enc->wb_conn =NULL ; }
drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +9 -9
@@ -274,7 +274,7 @@ int dpu_format_populate_plane_sizes(return _dpu_format_populate_plane_sizes_linear (fmt, fb, layout); } -static void _dpu_format_populate_addrs_ubwc (struct msm_gem_address_space *aspace, +static void _dpu_format_populate_addrs_ubwc (struct msm_gem_vm *vm,struct drm_framebuffer *fb,struct dpu_hw_fmt_layout *layout) {
@@ -282,7 +282,7 @@ static void _dpu_format_populate_addrs_ubwc(struct msm_gem_address_space *aspaceuint32_t base_addr =0 ;bool meta; - base_addr =msm_framebuffer_iova (fb, aspace,0 ); + base_addr =msm_framebuffer_iova (fb, vm,0 ); fmt =msm_framebuffer_format (fb); meta =MSM_FORMAT_IS_UBWC (fmt);
@@ -355,7 +355,7 @@ static void _dpu_format_populate_addrs_ubwc(struct msm_gem_address_space *aspace } } -static void _dpu_format_populate_addrs_linear (struct msm_gem_address_space *aspace, +static void _dpu_format_populate_addrs_linear (struct msm_gem_vm *vm,struct drm_framebuffer *fb,struct dpu_hw_fmt_layout *layout) {
@@ -363,17 +363,17 @@ static void _dpu_format_populate_addrs_linear(struct msm_gem_address_space *aspa/* Populate addresses for simple formats here */ for (i =0 ; i < layout->num_planes; ++i) - layout->plane_addr[i] =msm_framebuffer_iova (fb, aspace, i); -} + layout->plane_addr[i] =msm_framebuffer_iova (fb, vm, i); + }/** * dpu_format_populate_addrs - populate buffer addresses based on * mmu, fb, and format found in the fb -* @aspace: address space pointer +* @vm: address space pointer * @fb: framebuffer pointer * @layout: format layout structure to populate */ -void dpu_format_populate_addrs (struct msm_gem_address_space *aspace, +void dpu_format_populate_addrs (struct msm_gem_vm *vm,struct drm_framebuffer *fb,struct dpu_hw_fmt_layout *layout) {
@@ -384,7 +384,7 @@ void dpu_format_populate_addrs(struct msm_gem_address_space *aspace,/* Populate the addresses given the fb */ if (MSM_FORMAT_IS_UBWC (fmt) ||MSM_FORMAT_IS_TILE (fmt)) -_dpu_format_populate_addrs_ubwc (aspace, fb, layout); +_dpu_format_populate_addrs_ubwc (vm, fb, layout);else -_dpu_format_populate_addrs_linear (aspace, fb, layout); +_dpu_format_populate_addrs_linear (vm, fb, layout); }
drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h +1 -1
@@ -31,7 +31,7 @@ static inline bool dpu_find_format(u32 format, const u32 *supported_formats,return false; } -void dpu_format_populate_addrs (struct msm_gem_address_space *aspace, +void dpu_format_populate_addrs (struct msm_gem_vm *vm,struct drm_framebuffer *fb,struct dpu_hw_fmt_layout *layout);
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +9 -9
@@ -1095,26 +1095,26 @@ static void _dpu_kms_mmu_destroy(struct dpu_kms *dpu_kms) {struct msm_mmu *mmu; -if (!dpu_kms->base.aspace) +if (!dpu_kms->base.vm)return ; - mmu = dpu_kms->base.aspace->mmu; + mmu = dpu_kms->base.vm->mmu; mmu->funcs->detach (mmu); -msm_gem_address_space_put (dpu_kms->base.aspace); +msm_gem_vm_put (dpu_kms->base.vm); - dpu_kms->base.aspace =NULL ; + dpu_kms->base.vm =NULL ; }static int _dpu_kms_mmu_init (struct dpu_kms *dpu_kms) { -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm; - aspace =msm_kms_init_aspace (dpu_kms->dev); -if (IS_ERR (aspace)) -return PTR_ERR (aspace); + vm =msm_kms_init_vm (dpu_kms->dev); +if (IS_ERR (vm)) +return PTR_ERR (vm); - dpu_kms->base.aspace = aspace; + dpu_kms->base.vm = vm;return 0 ; }
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +7 -7
@@ -71,7 +71,7 @@ static const uint32_t qcom_compressed_supported_formats[] = {/* * struct dpu_plane - local dpu plane structure -* @aspace: address space pointer +* @vm: address space pointer * @csc_ptr: Points to dpu_csc_cfg structure to use for current * @catalog: Points to dpu catalog structure * @revalidate: force revalidation of all the plane properties
@@ -654,8 +654,8 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,DPU_DEBUG_PLANE (pdpu,"FB[%u]\n" , fb->base.id); -/* cache aspace */ - pstate->aspace = kms->base.aspace; +/* cache vm */ + pstate->vm = kms->base.vm;/* * TODO: Need to sort out the msm_framebuffer_prepare() call below so
@@ -664,9 +664,9 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,*/ drm_gem_plane_helper_prepare_fb (plane, new_state); -if (pstate->aspace) { +if (pstate->vm) { ret =msm_framebuffer_prepare (new_state->fb, - pstate->aspace, pstate->needs_dirtyfb); + pstate->vm, pstate->needs_dirtyfb);if (ret) {DPU_ERROR ("failed to prepare framebuffer\n" );return ret;
@@ -689,7 +689,7 @@ static void dpu_plane_cleanup_fb(struct drm_plane *plane,DPU_DEBUG_PLANE (pdpu,"FB[%u]\n" , old_state->fb->base.id); -msm_framebuffer_cleanup (old_state->fb, old_pstate->aspace, +msm_framebuffer_cleanup (old_state->fb, old_pstate->vm, old_pstate->needs_dirtyfb); }
@@ -1457,7 +1457,7 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane, pstate->needs_qos_remap |= (is_rt_pipe != pdpu->is_rt_pipe); pdpu->is_rt_pipe = is_rt_pipe; -dpu_format_populate_addrs (pstate->aspace, new_state->fb, &pstate->layout); +dpu_format_populate_addrs (pstate->vm, new_state->fb, &pstate->layout); DPU_DEBUG_PLANE(pdpu, "FB[%u] " DRM_RECT_FP_FMT "->crtc%u " DRM_RECT_FMT ", %p4cc ubwc %d\n", fb->base.id, DRM_RECT_FP_ARG(&state->src),
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h +2 -2
@@ -17,7 +17,7 @@/** * struct dpu_plane_state: Define dpu extension of drm plane state object * @base: base drm plane state object -* @aspace: pointer to address space for input/output buffers +* @vm: pointer to address space for input/output buffers * @pipe: software pipe description * @r_pipe: software pipe description of the second pipe * @pipe_cfg: software pipe configuration
@@ -34,7 +34,7 @@*/ struct dpu_plane_state {struct drm_plane_state base; -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;struct dpu_sw_pipe pipe;struct dpu_sw_pipe r_pipe;struct dpu_sw_pipe_cfg pipe_cfg;
drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +3 -3
@@ -120,7 +120,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)struct mdp4_kms *mdp4_kms =get_kms (&mdp4_crtc->base);struct msm_kms *kms = &mdp4_kms->base.base; -msm_gem_unpin_iova (val, kms->aspace); +msm_gem_unpin_iova (val, kms->vm);drm_gem_object_put (val); }
@@ -369,7 +369,7 @@ static void update_cursor(struct drm_crtc *crtc)if (next_bo) {/* take a obj ref + iova ref when we start scanning out: */ drm_gem_object_get (next_bo); -msm_gem_get_and_pin_iova (next_bo, kms->aspace, &iova); +msm_gem_get_and_pin_iova (next_bo, kms->vm, &iova);/* enable cursor: */ mdp4_write(mdp4_kms, REG_MDP4_DMA_CURSOR_SIZE(dma),
@@ -427,7 +427,7 @@ static int mdp4_crtc_cursor_set(struct drm_crtc *crtc, }if (cursor_bo) { - ret =msm_gem_get_and_pin_iova (cursor_bo, kms->aspace, &iova); + ret =msm_gem_get_and_pin_iova (cursor_bo, kms->vm, &iova);if (ret) goto fail; }else {
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +12 -12
@@ -122,15 +122,15 @@ static void mdp4_destroy(struct msm_kms *kms) {struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (kms));struct device *dev = mdp4_kms->dev->dev; -struct msm_gem_address_space *aspace = kms->aspace; +struct msm_gem_vm *vm = kms->vm;if (mdp4_kms->blank_cursor_iova) -msm_gem_unpin_iova (mdp4_kms->blank_cursor_bo, kms->aspace); +msm_gem_unpin_iova (mdp4_kms->blank_cursor_bo, kms->vm);drm_gem_object_put (mdp4_kms->blank_cursor_bo); -if (aspace) { - aspace->mmu->funcs->detach (aspace->mmu); -msm_gem_address_space_put (aspace); +if (vm) { + vm->mmu->funcs->detach (vm->mmu); +msm_gem_vm_put (vm); }if (mdp4_kms->rpm_enabled)
@@ -398,7 +398,7 @@ static int mdp4_kms_init(struct drm_device *dev)struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (priv->kms));struct msm_kms *kms =NULL ;struct msm_mmu *mmu; -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;int ret;u32 major, minor;unsigned long max_clk;
@@ -467,19 +467,19 @@ static int mdp4_kms_init(struct drm_device *dev) }else if (!mmu) {DRM_DEV_INFO (dev->dev,"no iommu, fallback to phys " "contig buffers for scanout\n" ); - aspace =NULL ; + vm =NULL ; }else { - aspace =msm_gem_address_space_create (mmu, + vm =msm_gem_vm_create (mmu,"mdp4" ,0x1000 ,0x100000000 -0x1000 ); -if (IS_ERR (aspace)) { +if (IS_ERR (vm)) {if (!IS_ERR (mmu)) mmu->funcs->destroy (mmu); - ret =PTR_ERR (aspace); + ret =PTR_ERR (vm); goto fail; } - kms->aspace = aspace; + kms->vm = vm; } ret =modeset_init (mdp4_kms);
@@ -496,7 +496,7 @@ static int mdp4_kms_init(struct drm_device *dev) goto fail; } - ret =msm_gem_get_and_pin_iova (mdp4_kms->blank_cursor_bo, kms->aspace, + ret =msm_gem_get_and_pin_iova (mdp4_kms->blank_cursor_bo, kms->vm, &mdp4_kms->blank_cursor_iova);if (ret) {DRM_DEV_ERROR (dev->dev,"could not pin blank-cursor bo: %d\n" , ret);
drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +6 -6
@@ -87,7 +87,7 @@ static int mdp4_plane_prepare_fb(struct drm_plane *plane,drm_gem_plane_helper_prepare_fb (plane, new_state); -return msm_framebuffer_prepare (new_state->fb, kms->aspace, false); +return msm_framebuffer_prepare (new_state->fb, kms->vm, false); } static void mdp4_plane_cleanup_fb(struct drm_plane *plane,
@@ -102,7 +102,7 @@ static void mdp4_plane_cleanup_fb(struct drm_plane *plane,return ;DBG ("%s: cleanup: FB[%u]" , mdp4_plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, kms->aspace, false); +msm_framebuffer_cleanup (fb, kms->vm, false); }
@@ -153,13 +153,13 @@ static void mdp4_plane_set_scanout(struct drm_plane *plane, MDP4_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP0_BASE (pipe), -msm_framebuffer_iova (fb, kms->aspace,0 )); +msm_framebuffer_iova (fb, kms->vm,0 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP1_BASE (pipe), -msm_framebuffer_iova (fb, kms->aspace,1 )); +msm_framebuffer_iova (fb, kms->vm,1 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP2_BASE (pipe), -msm_framebuffer_iova (fb, kms->aspace,2 )); +msm_framebuffer_iova (fb, kms->vm,2 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP3_BASE (pipe), -msm_framebuffer_iova (fb, kms->aspace,3 )); +msm_framebuffer_iova (fb, kms->vm,3 )); } static void mdp4_write_csc_config(struct mdp4_kms *mdp4_kms,
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +2 -2
@@ -169,7 +169,7 @@ static void unref_cursor_worker(struct drm_flip_work *work, void *val)struct mdp5_kms *mdp5_kms =get_kms (&mdp5_crtc->base);struct msm_kms *kms = &mdp5_kms->base.base; -msm_gem_unpin_iova (val, kms->aspace); +msm_gem_unpin_iova (val, kms->vm);drm_gem_object_put (val); }
@@ -993,7 +993,7 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc,if (!cursor_bo)return -ENOENT ; - ret =msm_gem_get_and_pin_iova (cursor_bo, kms->aspace, + ret =msm_gem_get_and_pin_iova (cursor_bo, kms->vm, &mdp5_crtc->cursor.iova);if (ret) {drm_gem_object_put (cursor_bo);
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +9 -9
@@ -198,11 +198,11 @@ static void mdp5_destroy(struct mdp5_kms *mdp5_kms);static void mdp5_kms_destroy (struct msm_kms *kms) {struct mdp5_kms *mdp5_kms =to_mdp5_kms (to_mdp_kms (kms)); -struct msm_gem_address_space *aspace = kms->aspace; +struct msm_gem_vm *vm = kms->vm; -if (aspace) { - aspace->mmu->funcs->detach (aspace->mmu); -msm_gem_address_space_put (aspace); +if (vm) { + vm->mmu->funcs->detach (vm->mmu); +msm_gem_vm_put (vm); }mdp_kms_destroy (&mdp5_kms->base);
@@ -500,7 +500,7 @@ static int mdp5_kms_init(struct drm_device *dev)struct mdp5_kms *mdp5_kms;struct mdp5_cfg *config;struct msm_kms *kms = priv->kms; -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;int i, ret; ret =mdp5_init (to_platform_device (dev->dev), dev);
@@ -534,13 +534,13 @@ static int mdp5_kms_init(struct drm_device *dev) }mdelay (16 ); - aspace =msm_kms_init_aspace (mdp5_kms->dev); -if (IS_ERR (aspace)) { - ret =PTR_ERR (aspace); + vm =msm_kms_init_vm (mdp5_kms->dev); +if (IS_ERR (vm)) { + ret =PTR_ERR (vm); goto fail; } - kms->aspace = aspace; + kms->vm = vm;pm_runtime_put_sync (&pdev->dev);
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +6 -6
@@ -144,7 +144,7 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,drm_gem_plane_helper_prepare_fb (plane, new_state); -return msm_framebuffer_prepare (new_state->fb, kms->aspace, needs_dirtyfb); +return msm_framebuffer_prepare (new_state->fb, kms->vm, needs_dirtyfb); } static void mdp5_plane_cleanup_fb(struct drm_plane *plane,
@@ -159,7 +159,7 @@ static void mdp5_plane_cleanup_fb(struct drm_plane *plane,return ;DBG ("%s: cleanup: FB[%u]" , plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, kms->aspace, needed_dirtyfb); +msm_framebuffer_cleanup (fb, kms->vm, needed_dirtyfb); } static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_state,
@@ -478,13 +478,13 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_kms, MDP5_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC0_ADDR (pipe), -msm_framebuffer_iova (fb, kms->aspace,0 )); +msm_framebuffer_iova (fb, kms->vm,0 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC1_ADDR (pipe), -msm_framebuffer_iova (fb, kms->aspace,1 )); +msm_framebuffer_iova (fb, kms->vm,1 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC2_ADDR (pipe), -msm_framebuffer_iova (fb, kms->aspace,2 )); +msm_framebuffer_iova (fb, kms->vm,2 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC3_ADDR (pipe), -msm_framebuffer_iova (fb, kms->aspace,3 )); +msm_framebuffer_iova (fb, kms->vm,3 )); }/* Note: mdp5_plane->pipe_lock must be locked */
drivers/gpu/drm/msm/dsi/dsi_host.c +7 -7
@@ -143,7 +143,7 @@ struct msm_dsi_host {/* DSI 6G TX buffer*/ struct drm_gem_object *tx_gem_obj; -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;/* DSI v2 TX buffer */ void *tx_buf;
@@ -1146,10 +1146,10 @@ int dsi_tx_buf_alloc_6g(struct msm_dsi_host *msm_host, int size)uint64_t iova;u8 *data; - msm_host->aspace =msm_gem_address_space_get (priv->kms->aspace); + msm_host->vm =msm_gem_vm_get (priv->kms->vm); data =msm_gem_kernel_new (dev, size,MSM_BO_WC , - msm_host->aspace, + msm_host->vm, &msm_host->tx_gem_obj, &iova);if (IS_ERR (data)) {
@@ -1193,10 +1193,10 @@ void msm_dsi_tx_buf_free(struct mipi_dsi_host *host)return ;if (msm_host->tx_gem_obj) { -msm_gem_kernel_put (msm_host->tx_gem_obj, msm_host->aspace); -msm_gem_address_space_put (msm_host->aspace); +msm_gem_kernel_put (msm_host->tx_gem_obj, msm_host->vm); +msm_gem_vm_put (msm_host->vm); msm_host->tx_gem_obj =NULL ; - msm_host->aspace =NULL ; + msm_host->vm =NULL ; }if (msm_host->tx_buf)
@@ -1327,7 +1327,7 @@ int dsi_dma_base_get_6g(struct msm_dsi_host *msm_host, uint64_t *dma_base)return -EINVAL ;return msm_gem_get_and_pin_iova (msm_host->tx_gem_obj, - priv->kms->aspace, dma_base); + priv->kms->vm, dma_base); }int dsi_dma_base_get_v2 (struct msm_dsi_host *msm_host,uint64_t *dma_base)
drivers/gpu/drm/msm/msm_drv.c +4 -4
@@ -349,7 +349,7 @@ static int context_init(struct drm_device *dev, struct drm_file *file)kref_init (&ctx->ref);msm_submitqueue_init (dev, ctx); - ctx->aspace =msm_gpu_create_private_address_space (priv->gpu, current); + ctx->vm =msm_gpu_create_private_vm (priv->gpu, current); file->driver_priv = ctx; ctx->seqno =atomic_inc_return (&ident);
@@ -527,7 +527,7 @@ static int msm_ioctl_gem_info_iova(struct drm_device *dev,* Don't pin the memory here - just get an address so that userspace can * be productive */ -return msm_gem_get_iova (obj, ctx->aspace, iova); +return msm_gem_get_iova (obj, ctx->vm, iova); } static int msm_ioctl_gem_info_set_iova(struct drm_device *dev,
@@ -541,13 +541,13 @@ static int msm_ioctl_gem_info_set_iova(struct drm_device *dev,return -EINVAL ;/* Only supported if per-process address space is supported: */ -if (priv->gpu->aspace == ctx->aspace) +if (priv->gpu->vm == ctx->vm)return UERR (EOPNOTSUPP , dev,"requires per-process pgtables" );if (should_fail (&fail_gem_iova, obj->size))return -ENOMEM ; -return msm_gem_set_iova (obj, ctx->aspace, iova); +return msm_gem_set_iova (obj, ctx->vm, iova); } static int msm_ioctl_gem_info_set_metadata(struct drm_gem_object *obj,
drivers/gpu/drm/msm/msm_drv.h +5 -5
@@ -48,7 +48,7 @@ struct msm_rd_state;struct msm_perf_state ;struct msm_gem_submit ;struct msm_fence_context ; -struct msm_gem_address_space ; +struct msm_gem_vm ;struct msm_gem_vma ;struct msm_disp_state ;
@@ -264,7 +264,7 @@ void msm_crtc_disable_vblank(struct drm_crtc *crtc);int msm_register_mmu (struct drm_device *dev,struct msm_mmu *mmu);void msm_unregister_mmu (struct drm_device *dev,struct msm_mmu *mmu); -struct msm_gem_address_space *msm_kms_init_aspace (struct drm_device *dev); +struct msm_gem_vm *msm_kms_init_vm (struct drm_device *dev);bool msm_use_mmu (struct drm_device *dev); int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
@@ -286,11 +286,11 @@ int msm_gem_prime_pin(struct drm_gem_object *obj);void msm_gem_prime_unpin (struct drm_gem_object *obj);int msm_framebuffer_prepare (struct drm_framebuffer *fb, -struct msm_gem_address_space *aspace,bool needs_dirtyfb); +struct msm_gem_vm *vm,bool needs_dirtyfb);void msm_framebuffer_cleanup (struct drm_framebuffer *fb, -struct msm_gem_address_space *aspace,bool needed_dirtyfb); +struct msm_gem_vm *vm,bool needed_dirtyfb);uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb, -struct msm_gem_address_space *aspace,int plane); +struct msm_gem_vm *vm,int plane);struct drm_gem_object *msm_framebuffer_bo (struct drm_framebuffer *fb,int plane);const struct msm_format *msm_framebuffer_format (struct drm_framebuffer *fb); struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev,
drivers/gpu/drm/msm/msm_fb.c +5 -5
@@ -76,7 +76,7 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m)/* prepare/pin all the fb's bo's for scanout. */ int msm_framebuffer_prepare (struct drm_framebuffer *fb, -struct msm_gem_address_space *aspace, +struct msm_gem_vm *vm,bool needs_dirtyfb) {struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);
@@ -88,7 +88,7 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb,atomic_inc (&msm_fb->prepare_count);for (i =0 ; i < n; i++) { - ret =msm_gem_get_and_pin_iova (fb->obj[i], aspace, &msm_fb->iova[i]); + ret =msm_gem_get_and_pin_iova (fb->obj[i], vm, &msm_fb->iova[i]);drm_dbg_state (fb->dev,"FB[%u]: iova[%d]: %08llx (%d)\n" , fb->base.id, i, msm_fb->iova[i], ret);if (ret)
@@ -99,7 +99,7 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, }void msm_framebuffer_cleanup (struct drm_framebuffer *fb, -struct msm_gem_address_space *aspace, +struct msm_gem_vm *vm,bool needed_dirtyfb) {struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);
@@ -109,14 +109,14 @@ void msm_framebuffer_cleanup(struct drm_framebuffer *fb,refcount_dec (&msm_fb->dirtyfb);for (i =0 ; i < n; i++) -msm_gem_unpin_iova (fb->obj[i], aspace); +msm_gem_unpin_iova (fb->obj[i], vm);if (!atomic_dec_return (&msm_fb->prepare_count))memset (msm_fb->iova,0 ,sizeof (msm_fb->iova)); }uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb, -struct msm_gem_address_space *aspace,int plane) +struct msm_gem_vm *vm,int plane) {struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);return msm_fb->iova[plane] + fb->offsets[plane];
drivers/gpu/drm/msm/msm_fbdev.c +1 -1
@@ -122,7 +122,7 @@ int msm_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,* in panic (ie. lock-safe, etc) we could avoid pinning the * buffer now: */ - ret =msm_gem_get_and_pin_iova (bo, priv->kms->aspace, &paddr); + ret =msm_gem_get_and_pin_iova (bo, priv->kms->vm, &paddr);if (ret) {DRM_DEV_ERROR (dev->dev,"failed to get buffer obj iova: %d\n" , ret); goto fail;
drivers/gpu/drm/msm/msm_gem.c +37 -37
244 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem.h +17 -17
@@ -22,7 +22,7 @@#define MSM_BO_STOLEN 0x10000000/* try to use stolen/splash memory */ #define MSM_BO_MAP_PRIV 0x20000000/* use IOMMU_PRIV when mapping */ -struct msm_gem_address_space { +struct msm_gem_vm {const char *name;/* NOTE: mm managed at the page level, size is in # of pages * and position mm_node->start is in # of pages:
@@ -47,13 +47,13 @@ struct msm_gem_address_space {uint64_t va_size; }; -struct msm_gem_address_space * -msm_gem_address_space_get (struct msm_gem_address_space *aspace); +struct msm_gem_vm * +msm_gem_vm_get (struct msm_gem_vm *vm); -void msm_gem_address_space_put (struct msm_gem_address_space *aspace); +void msm_gem_vm_put (struct msm_gem_vm *vm); -struct msm_gem_address_space * -msm_gem_address_space_create (struct msm_mmu *mmu,const char *name, +struct msm_gem_vm * +msm_gem_vm_create (struct msm_mmu *mmu,const char *name,u64 va_start,u64 size);struct msm_fence_context ;
@@ -61,12 +61,12 @@ struct msm_fence_context;struct msm_gem_vma {struct drm_mm_node node;uint64_t iova; -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;struct list_head list;/* node in msm_gem_object::vmas */ bool mapped; }; -struct msm_gem_vma *msm_gem_vma_new (struct msm_gem_address_space *aspace); +struct msm_gem_vma *msm_gem_vma_new (struct msm_gem_vm *vm);int msm_gem_vma_init (struct msm_gem_vma *vma,int size,u64 range_start,u64 range_end);void msm_gem_vma_purge (struct msm_gem_vma *vma);
@@ -127,18 +127,18 @@ int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct msm_gem_vma *vma);void msm_gem_unpin_locked (struct drm_gem_object *obj);void msm_gem_unpin_active (struct drm_gem_object *obj);struct msm_gem_vma *msm_gem_get_vma_locked (struct drm_gem_object *obj, -struct msm_gem_address_space *aspace); +struct msm_gem_vm *vm);int msm_gem_get_iova (struct drm_gem_object *obj, -struct msm_gem_address_space *aspace,uint64_t *iova); +struct msm_gem_vm *vm,uint64_t *iova);int msm_gem_set_iova (struct drm_gem_object *obj, -struct msm_gem_address_space *aspace,uint64_t iova); +struct msm_gem_vm *vm,uint64_t iova);int msm_gem_get_and_pin_iova_range (struct drm_gem_object *obj, -struct msm_gem_address_space *aspace,uint64_t *iova, +struct msm_gem_vm *vm,uint64_t *iova,u64 range_start,u64 range_end);int msm_gem_get_and_pin_iova (struct drm_gem_object *obj, -struct msm_gem_address_space *aspace,uint64_t *iova); +struct msm_gem_vm *vm,uint64_t *iova);void msm_gem_unpin_iova (struct drm_gem_object *obj, -struct msm_gem_address_space *aspace); +struct msm_gem_vm *vm);void msm_gem_pin_obj_locked (struct drm_gem_object *obj);struct page **msm_gem_pin_pages_locked (struct drm_gem_object *obj);void msm_gem_unpin_pages_locked (struct drm_gem_object *obj);
@@ -160,10 +160,10 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,struct drm_gem_object *msm_gem_new (struct drm_device *dev,uint32_t size,uint32_t flags);void *msm_gem_kernel_new (struct drm_device *dev,uint32_t size, -uint32_t flags,struct msm_gem_address_space *aspace, +uint32_t flags,struct msm_gem_vm *vm,struct drm_gem_object **bo,uint64_t *iova);void msm_gem_kernel_put (struct drm_gem_object *bo, -struct msm_gem_address_space *aspace); +struct msm_gem_vm *vm);struct drm_gem_object *msm_gem_import (struct drm_device *dev,struct dma_buf *dmabuf,struct sg_table *sgt);__printf (2 ,3 )
@@ -257,7 +257,7 @@ struct msm_gem_submit {struct kref ref;struct drm_device *dev;struct msm_gpu *gpu; -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;struct list_head node;/* node in ring submit list */ struct drm_exec exec;uint32_t seqno;/* Sequence number of the submit on the ring */
drivers/gpu/drm/msm/msm_gem_submit.c +3 -3
@@ -63,7 +63,7 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,kref_init (&submit->ref); submit->dev = dev; - submit->aspace = queue->ctx->aspace; + submit->vm = queue->ctx->vm; submit->gpu = gpu; submit->cmd = (void *)&submit->bos[nr_bos]; submit->queue = queue;
@@ -311,7 +311,7 @@ static int submit_pin_objects(struct msm_gem_submit *submit)struct msm_gem_vma *vma;/* if locking succeeded, pin bo: */ - vma =msm_gem_get_vma_locked (obj, submit->aspace); + vma =msm_gem_get_vma_locked (obj, submit->vm);if (IS_ERR (vma)) { ret =PTR_ERR (vma);break ;
@@ -669,7 +669,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,if (args->pad)return -EINVAL ; -if (unlikely (!ctx->aspace) && !capable (CAP_SYS_RAWIO )) { +if (unlikely (!ctx->vm) && !capable (CAP_SYS_RAWIO )) {DRM_ERROR_RATELIMITED ("IOMMU support or CAP_SYS_RAWIO required!\n" );return -EPERM ; }
drivers/gpu/drm/msm/msm_gem_vma.c +46 -47
193 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gpu.c +23 -23
100 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gpu.h +7 -9
@@ -78,10 +78,8 @@ struct msm_gpu_funcs {/* note: gpu_set_freq() can assume that we have been pm_resumed */ void (*gpu_set_freq)(struct msm_gpu *gpu,struct dev_pm_opp *opp,bool suspended); -struct msm_gem_address_space *(*create_address_space) - (struct msm_gpu *gpu,struct platform_device *pdev); -struct msm_gem_address_space *(*create_private_address_space) - (struct msm_gpu *gpu); +struct msm_gem_vm *(*create_vm)(struct msm_gpu *gpu,struct platform_device *pdev); +struct msm_gem_vm *(*create_private_vm)(struct msm_gpu *gpu);uint32_t (*get_rptr)(struct msm_gpu *gpu,struct msm_ringbuffer *ring);/**
@@ -236,7 +234,7 @@ struct msm_gpu {void __iomem *mmio;int irq; -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;/* Power Control: */ struct regulator *gpu_reg, *gpu_cx;
@@ -358,8 +356,8 @@ struct msm_context {*/ int queueid; -/** @aspace: the per-process GPU address-space */ -struct msm_gem_address_space *aspace; +/** @vm: the per-process GPU address-space */ +struct msm_gem_vm *vm;/** @kref: the reference count */ struct kref ref;
@@ -669,8 +667,8 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, const char *name, struct msm_gpu_config *config); -struct msm_gem_address_space * -msm_gpu_create_private_address_space (struct msm_gpu *gpu,struct task_struct *task); +struct msm_gem_vm * +msm_gpu_create_private_vm (struct msm_gpu *gpu,struct task_struct *task);void msm_gpu_cleanup (struct msm_gpu *gpu);
drivers/gpu/drm/msm/msm_kms.c +8 -8
@@ -176,9 +176,9 @@ static int msm_kms_fault_handler(void *arg, unsigned long iova, int flags, voidreturn -ENOSYS ; } -struct msm_gem_address_space *msm_kms_init_aspace (struct drm_device *dev) +struct msm_gem_vm *msm_kms_init_vm (struct drm_device *dev) { -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;struct msm_mmu *mmu;struct device *mdp_dev = dev->dev;struct device *mdss_dev = mdp_dev->parent;
@@ -204,17 +204,17 @@ struct msm_gem_address_space *msm_kms_init_aspace(struct drm_device *dev)return NULL ; } - aspace =msm_gem_address_space_create (mmu,"mdp_kms" , + vm =msm_gem_vm_create (mmu,"mdp_kms" ,0x1000 ,0x100000000 -0x1000 ); -if (IS_ERR (aspace)) { -dev_err (mdp_dev,"aspace create, error %pe\n" , aspace); +if (IS_ERR (vm)) { +dev_err (mdp_dev,"vm create, error %pe\n" , vm); mmu->funcs->destroy (mmu); -return aspace; +return vm; } -msm_mmu_set_fault_handler (aspace->mmu, kms, msm_kms_fault_handler); +msm_mmu_set_fault_handler (vm->mmu, kms, msm_kms_fault_handler); -return aspace; +return vm; }void msm_drm_kms_uninit (struct device *dev)
drivers/gpu/drm/msm/msm_kms.h +1 -1
@@ -139,7 +139,7 @@ struct msm_kms {atomic_t fault_snapshot_capture;/* mapper-id used to request GEM buffer mapped for scanout: */ -struct msm_gem_address_space *aspace; +struct msm_gem_vm *vm;/* disp snapshot support */ struct kthread_worker *dump_worker;
drivers/gpu/drm/msm/msm_ringbuffer.c +2 -2
@@ -84,7 +84,7 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int id, ring->start =msm_gem_kernel_new (gpu->dev,MSM_GPU_RINGBUFFER_SZ ,check_apriv (gpu,MSM_BO_WC |MSM_BO_GPU_READONLY ), - gpu->aspace, &ring->bo, &ring->iova); + gpu->vm, &ring->bo, &ring->iova);if (IS_ERR (ring->start)) { ret =PTR_ERR (ring->start);
@@ -131,7 +131,7 @@ void msm_ringbuffer_destroy(struct msm_ringbuffer *ring)msm_fence_context_free (ring->fctx); -msm_gem_kernel_put (ring->bo, ring->gpu->aspace); +msm_gem_kernel_put (ring->bo, ring->gpu->vm);kfree (ring); }
drivers/gpu/drm/msm/msm_submitqueue.c +1 -1
@@ -59,7 +59,7 @@ void __msm_context_destroy(struct kref *kref)kfree (ctx->entities[i]); } -msm_gem_address_space_put (ctx->aspace); +msm_gem_vm_put (ctx->vm);kfree (ctx->comm);kfree (ctx->cmdline);kfree (ctx);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 7/42 drm/msm: Remove vram carveout support
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
It is standing in the way of drm_gpuvm / VM_BIND support. Not to mention frequently broken and rarely tested. And I think only needed for a 10yr old not quite upstream SoC (msm8974).
Maybe we can add support back in later, but I'm doubtful.
--- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 8 -- drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 15 --- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 15 --- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 3 +- drivers/gpu/drm/msm/adreno/adreno_device.c | 4 - drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 +- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 1 - drivers/gpu/drm/msm/msm_drv.c | 117 +----------------- drivers/gpu/drm/msm/msm_drv.h | 11 -- drivers/gpu/drm/msm/msm_gem.c | 131 ++------------------- drivers/gpu/drm/msm/msm_gem.h | 5 - drivers/gpu/drm/msm/msm_gem_submit.c | 5 - drivers/gpu/drm/msm/msm_gpu.c | 6 +- 14 files changed, 19 insertions(+), 309 deletions(-)
drivers/gpu/drm/msm/adreno/a2xx_gpu.c +0 -8
@@ -551,14 +551,6 @@ struct msm_gpu *a2xx_gpu_init(struct drm_device *dev)else adreno_gpu->registers = a220_registers; -if (!gpu->vm) { -dev_err (dev->dev,"No memory protection without MMU\n" ); -if (!allow_vram_carveout) { - ret = -ENXIO ; - goto fail; - } - } -return gpu; fail:
drivers/gpu/drm/msm/adreno/a3xx_gpu.c +0 -15
@@ -581,21 +581,6 @@ struct msm_gpu *a3xx_gpu_init(struct drm_device *dev) goto fail; } -if (!gpu->vm) { -/* TODO we think it is possible to configure the GPU to -* restrict access to VRAM carveout. But the required -* registers are unknown. For now just bail out and -* limp along with just modesetting. If it turns out -* to not be possible to restrict access, then we must -* implement a cmdstream validator. -*/ -DRM_DEV_ERROR (dev->dev,"No memory protection without IOMMU\n" ); -if (!allow_vram_carveout) { - ret = -ENXIO ; - goto fail; - } - } - icc_path =devm_of_icc_get (&pdev->dev,"gfx-mem" );if (IS_ERR (icc_path)) { ret =PTR_ERR (icc_path);
drivers/gpu/drm/msm/adreno/a4xx_gpu.c +0 -15
@@ -695,21 +695,6 @@ struct msm_gpu *a4xx_gpu_init(struct drm_device *dev) adreno_gpu->uche_trap_base =0xffff0000ffff0000ull ; -if (!gpu->vm) { -/* TODO we think it is possible to configure the GPU to -* restrict access to VRAM carveout. But the required -* registers are unknown. For now just bail out and -* limp along with just modesetting. If it turns out -* to not be possible to restrict access, then we must -* implement a cmdstream validator. -*/ -DRM_DEV_ERROR (dev->dev,"No memory protection without IOMMU\n" ); -if (!allow_vram_carveout) { - ret = -ENXIO ; - goto fail; - } - } - icc_path =devm_of_icc_get (&pdev->dev,"gfx-mem" );if (IS_ERR (icc_path)) { ret =PTR_ERR (icc_path);
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +1 -2
@@ -1786,8 +1786,7 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)return ERR_PTR (ret); } -if (gpu->vm) -msm_mmu_set_fault_handler (gpu->vm->mmu, gpu, a5xx_fault_handler); +msm_mmu_set_fault_handler (gpu->vm->mmu, gpu, a5xx_fault_handler);/* Set up the preemption specific bits and pieces for each ringbuffer */ a5xx_preempt_init (gpu);
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -2
@@ -2560,8 +2560,7 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) adreno_gpu->uche_trap_base =0x1fffffffff000ull ; -if (gpu->vm) -msm_mmu_set_fault_handler (gpu->vm->mmu, gpu, a6xx_fault_handler); +msm_mmu_set_fault_handler (gpu->vm->mmu, gpu, a6xx_fault_handler);a6xx_calc_ubwc_config (adreno_gpu);/* Set up the preemption specific bits and pieces for each ringbuffer */
drivers/gpu/drm/msm/adreno/adreno_device.c +0 -4
@@ -16,10 +16,6 @@ bool snapshot_debugbus = false;MODULE_PARM_DESC (snapshot_debugbus,"Include debugbus sections in GPU devcoredump (if not fused off)" );module_param_named (snapshot_debugbus, snapshot_debugbus, bool,0600 ); -bool allow_vram_carveout = false; -MODULE_PARM_DESC (allow_vram_carveout,"Allow using VRAM Carveout, in place of IOMMU" ); -module_param_named (allow_vram_carveout, allow_vram_carveout, bool,0600 ); -int enable_preemption =-1 ;MODULE_PARM_DESC (enable_preemption,"Enable preemption (A7xx only) (1=on , 0=disable, -1=auto (default))" );module_param (enable_preemption, int,0600 );
drivers/gpu/drm/msm/adreno/adreno_gpu.c +3 -1
@@ -209,7 +209,9 @@ adreno_iommu_create_vm(struct msm_gpu *gpu,u64 start, size; mmu =msm_iommu_gpu_new (&pdev->dev, gpu, quirks); -if (IS_ERR_OR_NULL (mmu)) +if (!mmu) +return ERR_PTR (-ENODEV ); +else if (IS_ERR_OR_NULL (mmu))return ERR_CAST (mmu); geometry =msm_iommu_get_geometry (mmu);
drivers/gpu/drm/msm/adreno/adreno_gpu.h +0 -1
@@ -18,7 +18,6 @@#include "adreno_pm4.xml.h" extern bool snapshot_debugbus; -extern bool allow_vram_carveout;enum {ADRENO_FW_PM4 =0 ,
drivers/gpu/drm/msm/msm_drv.c +1 -116
152 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.h +0 -11
@@ -183,17 +183,6 @@ struct msm_drm_private {struct msm_drm_thread event_thread[MAX_CRTCS ]; -/* VRAM carveout, used when no IOMMU: */ -struct { -unsigned long size; -dma_addr_t paddr; -/* NOTE: mm managed at the page level, size is in # of pages -* and position mm_node->start is in # of pages: -*/ -struct drm_mm mm; -spinlock_t lock;/* Protects drm_mm node allocation/removal */ - } vram; -struct notifier_block vmap_notifier;struct shrinker *shrinker;
drivers/gpu/drm/msm/msm_gem.c +12 -119
185 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem.h +0 -5
@@ -102,11 +102,6 @@ struct msm_gem_object {struct list_head vmas;/* list of msm_gem_vma */ -/* For physically contiguous buffers. Used when we don't have -* an IOMMU. Also used for stolen/splashscreen buffer. -*/ -struct drm_mm_node *vram_node; -char name[32 ];/* Identifier to print for the debugfs files */ /* userspace metadata backchannel */
drivers/gpu/drm/msm/msm_gem_submit.c +0 -5
@@ -669,11 +669,6 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,if (args->pad)return -EINVAL ; -if (unlikely (!ctx->vm) && !capable (CAP_SYS_RAWIO )) { -DRM_ERROR_RATELIMITED ("IOMMU support or CAP_SYS_RAWIO required!\n" ); -return -EPERM ; - } -/* for now, we just have 3d pipe.. eventually this would need to * be more clever to dispatch to appropriate gpu module: */
drivers/gpu/drm/msm/msm_gpu.c +1 -5
@@ -942,12 +942,8 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev,msm_devfreq_init (gpu); - gpu->vm = gpu->funcs->create_vm (gpu, pdev); - -if (gpu->vm ==NULL ) -DRM_DEV_INFO (drm->dev,"%s: no IOMMU, fallback to VRAM carveout!\n" , name); -else if (IS_ERR (gpu->vm)) { +if (IS_ERR (gpu->vm)) { ret =PTR_ERR (gpu->vm); goto fail; }
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 8/42 drm/msm: Collapse vma allocation and initialization
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Now that we've dropped vram carveout support, we can collapse vma allocation and initialization. This better matches how things work with drm_gpuvm.
--- drivers/gpu/drm/msm/msm_gem.c | 30 +++----------------------- drivers/gpu/drm/msm/msm_gem.h | 4 ++-- drivers/gpu/drm/msm/msm_gem_vma.c | 36 +++++++++++++------------------ 3 files changed, 20 insertions(+), 50 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +3 -27
@@ -333,23 +333,6 @@ uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj)return offset; } -static struct msm_gem_vma *add_vma (struct drm_gem_object *obj, -struct msm_gem_vm *vm) -{ -struct msm_gem_object *msm_obj =to_msm_bo (obj); -struct msm_gem_vma *vma; - -msm_gem_assert_locked (obj); - - vma =msm_gem_vma_new (vm); -if (!vma) -return ERR_PTR (-ENOMEM ); - -list_add_tail (&vma->list, &msm_obj->vmas); - -return vma; -} -static struct msm_gem_vma *lookup_vma (struct drm_gem_object *obj,struct msm_gem_vm *vm) {
@@ -416,6 +399,7 @@ static struct msm_gem_vma *get_vma_locked(struct drm_gem_object *obj,struct msm_gem_vm *vm, u64 range_start, u64 range_end) { + struct msm_gem_object *msm_obj = to_msm_bo(obj);struct msm_gem_vma *vma;msm_gem_assert_locked (obj);
@@ -423,18 +407,10 @@ static struct msm_gem_vma *get_vma_locked(struct drm_gem_object *obj, vma =lookup_vma (obj, vm);if (!vma) { -int ret; - - vma =add_vma (obj, vm); + vma =msm_gem_vma_new (vm, obj, range_start, range_end);if (IS_ERR (vma))return vma; - - ret =msm_gem_vma_init (vma, obj->size, - range_start, range_end); -if (ret) { -del_vma (vma); -return ERR_PTR (ret); - } +list_add_tail (&vma->list, &msm_obj->vmas); }else {GEM_WARN_ON (vma->iova < range_start);GEM_WARN_ON ((vma->iova + obj->size) > range_end);
drivers/gpu/drm/msm/msm_gem.h +2 -2
@@ -66,8 +66,8 @@ struct msm_gem_vma {bool mapped; }; -struct msm_gem_vma *msm_gem_vma_new (struct msm_gem_vm *vm); -int msm_gem_vma_init (struct msm_gem_vma *vma,int size, +struct msm_gem_vma * +msm_gem_vma_new (struct msm_gem_vm *vm,struct drm_gem_object *obj,u64 range_start,u64 range_end);void msm_gem_vma_purge (struct msm_gem_vma *vma);int msm_gem_vma_map (struct msm_gem_vma *vma,int prot,struct sg_table *sgt,int size);
drivers/gpu/drm/msm/msm_gem_vma.c +15 -21
@@ -106,47 +106,41 @@ void msm_gem_vma_close(struct msm_gem_vma *vma)msm_gem_vm_put (vm); } -struct msm_gem_vma *msm_gem_vma_new (struct msm_gem_vm *vm) +/* Create a new vma and allocate an iova for it */ +struct msm_gem_vma * +msm_gem_vma_new (struct msm_gem_vm *vm,struct drm_gem_object *obj, +u64 range_start,u64 range_end) {struct msm_gem_vma *vma; +int ret; vma =kzalloc (sizeof (*vma),GFP_KERNEL );if (!vma) -return NULL ; +return ERR_PTR (-ENOMEM ); vma->vm = vm; -return vma; -} - -/* Initialize a new vma and allocate an iova for it */ -int msm_gem_vma_init (struct msm_gem_vma *vma,int size, -u64 range_start,u64 range_end) -{ -struct msm_gem_vm *vm = vma->vm; -int ret; - -if (GEM_WARN_ON (!vm)) -return -EINVAL ; - -if (GEM_WARN_ON (vma->iova)) -return -EBUSY ; -spin_lock (&vm->lock); ret =drm_mm_insert_node_in_range (&vm->mm, &vma->node, - size,PAGE_SIZE ,0 , + obj->size,PAGE_SIZE ,0 , range_start, range_end,0 );spin_unlock (&vm->lock);if (ret) -return ret; + goto err_free_vma; vma->iova = vma->node.start; vma->mapped = false; +INIT_LIST_HEAD (&vma->list); +kref_get (&vm->kref); -return 0 ; +return vma; + +err_free_vma: +kfree (vma); +return ERR_PTR (ret); } struct msm_gem_vm *
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 9/42 drm/msm: Collapse vma close and delete
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
This fits better drm_gpuvm/drm_gpuva.
--- drivers/gpu/drm/msm/msm_gem.c | 16 +++------------- drivers/gpu/drm/msm/msm_gem_vma.c | 2 ++ 2 files changed, 5 insertions(+), 13 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +3 -13
@@ -349,15 +349,6 @@ static struct msm_gem_vma *lookup_vma(struct drm_gem_object *obj,return NULL ; } -static void del_vma (struct msm_gem_vma *vma) -{ -if (!vma) -return ; - -list_del (&vma->list); -kfree (vma); -} -/* * If close is true, this also closes the VMA (releasing the allocated * iova range) in addition to removing the iommu mapping. In the eviction
@@ -368,11 +359,11 @@ static void put_iova_spaces(struct drm_gem_object *obj, bool close) {struct msm_gem_object *msm_obj =to_msm_bo (obj); -struct msm_gem_vma *vma; +struct msm_gem_vma *vma, *tmp;msm_gem_assert_locked (obj); -list_for_each_entry (vma, &msm_obj->vmas, list) { +list_for_each_entry_safe (vma, tmp, &msm_obj->vmas, list) {if (vma->vm) {msm_gem_vma_purge (vma);if (close)
@@ -391,7 +382,7 @@ put_iova_vmas(struct drm_gem_object *obj)msm_gem_assert_locked (obj);list_for_each_entry_safe (vma, tmp, &msm_obj->vmas, list) { -del_vma (vma); +msm_gem_vma_close (vma); } }
@@ -556,7 +547,6 @@ static int clear_iova(struct drm_gem_object *obj,msm_gem_vma_purge (vma);msm_gem_vma_close (vma); -del_vma (vma);return 0 ; }
drivers/gpu/drm/msm/msm_gem_vma.c +2 -0
@@ -102,8 +102,10 @@ void msm_gem_vma_close(struct msm_gem_vma *vma)spin_unlock (&vm->lock); vma->iova =0 ; +list_del (&vma->list);msm_gem_vm_put (vm); +kfree (vma); }/* Create a new vma and allocate an iova for it */
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 10/42 drm/msm: Don't close VMAs on purge
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Previously we'd also tear down the VMA, making the address space available again. But with drm_gpuvm conversion, this would require holding the locks of all VMs the GEM object is mapped in. Which is problematic for the shrinker.
Instead just let the VMA hang around until the GEM object is freed.
--- drivers/gpu/drm/msm/msm_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gem.c +1 -1
@@ -755,7 +755,7 @@ void msm_gem_purge(struct drm_gem_object *obj)GEM_WARN_ON (!is_purgeable (msm_obj));/* Get rid of any iommu mapping(s): */ -put_iova_spaces (obj, true); +put_iova_spaces (obj, false);msm_gem_vunmap (obj);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 11/42 drm/msm: Stop passing vm to msm_framebuffer
In reply to Rob ClarkThe fb only deals with kms->vm, so make that explicit. This will start letting us refcount the # of times the fb is pinned, so we can only unpin the vma after last user of the fb is done. Having a single reference count really only works if there is only a single vm.
--- .../drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 11 +++------- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 18 +++++++---------- drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 3 +-- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 20 ++++++------------- drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 2 -- drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 18 ++++++----------- drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 18 ++++++----------- drivers/gpu/drm/msm/msm_drv.h | 9 +++------ drivers/gpu/drm/msm/msm_fb.c | 15 +++++++------- 9 files changed, 39 insertions(+), 75 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c +3 -8
@@ -566,7 +566,6 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct dpu_encoder_phys *phys_enc struct drm_writeback_job *job) {const struct msm_format *format; -struct msm_gem_vm *vm;struct dpu_hw_wb_cfg *wb_cfg;int ret;struct dpu_encoder_phys_wb *wb_enc =to_dpu_encoder_phys_wb (phys_enc);
@@ -576,13 +575,12 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct dpu_encoder_phys *phys_enc wb_enc->wb_job = job; wb_enc->wb_conn = job->connector; - vm = phys_enc->dpu_kms->base.vm; wb_cfg = &wb_enc->wb_cfg;memset (wb_cfg,0 ,sizeof (struct dpu_hw_wb_cfg )); - ret =msm_framebuffer_prepare (job->fb, vm, false); + ret =msm_framebuffer_prepare (job->fb, false);if (ret) {DPU_ERROR ("prep fb failed, %d\n" , ret);return ;
@@ -596,7 +594,7 @@ static void dpu_encoder_phys_wb_prepare_wb_job(struct dpu_encoder_phys *phys_encreturn ; } -dpu_format_populate_addrs (vm, job->fb, &wb_cfg->dest); +dpu_format_populate_addrs (job->fb, &wb_cfg->dest); wb_cfg->dest.width = job->fb->width; wb_cfg->dest.height = job->fb->height;
@@ -619,14 +617,11 @@ static void dpu_encoder_phys_wb_cleanup_wb_job(struct dpu_encoder_phys *phys_enc struct drm_writeback_job *job) {struct dpu_encoder_phys_wb *wb_enc =to_dpu_encoder_phys_wb (phys_enc); -struct msm_gem_vm *vm;if (!job->fb)return ; - vm = phys_enc->dpu_kms->base.vm; - -msm_framebuffer_cleanup (job->fb, vm, false); +msm_framebuffer_cleanup (job->fb, false); wb_enc->wb_job =NULL ; wb_enc->wb_conn =NULL ; }
drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c +7 -11
@@ -274,15 +274,14 @@ int dpu_format_populate_plane_sizes(return _dpu_format_populate_plane_sizes_linear (fmt, fb, layout); } -static void _dpu_format_populate_addrs_ubwc (struct msm_gem_vm *vm, -struct drm_framebuffer *fb, +static void _dpu_format_populate_addrs_ubwc (struct drm_framebuffer *fb,struct dpu_hw_fmt_layout *layout) {const struct msm_format *fmt;uint32_t base_addr =0 ;bool meta; - base_addr =msm_framebuffer_iova (fb, vm,0 ); + base_addr =msm_framebuffer_iova (fb,0 ); fmt =msm_framebuffer_format (fb); meta =MSM_FORMAT_IS_UBWC (fmt);
@@ -355,26 +354,23 @@ static void _dpu_format_populate_addrs_ubwc(struct msm_gem_vm *vm, } } -static void _dpu_format_populate_addrs_linear (struct msm_gem_vm *vm, -struct drm_framebuffer *fb, +static void _dpu_format_populate_addrs_linear (struct drm_framebuffer *fb,struct dpu_hw_fmt_layout *layout) {unsigned int i;/* Populate addresses for simple formats here */ for (i =0 ; i < layout->num_planes; ++i) - layout->plane_addr[i] =msm_framebuffer_iova (fb, vm, i); + layout->plane_addr[i] =msm_framebuffer_iova (fb, i); }/** * dpu_format_populate_addrs - populate buffer addresses based on * mmu, fb, and format found in the fb -* @vm: address space pointer * @fb: framebuffer pointer * @layout: format layout structure to populate */ -void dpu_format_populate_addrs (struct msm_gem_vm *vm, -struct drm_framebuffer *fb, +void dpu_format_populate_addrs (struct drm_framebuffer *fb,struct dpu_hw_fmt_layout *layout) {const struct msm_format *fmt;
@@ -384,7 +380,7 @@ void dpu_format_populate_addrs(struct msm_gem_vm *vm,/* Populate the addresses given the fb */ if (MSM_FORMAT_IS_UBWC (fmt) ||MSM_FORMAT_IS_TILE (fmt)) -_dpu_format_populate_addrs_ubwc (vm, fb, layout); +_dpu_format_populate_addrs_ubwc (fb, layout);else -_dpu_format_populate_addrs_linear (vm, fb, layout); +_dpu_format_populate_addrs_linear (fb, layout); }
drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h +1 -2
@@ -31,8 +31,7 @@ static inline bool dpu_find_format(u32 format, const u32 *supported_formats,return false; } -void dpu_format_populate_addrs (struct msm_gem_vm *vm, -struct drm_framebuffer *fb, +void dpu_format_populate_addrs (struct drm_framebuffer *fb,struct dpu_hw_fmt_layout *layout); int dpu_format_populate_plane_sizes(
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +6 -14
@@ -646,7 +646,6 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,struct drm_framebuffer *fb = new_state->fb;struct dpu_plane *pdpu =to_dpu_plane (plane);struct dpu_plane_state *pstate =to_dpu_plane_state (new_state); -struct dpu_kms *kms =_dpu_plane_get_kms (&pdpu->base);int ret;if (!new_state->fb)
@@ -654,9 +653,6 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,DPU_DEBUG_PLANE (pdpu,"FB[%u]\n" , fb->base.id); -/* cache vm */ - pstate->vm = kms->base.vm; -/* * TODO: Need to sort out the msm_framebuffer_prepare() call below so * we can use msm_atomic_prepare_fb() instead of doing the
@@ -664,13 +660,10 @@ static int dpu_plane_prepare_fb(struct drm_plane *plane,*/ drm_gem_plane_helper_prepare_fb (plane, new_state); -if (pstate->vm) { - ret =msm_framebuffer_prepare (new_state->fb, - pstate->vm, pstate->needs_dirtyfb); -if (ret) { -DPU_ERROR ("failed to prepare framebuffer\n" ); -return ret; - } + ret =msm_framebuffer_prepare (new_state->fb, pstate->needs_dirtyfb); +if (ret) { +DPU_ERROR ("failed to prepare framebuffer\n" ); +return ret; }return 0 ;
@@ -689,8 +682,7 @@ static void dpu_plane_cleanup_fb(struct drm_plane *plane,DPU_DEBUG_PLANE (pdpu,"FB[%u]\n" , old_state->fb->base.id); -msm_framebuffer_cleanup (old_state->fb, old_pstate->vm, - old_pstate->needs_dirtyfb); +msm_framebuffer_cleanup (old_state->fb, old_pstate->needs_dirtyfb); } static int dpu_plane_check_inline_rotation(struct dpu_plane *pdpu,
@@ -1457,7 +1449,7 @@ static void dpu_plane_sspp_atomic_update(struct drm_plane *plane, pstate->needs_qos_remap |= (is_rt_pipe != pdpu->is_rt_pipe); pdpu->is_rt_pipe = is_rt_pipe; -dpu_format_populate_addrs (pstate->vm, new_state->fb, &pstate->layout); +dpu_format_populate_addrs (new_state->fb, &pstate->layout); DPU_DEBUG_PLANE(pdpu, "FB[%u] " DRM_RECT_FP_FMT "->crtc%u " DRM_RECT_FMT ", %p4cc ubwc %d\n", fb->base.id, DRM_RECT_FP_ARG(&state->src),
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h +0 -2
@@ -17,7 +17,6 @@/** * struct dpu_plane_state: Define dpu extension of drm plane state object * @base: base drm plane state object -* @vm: pointer to address space for input/output buffers * @pipe: software pipe description * @r_pipe: software pipe description of the second pipe * @pipe_cfg: software pipe configuration
@@ -34,7 +33,6 @@*/ struct dpu_plane_state {struct drm_plane_state base; -struct msm_gem_vm *vm;struct dpu_sw_pipe pipe;struct dpu_sw_pipe r_pipe;struct dpu_sw_pipe_cfg pipe_cfg;
drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c +6 -12
@@ -79,30 +79,25 @@ static const struct drm_plane_funcs mdp4_plane_funcs = {static int mdp4_plane_prepare_fb (struct drm_plane *plane,struct drm_plane_state *new_state) { -struct msm_drm_private *priv = plane->dev->dev_private; -struct msm_kms *kms = priv->kms; -if (!new_state->fb)return 0 ;drm_gem_plane_helper_prepare_fb (plane, new_state); -return msm_framebuffer_prepare (new_state->fb, kms->vm, false); +return msm_framebuffer_prepare (new_state->fb, false); }static void mdp4_plane_cleanup_fb (struct drm_plane *plane,struct drm_plane_state *old_state) {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane); -struct mdp4_kms *mdp4_kms =get_kms (plane); -struct msm_kms *kms = &mdp4_kms->base.base;struct drm_framebuffer *fb = old_state->fb;if (!fb)return ;DBG ("%s: cleanup: FB[%u]" , mdp4_plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, kms->vm, false); +msm_framebuffer_cleanup (fb, false); }
@@ -141,7 +136,6 @@ static void mdp4_plane_set_scanout(struct drm_plane *plane, {struct mdp4_plane *mdp4_plane =to_mdp4_plane (plane);struct mdp4_kms *mdp4_kms =get_kms (plane); -struct msm_kms *kms = &mdp4_kms->base.base;enum mdp4_pipe pipe = mdp4_plane->pipe; mdp4_write(mdp4_kms, REG_MDP4_PIPE_SRC_STRIDE_A(pipe),
@@ -153,13 +147,13 @@ static void mdp4_plane_set_scanout(struct drm_plane *plane, MDP4_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP0_BASE (pipe), -msm_framebuffer_iova (fb, kms->vm,0 )); +msm_framebuffer_iova (fb,0 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP1_BASE (pipe), -msm_framebuffer_iova (fb, kms->vm,1 )); +msm_framebuffer_iova (fb,1 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP2_BASE (pipe), -msm_framebuffer_iova (fb, kms->vm,2 )); +msm_framebuffer_iova (fb,2 ));mdp4_write (mdp4_kms,REG_MDP4_PIPE_SRCP3_BASE (pipe), -msm_framebuffer_iova (fb, kms->vm,3 )); +msm_framebuffer_iova (fb,3 )); } static void mdp4_write_csc_config(struct mdp4_kms *mdp4_kms,
drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c +6 -12
@@ -135,8 +135,6 @@ static const struct drm_plane_funcs mdp5_plane_funcs = {static int mdp5_plane_prepare_fb (struct drm_plane *plane,struct drm_plane_state *new_state) { -struct msm_drm_private *priv = plane->dev->dev_private; -struct msm_kms *kms = priv->kms;bool needs_dirtyfb =to_mdp5_plane_state (new_state)->needs_dirtyfb;if (!new_state->fb)
@@ -144,14 +142,12 @@ static int mdp5_plane_prepare_fb(struct drm_plane *plane,drm_gem_plane_helper_prepare_fb (plane, new_state); -return msm_framebuffer_prepare (new_state->fb, kms->vm, needs_dirtyfb); +return msm_framebuffer_prepare (new_state->fb, needs_dirtyfb); }static void mdp5_plane_cleanup_fb (struct drm_plane *plane,struct drm_plane_state *old_state) { -struct mdp5_kms *mdp5_kms =get_kms (plane); -struct msm_kms *kms = &mdp5_kms->base.base;struct drm_framebuffer *fb = old_state->fb;bool needed_dirtyfb =to_mdp5_plane_state (old_state)->needs_dirtyfb;
@@ -159,7 +155,7 @@ static void mdp5_plane_cleanup_fb(struct drm_plane *plane,return ;DBG ("%s: cleanup: FB[%u]" , plane->name, fb->base.id); -msm_framebuffer_cleanup (fb, kms->vm, needed_dirtyfb); +msm_framebuffer_cleanup (fb, needed_dirtyfb); } static int mdp5_plane_atomic_check_with_state(struct drm_crtc_state *crtc_state,
@@ -467,8 +463,6 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_kms,enum mdp5_pipe pipe, struct drm_framebuffer *fb) { - struct msm_kms *kms = &mdp5_kms->base.base; -mdp5_write (mdp5_kms ,REG_MDP5_PIPE_SRC_STRIDE_A (pipe ), MDP5_PIPE_SRC_STRIDE_A_P0(fb->pitches[0]) | MDP5_PIPE_SRC_STRIDE_A_P1(fb->pitches[1]));
@@ -478,13 +472,13 @@ static void set_scanout_locked(struct mdp5_kms *mdp5_kms, MDP5_PIPE_SRC_STRIDE_B_P3(fb->pitches[3]));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC0_ADDR (pipe), -msm_framebuffer_iova (fb, kms->vm,0 )); +msm_framebuffer_iova (fb,0 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC1_ADDR (pipe), -msm_framebuffer_iova (fb, kms->vm,1 )); +msm_framebuffer_iova (fb,1 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC2_ADDR (pipe), -msm_framebuffer_iova (fb, kms->vm,2 )); +msm_framebuffer_iova (fb,2 ));mdp5_write (mdp5_kms,REG_MDP5_PIPE_SRC3_ADDR (pipe), -msm_framebuffer_iova (fb, kms->vm,3 )); +msm_framebuffer_iova (fb,3 )); }/* Note: mdp5_plane->pipe_lock must be locked */
drivers/gpu/drm/msm/msm_drv.h +3 -6
@@ -274,12 +274,9 @@ struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,int msm_gem_prime_pin (struct drm_gem_object *obj);void msm_gem_prime_unpin (struct drm_gem_object *obj); -int msm_framebuffer_prepare (struct drm_framebuffer *fb, -struct msm_gem_vm *vm,bool needs_dirtyfb); -void msm_framebuffer_cleanup (struct drm_framebuffer *fb, -struct msm_gem_vm *vm,bool needed_dirtyfb); -uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb, -struct msm_gem_vm *vm,int plane); +int msm_framebuffer_prepare (struct drm_framebuffer *fb,bool needs_dirtyfb); +void msm_framebuffer_cleanup (struct drm_framebuffer *fb,bool needed_dirtyfb); +uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb,int plane);struct drm_gem_object *msm_framebuffer_bo (struct drm_framebuffer *fb,int plane);const struct msm_format *msm_framebuffer_format (struct drm_framebuffer *fb); struct drm_framebuffer *msm_framebuffer_create(struct drm_device *dev,
drivers/gpu/drm/msm/msm_fb.c +7 -8
@@ -75,10 +75,10 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m)/* prepare/pin all the fb's bo's for scanout. */ -int msm_framebuffer_prepare (struct drm_framebuffer *fb, -struct msm_gem_vm *vm, -bool needs_dirtyfb) +int msm_framebuffer_prepare (struct drm_framebuffer *fb,bool needs_dirtyfb) { +struct msm_drm_private *priv = fb->dev->dev_private; +struct msm_gem_vm *vm = priv->kms->vm;struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);int ret, i, n = fb->format->num_planes;
@@ -98,10 +98,10 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb,return 0 ; } -void msm_framebuffer_cleanup (struct drm_framebuffer *fb, -struct msm_gem_vm *vm, -bool needed_dirtyfb) +void msm_framebuffer_cleanup (struct drm_framebuffer *fb,bool needed_dirtyfb) { +struct msm_drm_private *priv = fb->dev->dev_private; +struct msm_gem_vm *vm = priv->kms->vm;struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);int i, n = fb->format->num_planes;
@@ -115,8 +115,7 @@ void msm_framebuffer_cleanup(struct drm_framebuffer *fb,memset (msm_fb->iova,0 ,sizeof (msm_fb->iova)); } -uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb, -struct msm_gem_vm *vm,int plane) +uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb,int plane) {struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);return msm_fb->iova[plane] + fb->offsets[plane];
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 12/42 drm/msm: Refcount framebuffer pins
In reply to Rob ClarkWe were already keeping a refcount of # of prepares (pins), to clear the iova array. Use that to avoid unpinning the iova until the last cleanup (unpin). This way, when msm_gem_unpin_iova() actually tears down the mapping, we won't have problems if the fb is being scanned out on another display (for example).
--- drivers/gpu/drm/msm/msm_fb.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/msm_fb.c +7 -4
@@ -85,7 +85,8 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, bool needs_dirtyfb)if (needs_dirtyfb)refcount_inc (&msm_fb->dirtyfb); -atomic_inc (&msm_fb->prepare_count); +if (atomic_inc_return (&msm_fb->prepare_count) >1 ) +return 0 ;for (i =0 ; i < n; i++) { ret =msm_gem_get_and_pin_iova (fb->obj[i], vm, &msm_fb->iova[i]);
@@ -108,11 +109,13 @@ void msm_framebuffer_cleanup(struct drm_framebuffer *fb, bool needed_dirtyfb)if (needed_dirtyfb)refcount_dec (&msm_fb->dirtyfb); +if (atomic_dec_return (&msm_fb->prepare_count)) +return ; + +memset (msm_fb->iova,0 ,sizeof (msm_fb->iova)); +for (i =0 ; i < n; i++)msm_gem_unpin_iova (fb->obj[i], vm); - -if (!atomic_dec_return (&msm_fb->prepare_count)) -memset (msm_fb->iova,0 ,sizeof (msm_fb->iova)); }uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb,int plane)
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 13/42 drm/msm: drm_gpuvm conversion
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Now that we've realigned deletion and allocation, switch over to using drm_gpuvm/drm_gpuva. This allows us to support multiple VMAs per BO per VM, to allow mapping different parts of a single BO at different virtual addresses, which is a key requirement for sparse/VM_BIND.
This prepares us for using drm_gpuvm to translate a batch of MAP/ MAP_NULL/UNMAP operations from userspace into a sequence of map/remap/ unmap steps for updating the page tables.
Since, unlike our prior vm/vma setup, with drm_gpuvm the vm_bo holds a reference to the GEM object. To prevent reference loops causing us to leak all GEM objects, we implicitly tear down the mapping when the GEM handle is close or when the obj is unpinned. Which means the submit needs to also hold a reference to the vm_bo, to prevent the VMA from being torn down while the submit is in-flight.
--- drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 3 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 5 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 7 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 5 +- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_gem.c | 166 +++++++++++++++-------- drivers/gpu/drm/msm/msm_gem.h | 90 +++++++++--- drivers/gpu/drm/msm/msm_gem_submit.c | 7 +- drivers/gpu/drm/msm/msm_gem_vma.c | 140 +++++++++++++------ drivers/gpu/drm/msm/msm_kms.c | 4 +- 12 files changed, 300 insertions(+), 135 deletions(-)
drivers/gpu/drm/msm/Kconfig +1 -0
@@ -21,6 +21,7 @@ config DRM_MSM select DRM_DISPLAY_HELPER select DRM_BRIDGE_CONNECTOR select DRM_EXEC + select DRM_GPUVM select DRM_KMS_HELPER select DRM_PANEL select DRM_BRIDGE
drivers/gpu/drm/msm/adreno/a2xx_gpu.c +1 -2
@@ -472,8 +472,7 @@ a2xx_create_vm(struct msm_gpu *gpu, struct platform_device *pdev)struct msm_mmu *mmu =a2xx_gpummu_new (&pdev->dev, gpu);struct msm_gem_vm *vm; - vm =msm_gem_vm_create (mmu,"gpu" ,SZ_16M , -0xfff *SZ_64K ); + vm =msm_gem_vm_create (gpu->dev, mmu,"gpu" ,SZ_16M ,0xfff *SZ_64K , true);if (IS_ERR (vm) && !IS_ERR (mmu)) mmu->funcs->destroy (mmu);
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +3 -3
@@ -1311,7 +1311,7 @@ static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, struct a6xx_gmu_bo *bo,return 0 ; } -static int a6xx_gmu_memory_probe (struct a6xx_gmu *gmu) +static int a6xx_gmu_memory_probe (struct drm_device *drm,struct a6xx_gmu *gmu) {struct msm_mmu *mmu;
@@ -1321,7 +1321,7 @@ static int a6xx_gmu_memory_probe(struct a6xx_gmu *gmu)if (IS_ERR (mmu))return PTR_ERR (mmu); - gmu->vm =msm_gem_vm_create (mmu,"gmu" ,0x0 ,0x80000000 ); + gmu->vm =msm_gem_vm_create (drm, mmu,"gmu" ,0x0 ,0x80000000 , true);if (IS_ERR (gmu->vm))return PTR_ERR (gmu->vm);
@@ -1940,7 +1940,7 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)if (ret) goto err_put_device; - ret =a6xx_gmu_memory_probe (gmu); + ret =a6xx_gmu_memory_probe (adreno_gpu->base.dev, gmu);if (ret) goto err_put_device;
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2 -3
@@ -2284,9 +2284,8 @@ a6xx_create_private_vm(struct msm_gpu *gpu)if (IS_ERR (mmu))return ERR_CAST (mmu); -return msm_gem_vm_create (mmu, -"gpu" ,ADRENO_VM_START , -adreno_private_vm_size (gpu)); +return msm_gem_vm_create (gpu->dev, mmu,"gpu" ,ADRENO_VM_START , +adreno_private_vm_size (gpu), true); }static uint32_t a6xx_get_rptr (struct msm_gpu *gpu,struct msm_ringbuffer *ring)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +4 -3
@@ -226,7 +226,8 @@ adreno_iommu_create_vm(struct msm_gpu *gpu, start =max_t (u64,SZ_16M , geometry->aperture_start); size = geometry->aperture_end - start +1 ; - vm =msm_gem_vm_create (mmu,"gpu" , start &GENMASK_ULL (48 ,0 ), size); + vm =msm_gem_vm_create (gpu->dev, mmu,"gpu" , start &GENMASK_ULL (48 ,0 ), + size, true);if (IS_ERR (vm) && !IS_ERR (mmu)) mmu->funcs->destroy (mmu);
@@ -414,12 +415,12 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx,case MSM_PARAM_VA_START :if (ctx->vm == gpu->vm)return UERR (EINVAL , drm,"requires per-process pgtables" ); - *value = ctx->vm->va_start; + *value = ctx->vm->base.mm_start;return 0 ;case MSM_PARAM_VA_SIZE :if (ctx->vm == gpu->vm)return UERR (EINVAL , drm,"requires per-process pgtables" ); - *value = ctx->vm->va_size; + *value = ctx->vm->base.mm_range;return 0 ;case MSM_PARAM_HIGHEST_BANK_BIT : *value = adreno_gpu->ubwc_config.highest_bank_bit;
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +3 -2
@@ -469,8 +469,9 @@ static int mdp4_kms_init(struct drm_device *dev) "contig buffers for scanout\n"); vm =NULL ; }else { - vm =msm_gem_vm_create (mmu, -"mdp4" ,0x1000 ,0x100000000 -0x1000 ); + vm =msm_gem_vm_create (dev, mmu,"mdp4" , +0x1000 ,0x100000000 -0x1000 , + true);if (IS_ERR (vm)) {if (!IS_ERR (mmu))
drivers/gpu/drm/msm/msm_drv.c +1 -0
@@ -780,6 +780,7 @@ static const struct file_operations fops = {static const struct drm_driver msm_driver = { .driver_features =DRIVER_GEM | +DRIVER_GEM_GPUVA |DRIVER_RENDER |DRIVER_ATOMIC | DRIVER_MODESET |
drivers/gpu/drm/msm/msm_gem.c +107 -59
305 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem.h +71 -19
139 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem_submit.c +6 -1
@@ -321,7 +321,8 @@ static int submit_pin_objects(struct msm_gem_submit *submit)if (ret)break ; - submit->bos[i].iova = vma->iova; + submit->bos[i].vm_bo =drm_gpuvm_bo_get (vma->base.vm_bo); + submit->bos[i].iova = vma->base.va.addr; }/*
@@ -474,7 +475,11 @@ void msm_submit_retire(struct msm_gem_submit *submit)for (i =0 ; i < submit->nr_bos; i++) {struct drm_gem_object *obj = submit->bos[i].obj; +struct drm_gpuvm_bo *vm_bo = submit->bos[i].vm_bo; +msm_gem_lock (obj); +drm_gpuvm_bo_put (vm_bo); +msm_gem_unlock (obj);drm_gem_object_put (obj); } }
drivers/gpu/drm/msm/msm_gem_vma.c +99 -41
243 lines not on this page · raw message
drivers/gpu/drm/msm/msm_kms.c +2 -2
@@ -204,8 +204,8 @@ struct msm_gem_vm *msm_kms_init_vm(struct drm_device *dev)return NULL ; } - vm =msm_gem_vm_create (mmu,"mdp_kms" , -0x1000 ,0x100000000 -0x1000 ); + vm =msm_gem_vm_create (dev, mmu,"mdp_kms" , +0x1000 ,0x100000000 -0x1000 , true);if (IS_ERR (vm)) {dev_err (mdp_dev,"vm create, error %pe\n" , vm); mmu->funcs->destroy (mmu);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 14/42 drm/msm: Convert vm locking
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Convert to using the gpuvm's r_obj for serializing access to the VM. This way we can use the drm_exec helper for dealing with deadlock detection and backoff.
This will let us deal with upcoming locking order conflicts with the VM_BIND implmentation (ie. in some scenarious we need to acquire the obj lock first, for ex. to iterate all the VMs an obj is bound in, and in other scenarious we need to acquire the VM lock first).
--- drivers/gpu/drm/msm/msm_gem.c | 41 +++++++++---- drivers/gpu/drm/msm/msm_gem.h | 37 ++++++++++-- drivers/gpu/drm/msm/msm_gem_shrinker.c | 80 +++++++++++++++++++++++--- drivers/gpu/drm/msm/msm_gem_submit.c | 9 ++- drivers/gpu/drm/msm/msm_gem_vma.c | 24 +++----- 5 files changed, 152 insertions(+), 39 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +31 -10
@@ -48,6 +48,7 @@ static void put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *vm, bostatic void detach_vm (struct drm_gem_object *obj,struct msm_gem_vm *vm) {msm_gem_assert_locked (obj); +drm_gpuvm_resv_assert_held (&vm->base);struct drm_gpuvm_bo *vm_bo =drm_gpuvm_bo_find (&vm->base, obj);if (vm_bo) {
@@ -68,6 +69,7 @@ static void detach_vm(struct drm_gem_object *obj, struct msm_gem_vm *vm)static void msm_gem_close (struct drm_gem_object *obj,struct drm_file *file) {struct msm_context *ctx = file->driver_priv; +struct drm_exec exec;update_ctx_mem (file, -obj->size);
@@ -86,10 +88,10 @@ static void msm_gem_close(struct drm_gem_object *obj, struct drm_file *file)dma_resv_wait_timeout (obj->resv,DMA_RESV_USAGE_READ , false,msecs_to_jiffies (1000 )); -msm_gem_lock (obj); +msm_gem_lock_vm_and_obj (&exec, obj, ctx->vm);put_iova_spaces (obj, &ctx->vm->base, true);detach_vm (obj, ctx->vm); -msm_gem_unlock (obj); +drm_exec_fini (&exec);/* drop locks */ }/*
@@ -551,11 +553,12 @@ int msm_gem_get_and_pin_iova_range(struct drm_gem_object *obj, struct msm_gem_vm *vm, uint64_t *iova, u64 range_start, u64 range_end) { + struct drm_exec exec;int ret; -msm_gem_lock (obj); +msm_gem_lock_vm_and_obj (&exec, obj, vm); ret =get_and_pin_iova_range_locked (obj, vm, iova, range_start, range_end); -msm_gem_unlock (obj); +drm_exec_fini (&exec);/* drop locks */ return ret; }
@@ -575,16 +578,17 @@ int msm_gem_get_iova(struct drm_gem_object *obj, struct msm_gem_vm *vm, uint64_t *iova) { struct msm_gem_vma *vma; +struct drm_exec exec;int ret =0 ; -msm_gem_lock (obj); +msm_gem_lock_vm_and_obj (&exec, obj, vm); vma =get_vma_locked (obj, vm,0 ,U64_MAX );if (IS_ERR (vma)) { ret =PTR_ERR (vma); }else { *iova = vma->base.va.addr; } -msm_gem_unlock (obj); +drm_exec_fini (&exec);/* drop locks */ return ret; }
@@ -613,9 +617,10 @@ static int clear_iova(struct drm_gem_object *obj,int msm_gem_set_iova (struct drm_gem_object *obj,struct msm_gem_vm *vm,uint64_t iova) { +struct drm_exec exec;int ret =0 ; -msm_gem_lock (obj); +msm_gem_lock_vm_and_obj (&exec, obj, vm);if (!iova) { ret =clear_iova (obj, vm); }else {
@@ -628,7 +633,7 @@ int msm_gem_set_iova(struct drm_gem_object *obj, ret = -EBUSY ; } } -msm_gem_unlock (obj); +drm_exec_fini (&exec);/* drop locks */ return ret; }
@@ -642,14 +647,15 @@ void msm_gem_unpin_iova(struct drm_gem_object *obj, struct msm_gem_vm *vm) {struct msm_gem_vma *vma; +struct drm_exec exec; -msm_gem_lock (obj); +msm_gem_lock_vm_and_obj (&exec, obj, vm); vma =lookup_vma (obj, vm);if (vma) {msm_gem_unpin_locked (obj); }detach_vm (obj, vm); -msm_gem_unlock (obj); +drm_exec_fini (&exec);/* drop locks */ } int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
@@ -1021,12 +1027,27 @@ static void msm_gem_free_object(struct drm_gem_object *obj)struct msm_gem_object *msm_obj =to_msm_bo (obj);struct drm_device *dev = obj->dev;struct msm_drm_private *priv = dev->dev_private; +struct drm_exec exec;mutex_lock (&priv->obj_lock);list_del (&msm_obj->node);mutex_unlock (&priv->obj_lock); +/* +* We need to lock any VMs the object is still attached to, but not +* the object itself (see explaination in msm_gem_assert_locked()), +* so just open-code this special case: +*/ +drm_exec_init (&exec,0 ,0 ); + drm_exec_until_all_locked (&exec) { +struct drm_gpuvm_bo *vm_bo; + drm_gem_for_each_gpuvm_bo (vm_bo, obj) { +drm_exec_lock_obj (&exec,drm_gpuvm_resv_obj (vm_bo->vm)); +drm_exec_retry_on_contention (&exec); + } + }put_iova_spaces (obj,NULL , true); +drm_exec_fini (&exec);/* drop locks */ if (drm_gem_is_imported (obj)) {GEM_WARN_ON (msm_obj->vaddr);
drivers/gpu/drm/msm/msm_gem.h +31 -6
@@ -62,12 +62,6 @@ struct msm_gem_vm {*/ struct drm_mm mm; -/** @mm_lock: protects @mm node allocation/removal */ -struct spinlock mm_lock; - -/** @vm_lock: protects gpuvm insert/remove/traverse */ -struct mutex vm_lock; -/** @mmu: The mmu object which manages the pgtables */ struct msm_mmu *mmu;
@@ -246,6 +240,37 @@ msm_gem_unlock(struct drm_gem_object *obj)dma_resv_unlock (obj->resv); } +/** +* msm_gem_lock_vm_and_obj() - Helper to lock an obj + VM +* @exec: the exec context helper which will be initalized +* @obj: the GEM object to lock +* @vm: the VM to lock +* +* Operations which modify a VM frequently need to lock both the VM and +* the object being mapped/unmapped/etc. This helper uses drm_exec to +* acquire both locks, dealing with potential deadlock/backoff scenarios +* which arise when multiple locks are involved. +*/ +static inline int +msm_gem_lock_vm_and_obj (struct drm_exec *exec, +struct drm_gem_object *obj, +struct msm_gem_vm *vm) +{ +int ret =0 ; + +drm_exec_init (exec,0 ,2 ); +drm_exec_until_all_locked (exec) { + ret =drm_exec_lock_obj (exec,drm_gpuvm_resv_obj (&vm->base)); +if (!ret && (obj->resv !=drm_gpuvm_resv (&vm->base))) + ret =drm_exec_lock_obj (exec, obj); +drm_exec_retry_on_contention (exec); +if (GEM_WARN_ON (ret)) +break ; + } + +return ret; +} +static inline void msm_gem_assert_locked (struct drm_gem_object *obj) {
drivers/gpu/drm/msm/msm_gem_shrinker.c +73 -7
110 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem_submit.c +8 -1
@@ -256,11 +256,18 @@ static int submit_lookup_cmds(struct msm_gem_submit *submit,/* This is where we make sure all the bo's are reserved and pin'd: */ static int submit_lock_objects (struct msm_gem_submit *submit) { +unsigned flags =DRM_EXEC_IGNORE_DUPLICATES |DRM_EXEC_INTERRUPTIBLE_WAIT ;int ret; -drm_exec_init (&submit->exec,DRM_EXEC_INTERRUPTIBLE_WAIT , submit->nr_bos); +// TODO need to add vm_bind path which locks vm resv + external objs +drm_exec_init (&submit->exec, flags, submit->nr_bos); drm_exec_until_all_locked (&submit->exec) { + ret =drm_exec_lock_obj (&submit->exec, +drm_gpuvm_resv_obj (&submit->vm->base)); +drm_exec_retry_on_contention (&submit->exec); +if (ret) + goto error;for (unsigned i =0 ; i < submit->nr_bos; i++) {struct drm_gem_object *obj = submit->bos[i].obj; ret =drm_exec_prepare_obj (&submit->exec, obj,1 );
drivers/gpu/drm/msm/msm_gem_vma.c +9 -15
@@ -92,15 +92,13 @@ void msm_gem_vma_close(struct msm_gem_vma *vma)GEM_WARN_ON (vma->mapped); -spin_lock (&vm->mm_lock); +drm_gpuvm_resv_assert_held (&vm->base); +if (vma->base.va.addr)drm_mm_remove_node (&vma->node); -spin_unlock (&vm->mm_lock); -mutex_lock (&vm->vm_lock);drm_gpuva_remove (&vma->base);drm_gpuva_unlink (&vma->base); -mutex_unlock (&vm->vm_lock);kfree (vma); }
@@ -114,16 +112,16 @@ msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj,struct msm_gem_vma *vma;int ret; +drm_gpuvm_resv_assert_held (&vm->base); + vma =kzalloc (sizeof (*vma),GFP_KERNEL );if (!vma)return ERR_PTR (-ENOMEM );if (vm->managed) { -spin_lock (&vm->mm_lock); ret =drm_mm_insert_node_in_range (&vm->mm, &vma->node, obj->size,PAGE_SIZE ,0 , range_start, range_end,0 ); -spin_unlock (&vm->mm_lock);if (ret) goto err_free_vma;
@@ -137,9 +135,7 @@ msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj,drm_gpuva_init (&vma->base, range_start, range_end - range_start, obj,0 ); vma->mapped = false; -mutex_lock (&vm->vm_lock); ret =drm_gpuva_insert (&vm->base, &vma->base); -mutex_unlock (&vm->vm_lock);if (ret) goto err_free_range;
@@ -149,18 +145,14 @@ msm_gem_vma_new(struct msm_gem_vm *vm, struct drm_gem_object *obj, goto err_va_remove; } -mutex_lock (&vm->vm_lock);drm_gpuvm_bo_extobj_add (vm_bo);drm_gpuva_link (&vma->base, vm_bo); -mutex_unlock (&vm->vm_lock);GEM_WARN_ON (drm_gpuvm_bo_put (vm_bo));return vma; err_va_remove: -mutex_lock (&vm->vm_lock);drm_gpuva_remove (&vma->base); -mutex_unlock (&vm->vm_lock); err_free_range:if (vm->managed)drm_mm_remove_node (&vma->node);
@@ -191,6 +183,11 @@ struct msm_gem_vm * msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char *name, u64 va_start, u64 va_size, bool managed) { + /* + * We mostly want to use DRM_GPUVM_RESV_PROTECTED, except that + * makes drm_gpuvm_bo_evict() a no-op for extobjs (ie. we loose + * tracking that an extobj is evicted) :facepalm: + */ enum drm_gpuvm_flags flags = 0;struct msm_gem_vm *vm;struct drm_gem_object *dummy_gem;
@@ -213,9 +210,6 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char *name, va_start, va_size, 0, 0, &msm_gpuvm_ops);drm_gem_object_put (dummy_gem); -spin_lock_init (&vm->mm_lock); -mutex_init (&vm->vm_lock); - vm->mmu = mmu; vm->managed = managed;
Signature · 1 line
2.50.0
Re: [PATCH v9 14/42] drm/msm: Convert vm locking
drivers/gpu/drm/msm/msm_gem_vma.c struct msm_gem_vm * · line 190
Quoted 5 lines · Rob Clark
drivers/gpu/drm/msm/msm_gem_vma.c +5
-0+/* +* We mostly want to use DRM_GPUVM_RESV_PROTECTED, except that +* makes drm_gpuvm_bo_evict() a no-op for extobjs (ie. we loose +* tracking that an extobj is evicted) :facepalm: +*/
Yeah, it's a consequence of this locking scheme and I really hate it. However, you don't entirely loose tracking:
The next time you call drm_gpuvm_prepare_objects() it will be added to the list
[1] and hence picked up by subsequent validation through drm_gpuvm_validate().
[1] https://elixir.bootlin.com/linux/v6.16/source/drivers/gpu/drm/drm_gpuvm.c#L1154
Re: [PATCH v9 14/42] drm/msm: Convert vm locking
Quoted 8 lines · Danilo Krummrich
drivers/gpu/drm/msm/msm_gem_vma.c struct msm_gem_vm * · line 190
Quoted 5 lines · Rob Clark
drivers/gpu/drm/msm/msm_gem_vma.c +5
-0+/* +* We mostly want to use DRM_GPUVM_RESV_PROTECTED, except that +* makes drm_gpuvm_bo_evict() a no-op for extobjs (ie. we loose +* tracking that an extobj is evicted) :facepalm: +*/
Quoted 7 lines
Yeah, it's a consequence of this locking scheme and I really hate it. However, you don't entirely loose tracking:
The next time you call
drm_gpuvm_prepare_objects()it will be added to the list
[1] and hence picked up by subsequent validation throughdrm_gpuvm_validate().[1] https://elixir.bootlin.com/linux/v6.16/source/drivers/gpu/drm/drm_gpuvm.c#L1154
Hmm, maybe the issue was with legacy (non-vm_bind) contexts, which use drm_exec directly for locking? I guess I can try to revisit that..
BR,
-R
Rob Clark
maintainerPATCH v9 15/42 drm/msm: Use drm_gpuvm types more
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Most of the driver code doesn't need to reach in to msm specific fields, so just use the drm_gpuvm/drm_gpuva types directly. This should hopefully improve commonality with other drivers and make the code easier to understand.
--- drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 6 +- drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 3 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 +- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 2 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 11 +-- drivers/gpu/drm/msm/adreno/a6xx_preempt.c | 2 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 19 +++-- drivers/gpu/drm/msm/adreno/adreno_gpu.h | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 11 +-- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +-- drivers/gpu/drm/msm/dsi/dsi_host.c | 6 +- drivers/gpu/drm/msm/msm_drv.h | 4 +- drivers/gpu/drm/msm/msm_fb.c | 4 +- drivers/gpu/drm/msm/msm_gem.c | 94 +++++++++++------------ drivers/gpu/drm/msm/msm_gem.h | 59 +++++++------- drivers/gpu/drm/msm/msm_gem_submit.c | 8 +- drivers/gpu/drm/msm/msm_gem_vma.c | 70 +++++++---------- drivers/gpu/drm/msm/msm_gpu.c | 18 +++-- drivers/gpu/drm/msm/msm_gpu.h | 10 +-- drivers/gpu/drm/msm/msm_kms.c | 6 +- drivers/gpu/drm/msm/msm_kms.h | 2 +- drivers/gpu/drm/msm/msm_submitqueue.c | 2 +- 23 files changed, 175 insertions(+), 189 deletions(-)
drivers/gpu/drm/msm/adreno/a2xx_gpu.c +3 -3
@@ -113,7 +113,7 @@ static int a2xx_hw_init(struct msm_gpu *gpu)uint32_t *ptr, len;int i, ret; -a2xx_gpummu_params (gpu->vm->mmu, &pt_base, &tran_error); +a2xx_gpummu_params (to_msm_vm (gpu->vm)->mmu, &pt_base, &tran_error);DBG ("%s" , gpu->name);
@@ -466,11 +466,11 @@ static struct msm_gpu_state *a2xx_gpu_state_get(struct msm_gpu *gpu)return state; } -static struct msm_gem_vm * +static struct drm_gpuvm *a2xx_create_vm (struct msm_gpu *gpu,struct platform_device *pdev) {struct msm_mmu *mmu =a2xx_gpummu_new (&pdev->dev, gpu); -struct msm_gem_vm *vm; +struct drm_gpuvm *vm; vm =msm_gem_vm_create (gpu->dev, mmu,"gpu" ,SZ_16M ,0xfff *SZ_64K , true);
drivers/gpu/drm/msm/adreno/a5xx_gpu.c +2 -1
@@ -1786,7 +1786,8 @@ struct msm_gpu *a5xx_gpu_init(struct drm_device *dev)return ERR_PTR (ret); } -msm_mmu_set_fault_handler (gpu->vm->mmu, gpu, a5xx_fault_handler); +msm_mmu_set_fault_handler (to_msm_vm (gpu->vm)->mmu, gpu, + a5xx_fault_handler);/* Set up the preemption specific bits and pieces for each ringbuffer */ a5xx_preempt_init (gpu);
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +4 -2
@@ -1259,6 +1259,8 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu)static void a6xx_gmu_memory_free (struct a6xx_gmu *gmu) { +struct msm_mmu *mmu =to_msm_vm (gmu->vm)->mmu; +msm_gem_kernel_put (gmu->hfi.obj, gmu->vm);msm_gem_kernel_put (gmu->debug.obj, gmu->vm);msm_gem_kernel_put (gmu->icache.obj, gmu->vm);
@@ -1266,8 +1268,8 @@ static void a6xx_gmu_memory_free(struct a6xx_gmu *gmu)msm_gem_kernel_put (gmu->dummy.obj, gmu->vm);msm_gem_kernel_put (gmu->log.obj, gmu->vm); - gmu->vm->mmu->funcs->detach (gmu->vm->mmu); -msm_gem_vm_put (gmu->vm); + mmu->funcs->detach (mmu); +drm_gpuvm_put (gmu->vm); } static int a6xx_gmu_memory_alloc(struct a6xx_gmu *gmu, struct a6xx_gmu_bo *bo,
drivers/gpu/drm/msm/adreno/a6xx_gmu.h +1 -1
@@ -62,7 +62,7 @@ struct a6xx_gmu {/* For serializing communication with the GMU: */ struct mutex lock; -struct msm_gem_vm *vm; +struct drm_gpuvm *vm;void __iomem *mmio;void __iomem *rscc;
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +6 -5
@@ -120,7 +120,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gpu,if (ctx->seqno == ring->cur_ctx_seqno)return ; -if (msm_iommu_pagetable_params (ctx->vm->mmu, &ttbr, &asid)) +if (msm_iommu_pagetable_params (to_msm_vm (ctx->vm)->mmu, &ttbr, &asid))return ;if (adreno_gpu->info->family >=ADRENO_7XX_GEN1 ) {
@@ -2256,7 +2256,7 @@ static void a6xx_gpu_set_freq(struct msm_gpu *gpu, struct dev_pm_opp *opp,mutex_unlock (&a6xx_gpu->gmu.lock); } -static struct msm_gem_vm * +static struct drm_gpuvm *a6xx_create_vm (struct msm_gpu *gpu,struct platform_device *pdev) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);
@@ -2274,12 +2274,12 @@ a6xx_create_vm(struct msm_gpu *gpu, struct platform_device *pdev)return adreno_iommu_create_vm (gpu, pdev, quirks); } -static struct msm_gem_vm * +static struct drm_gpuvm *a6xx_create_private_vm (struct msm_gpu *gpu) {struct msm_mmu *mmu; - mmu =msm_iommu_pagetable_create (gpu->vm->mmu); + mmu =msm_iommu_pagetable_create (to_msm_vm (gpu->vm)->mmu);if (IS_ERR (mmu))return ERR_CAST (mmu);
@@ -2559,7 +2559,8 @@ struct msm_gpu *a6xx_gpu_init(struct drm_device *dev) adreno_gpu->uche_trap_base =0x1fffffffff000ull ; -msm_mmu_set_fault_handler (gpu->vm->mmu, gpu, a6xx_fault_handler); +msm_mmu_set_fault_handler (to_msm_vm (gpu->vm)->mmu, gpu, + a6xx_fault_handler);a6xx_calc_ubwc_config (adreno_gpu);/* Set up the preemption specific bits and pieces for each ringbuffer */
drivers/gpu/drm/msm/adreno/a6xx_preempt.c +1 -1
@@ -377,7 +377,7 @@ static int preempt_init_ring(struct a6xx_gpu *a6xx_gpu,struct a7xx_cp_smmu_info *smmu_info_ptr = ptr; -msm_iommu_pagetable_params (gpu->vm->mmu, &ttbr, &asid); +msm_iommu_pagetable_params (to_msm_vm (gpu->vm)->mmu, &ttbr, &asid); smmu_info_ptr->magic =GEN7_CP_SMMU_INFO_MAGIC ; smmu_info_ptr->ttbr0 = ttbr;
drivers/gpu/drm/msm/adreno/adreno_gpu.c +11 -8
@@ -191,21 +191,21 @@ int adreno_zap_shader_load(struct msm_gpu *gpu, u32 pasid)return zap_shader_load_mdt (gpu, adreno_gpu->info->zapfw, pasid); } -struct msm_gem_vm * +struct drm_gpuvm *adreno_create_vm (struct msm_gpu *gpu,struct platform_device *pdev) {return adreno_iommu_create_vm (gpu, pdev,0 ); } -struct msm_gem_vm * +struct drm_gpuvm *adreno_iommu_create_vm (struct msm_gpu *gpu,struct platform_device *pdev,unsigned long quirks) {struct iommu_domain_geometry *geometry;struct msm_mmu *mmu; -struct msm_gem_vm *vm; +struct drm_gpuvm *vm;u64 start, size; mmu =msm_iommu_gpu_new (&pdev->dev, gpu, quirks);
@@ -275,9 +275,11 @@ void adreno_check_and_reenable_stall(struct adreno_gpu *adreno_gpu)if (!priv->stall_enabled &&ktime_after (ktime_get (), priv->stall_reenable_time) && !READ_ONCE (gpu->crashstate)) { +struct msm_mmu *mmu =to_msm_vm (gpu->vm)->mmu; + priv->stall_enabled = true; - gpu->vm->mmu->funcs->set_stall (gpu->vm->mmu, true); + mmu->funcs->set_stall (mmu, true); }spin_unlock_irqrestore (&priv->fault_stall_lock, flags); }
@@ -292,6 +294,7 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags, u32 scratch[4]) {struct msm_drm_private *priv = gpu->dev->dev_private; +struct msm_mmu *mmu =to_msm_vm (gpu->vm)->mmu;const char *type ="UNKNOWN" ;bool do_devcoredump = info && (info->fsr &ARM_SMMU_FSR_SS ) && !READ_ONCE (gpu->crashstate);
@@ -305,7 +308,7 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags,if (priv->stall_enabled) { priv->stall_enabled = false; - gpu->vm->mmu->funcs->set_stall (gpu->vm->mmu, false); + mmu->funcs->set_stall (mmu, false); } priv->stall_reenable_time =ktime_add_ms (ktime_get (),500 );
@@ -405,7 +408,7 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx,return 0 ;case MSM_PARAM_FAULTS :if (ctx->vm) - *value = gpu->global_faults + ctx->vm->faults; + *value = gpu->global_faults +to_msm_vm (ctx->vm)->faults;else *value = gpu->global_faults;return 0 ;
@@ -415,12 +418,12 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx,case MSM_PARAM_VA_START :if (ctx->vm == gpu->vm)return UERR (EINVAL , drm,"requires per-process pgtables" ); - *value = ctx->vm->base.mm_start; + *value = ctx->vm->mm_start;return 0 ;case MSM_PARAM_VA_SIZE :if (ctx->vm == gpu->vm)return UERR (EINVAL , drm,"requires per-process pgtables" ); - *value = ctx->vm->base.mm_range; + *value = ctx->vm->mm_range;return 0 ;case MSM_PARAM_HIGHEST_BANK_BIT : *value = adreno_gpu->ubwc_config.highest_bank_bit;
drivers/gpu/drm/msm/adreno/adreno_gpu.h +2 -2
@@ -622,11 +622,11 @@ void adreno_show_object(struct drm_printer *p, void **ptr, int len,* Common helper function to initialize the default address space for arm-smmu * attached targets */ -struct msm_gem_vm * +struct drm_gpuvm *adreno_create_vm (struct msm_gpu *gpu,struct platform_device *pdev); -struct msm_gem_vm * +struct drm_gpuvm *adreno_iommu_create_vm (struct msm_gpu *gpu,struct platform_device *pdev,unsigned long quirks);
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +3 -3
@@ -1098,17 +1098,17 @@ static void _dpu_kms_mmu_destroy(struct dpu_kms *dpu_kms)if (!dpu_kms->base.vm)return ; - mmu = dpu_kms->base.vm->mmu; + mmu =to_msm_vm (dpu_kms->base.vm)->mmu; mmu->funcs->detach (mmu); -msm_gem_vm_put (dpu_kms->base.vm); +drm_gpuvm_put (dpu_kms->base.vm); dpu_kms->base.vm =NULL ; }static int _dpu_kms_mmu_init (struct dpu_kms *dpu_kms) { -struct msm_gem_vm *vm; +struct drm_gpuvm *vm; vm =msm_kms_init_vm (dpu_kms->dev);if (IS_ERR (vm))
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +6 -5
@@ -122,15 +122,16 @@ static void mdp4_destroy(struct msm_kms *kms) {struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (kms));struct device *dev = mdp4_kms->dev->dev; -struct msm_gem_vm *vm = kms->vm;if (mdp4_kms->blank_cursor_iova)msm_gem_unpin_iova (mdp4_kms->blank_cursor_bo, kms->vm);drm_gem_object_put (mdp4_kms->blank_cursor_bo); -if (vm) { - vm->mmu->funcs->detach (vm->mmu); -msm_gem_vm_put (vm); +if (kms->vm) { +struct msm_mmu *mmu =to_msm_vm (kms->vm)->mmu; + + mmu->funcs->detach (mmu); +drm_gpuvm_put (kms->vm); }if (mdp4_kms->rpm_enabled)
@@ -398,7 +399,7 @@ static int mdp4_kms_init(struct drm_device *dev)struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (priv->kms));struct msm_kms *kms =NULL ;struct msm_mmu *mmu; -struct msm_gem_vm *vm; +struct drm_gpuvm *vm;int ret;u32 major, minor;unsigned long max_clk;
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +6 -5
@@ -198,11 +198,12 @@ static void mdp5_destroy(struct mdp5_kms *mdp5_kms);static void mdp5_kms_destroy (struct msm_kms *kms) {struct mdp5_kms *mdp5_kms =to_mdp5_kms (to_mdp_kms (kms)); -struct msm_gem_vm *vm = kms->vm; -if (vm) { - vm->mmu->funcs->detach (vm->mmu); -msm_gem_vm_put (vm); +if (kms->vm) { +struct msm_mmu *mmu =to_msm_vm (kms->vm)->mmu; + + mmu->funcs->detach (mmu); +drm_gpuvm_put (kms->vm); }mdp_kms_destroy (&mdp5_kms->base);
@@ -500,7 +501,7 @@ static int mdp5_kms_init(struct drm_device *dev)struct mdp5_kms *mdp5_kms;struct mdp5_cfg *config;struct msm_kms *kms = priv->kms; -struct msm_gem_vm *vm; +struct drm_gpuvm *vm;int i, ret; ret =mdp5_init (to_platform_device (dev->dev), dev);
drivers/gpu/drm/msm/dsi/dsi_host.c +3 -3
@@ -143,7 +143,7 @@ struct msm_dsi_host {/* DSI 6G TX buffer*/ struct drm_gem_object *tx_gem_obj; -struct msm_gem_vm *vm; +struct drm_gpuvm *vm;/* DSI v2 TX buffer */ void *tx_buf;
@@ -1146,7 +1146,7 @@ int dsi_tx_buf_alloc_6g(struct msm_dsi_host *msm_host, int size)uint64_t iova;u8 *data; - msm_host->vm =msm_gem_vm_get (priv->kms->vm); + msm_host->vm =drm_gpuvm_get (priv->kms->vm); data = msm_gem_kernel_new(dev, size, MSM_BO_WC, msm_host->vm,
@@ -1194,7 +1194,7 @@ void msm_dsi_tx_buf_free(struct mipi_dsi_host *host)if (msm_host->tx_gem_obj) {msm_gem_kernel_put (msm_host->tx_gem_obj, msm_host->vm); -msm_gem_vm_put (msm_host->vm); +drm_gpuvm_put (msm_host->vm); msm_host->tx_gem_obj =NULL ; msm_host->vm =NULL ; }
drivers/gpu/drm/msm/msm_drv.h +1 -3
@@ -48,8 +48,6 @@ struct msm_rd_state;struct msm_perf_state ;struct msm_gem_submit ;struct msm_fence_context ; -struct msm_gem_vm ; -struct msm_gem_vma ;struct msm_disp_state ;#define MAX_CRTCS 8
@@ -253,7 +251,7 @@ void msm_crtc_disable_vblank(struct drm_crtc *crtc);int msm_register_mmu (struct drm_device *dev,struct msm_mmu *mmu);void msm_unregister_mmu (struct drm_device *dev,struct msm_mmu *mmu); -struct msm_gem_vm *msm_kms_init_vm (struct drm_device *dev); +struct drm_gpuvm *msm_kms_init_vm (struct drm_device *dev);bool msm_use_mmu (struct drm_device *dev); int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
drivers/gpu/drm/msm/msm_fb.c +2 -2
@@ -78,7 +78,7 @@ void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m)int msm_framebuffer_prepare (struct drm_framebuffer *fb,bool needs_dirtyfb) {struct msm_drm_private *priv = fb->dev->dev_private; -struct msm_gem_vm *vm = priv->kms->vm; +struct drm_gpuvm *vm = priv->kms->vm;struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);int ret, i, n = fb->format->num_planes;
@@ -102,7 +102,7 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, bool needs_dirtyfb)void msm_framebuffer_cleanup (struct drm_framebuffer *fb,bool needed_dirtyfb) {struct msm_drm_private *priv = fb->dev->dev_private; -struct msm_gem_vm *vm = priv->kms->vm; +struct drm_gpuvm *vm = priv->kms->vm;struct msm_framebuffer *msm_fb =to_msm_framebuffer (fb);int i, n = fb->format->num_planes;
drivers/gpu/drm/msm/msm_gem.c +45 -49
240 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem.h +26 -33
104 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem_submit.c +4 -4
@@ -264,7 +264,7 @@ static int submit_lock_objects(struct msm_gem_submit *submit) drm_exec_until_all_locked (&submit->exec) { ret =drm_exec_lock_obj (&submit->exec, -drm_gpuvm_resv_obj (&submit->vm->base)); +drm_gpuvm_resv_obj (submit->vm));drm_exec_retry_on_contention (&submit->exec);if (ret) goto error;
@@ -315,7 +315,7 @@ static int submit_pin_objects(struct msm_gem_submit *submit)for (i =0 ; i < submit->nr_bos; i++) {struct drm_gem_object *obj = submit->bos[i].obj; -struct msm_gem_vma *vma; +struct drm_gpuva *vma;/* if locking succeeded, pin bo: */ vma =msm_gem_get_vma_locked (obj, submit->vm);
@@ -328,8 +328,8 @@ static int submit_pin_objects(struct msm_gem_submit *submit)if (ret)break ; - submit->bos[i].vm_bo =drm_gpuvm_bo_get (vma->base.vm_bo); - submit->bos[i].iova = vma->base.va.addr; + submit->bos[i].vm_bo =drm_gpuvm_bo_get (vma->vm_bo); + submit->bos[i].iova = vma->va.addr; }/*
drivers/gpu/drm/msm/msm_gem_vma.c +29 -41
140 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gpu.c +10 -8
@@ -285,7 +285,7 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,if (state->fault_info.ttbr0) {struct msm_gpu_fault_info *info = &state->fault_info; -struct msm_mmu *mmu = submit->vm->mmu; +struct msm_mmu *mmu =to_msm_vm (submit->vm)->mmu;msm_iommu_pagetable_params (mmu, &info->pgtbl_ttbr0, &info->asid);
@@ -390,7 +390,7 @@ static void recover_worker(struct kthread_work *work)/* Increment the fault counts */ submit->queue->faults++;if (submit->vm) - submit->vm->faults++; +to_msm_vm (submit->vm)->faults++;get_comm_cmdline (submit, &comm, &cmd);
@@ -828,10 +828,11 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu) }/* Return a new address space for a msm_drm_private instance */ -struct msm_gem_vm * +struct drm_gpuvm *msm_gpu_create_private_vm (struct msm_gpu *gpu,struct task_struct *task) { -struct msm_gem_vm *vm =NULL ; +struct drm_gpuvm *vm =NULL ; +if (!gpu)return NULL ;
@@ -842,11 +843,11 @@ msm_gpu_create_private_vm(struct msm_gpu *gpu, struct task_struct *task)if (gpu->funcs->create_private_vm) { vm = gpu->funcs->create_private_vm (gpu);if (!IS_ERR (vm)) - vm->pid =get_pid (task_pid (task)); +to_msm_vm (vm)->pid =get_pid (task_pid (task)); }if (IS_ERR_OR_NULL (vm)) - vm =msm_gem_vm_get (gpu->vm); + vm =drm_gpuvm_get (gpu->vm);return vm; }
@@ -1014,8 +1015,9 @@ void msm_gpu_cleanup(struct msm_gpu *gpu)msm_gem_kernel_put (gpu->memptrs_bo, gpu->vm);if (!IS_ERR_OR_NULL (gpu->vm)) { - gpu->vm->mmu->funcs->detach (gpu->vm->mmu); -msm_gem_vm_put (gpu->vm); +struct msm_mmu *mmu =to_msm_vm (gpu->vm)->mmu; + mmu->funcs->detach (mmu); +drm_gpuvm_put (gpu->vm); }if (gpu->worker) {
drivers/gpu/drm/msm/msm_gpu.h +5 -5
@@ -78,8 +78,8 @@ struct msm_gpu_funcs {/* note: gpu_set_freq() can assume that we have been pm_resumed */ void (*gpu_set_freq)(struct msm_gpu *gpu,struct dev_pm_opp *opp,bool suspended); -struct msm_gem_vm *(*create_vm)(struct msm_gpu *gpu,struct platform_device *pdev); -struct msm_gem_vm *(*create_private_vm)(struct msm_gpu *gpu); +struct drm_gpuvm *(*create_vm)(struct msm_gpu *gpu,struct platform_device *pdev); +struct drm_gpuvm *(*create_private_vm)(struct msm_gpu *gpu);uint32_t (*get_rptr)(struct msm_gpu *gpu,struct msm_ringbuffer *ring);/**
@@ -234,7 +234,7 @@ struct msm_gpu {void __iomem *mmio;int irq; -struct msm_gem_vm *vm; +struct drm_gpuvm *vm;/* Power Control: */ struct regulator *gpu_reg, *gpu_cx;
@@ -357,7 +357,7 @@ struct msm_context {int queueid;/** @vm: the per-process GPU address-space */ -struct msm_gem_vm *vm; +struct drm_gpuvm *vm;/** @kref: the reference count */ struct kref ref;
@@ -667,7 +667,7 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, struct msm_gpu *gpu, const struct msm_gpu_funcs *funcs, const char *name, struct msm_gpu_config *config); -struct msm_gem_vm * +struct drm_gpuvm *msm_gpu_create_private_vm (struct msm_gpu *gpu,struct task_struct *task);void msm_gpu_cleanup (struct msm_gpu *gpu);
drivers/gpu/drm/msm/msm_kms.c +3 -3
@@ -176,9 +176,9 @@ static int msm_kms_fault_handler(void *arg, unsigned long iova, int flags, voidreturn -ENOSYS ; } -struct msm_gem_vm *msm_kms_init_vm (struct drm_device *dev) +struct drm_gpuvm *msm_kms_init_vm (struct drm_device *dev) { -struct msm_gem_vm *vm; +struct drm_gpuvm *vm;struct msm_mmu *mmu;struct device *mdp_dev = dev->dev;struct device *mdss_dev = mdp_dev->parent;
@@ -212,7 +212,7 @@ struct msm_gem_vm *msm_kms_init_vm(struct drm_device *dev)return vm; } -msm_mmu_set_fault_handler (vm->mmu, kms, msm_kms_fault_handler); +msm_mmu_set_fault_handler (to_msm_vm (vm)->mmu, kms, msm_kms_fault_handler);return vm; }
drivers/gpu/drm/msm/msm_kms.h +1 -1
@@ -139,7 +139,7 @@ struct msm_kms {atomic_t fault_snapshot_capture;/* mapper-id used to request GEM buffer mapped for scanout: */ -struct msm_gem_vm *vm; +struct drm_gpuvm *vm;/* disp snapshot support */ struct kthread_worker *dump_worker;
drivers/gpu/drm/msm/msm_submitqueue.c +1 -1
@@ -59,7 +59,7 @@ void __msm_context_destroy(struct kref *kref)kfree (ctx->entities[i]); } -msm_gem_vm_put (ctx->vm); +drm_gpuvm_put (ctx->vm);kfree (ctx->comm);kfree (ctx->cmdline);kfree (ctx);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 16/42 drm/msm: Split out helper to get iommu prot flags
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
We'll re-use this in the vm_bind path.
--- drivers/gpu/drm/msm/msm_gem.c | 12 ++++++++++-- drivers/gpu/drm/msm/msm_gem.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +10 -2
@@ -462,10 +462,9 @@ static struct drm_gpuva *get_vma_locked(struct drm_gem_object *obj,return vma; } -int msm_gem_pin_vma_locked (struct drm_gem_object *obj,struct drm_gpuva *vma) +int msm_gem_prot (struct drm_gem_object *obj) {struct msm_gem_object *msm_obj =to_msm_bo (obj); -struct page **pages;int prot =IOMMU_READ ;if (!(msm_obj->flags &MSM_BO_GPU_READONLY ))
@@ -477,6 +476,15 @@ int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *vma)if (msm_obj->flags &MSM_BO_CACHED_COHERENT ) prot |=IOMMU_CACHE ; +return prot; +} + +int msm_gem_pin_vma_locked (struct drm_gem_object *obj,struct drm_gpuva *vma) +{ +struct msm_gem_object *msm_obj =to_msm_bo (obj); +struct page **pages; +int prot =msm_gem_prot (obj); +msm_gem_assert_locked (obj); pages =msm_gem_get_pages_locked (obj,MSM_MADV_WILLNEED );
drivers/gpu/drm/msm/msm_gem.h +1 -0
@@ -158,6 +158,7 @@ struct msm_gem_object {#define to_msm_bo (x) container_of(x, struct msm_gem_object, base)uint64_t msm_gem_mmap_offset (struct drm_gem_object *obj); +int msm_gem_prot (struct drm_gem_object *obj);int msm_gem_pin_vma_locked (struct drm_gem_object *obj,struct drm_gpuva *vma);void msm_gem_unpin_locked (struct drm_gem_object *obj);void msm_gem_unpin_active (struct drm_gem_object *obj);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 17/42 drm/msm: Add mmu support for non-zero offset
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Only needs to be supported for iopgtables mmu, the other cases are either only used for kernel managed mappings (where offset is always zero) or devices which do not support sparse bindings.
--- drivers/gpu/drm/msm/adreno/a2xx_gpummu.c | 5 ++++- drivers/gpu/drm/msm/msm_gem.c | 4 ++-- drivers/gpu/drm/msm/msm_gem.h | 4 ++-- drivers/gpu/drm/msm/msm_gem_vma.c | 13 +++++++------ drivers/gpu/drm/msm/msm_iommu.c | 22 ++++++++++++++++++++-- drivers/gpu/drm/msm/msm_mmu.h | 2 +- 6 files changed, 36 insertions(+), 14 deletions(-)
drivers/gpu/drm/msm/adreno/a2xx_gpummu.c +4 -1
@@ -29,13 +29,16 @@ static void a2xx_gpummu_detach(struct msm_mmu *mmu) }static int a2xx_gpummu_map (struct msm_mmu *mmu,uint64_t iova, -struct sg_table *sgt,size_t len,int prot) +struct sg_table *sgt,size_t off,size_t len, +int prot) {struct a2xx_gpummu *gpummu =to_a2xx_gpummu (mmu);unsigned idx = (iova -GPUMMU_VA_START ) /GPUMMU_PAGE_SIZE ;struct sg_dma_page_iter dma_iter;unsigned prot_bits =0 ; +WARN_ON (off !=0 ); +if (prot &IOMMU_WRITE ) prot_bits |=1 ;if (prot &IOMMU_READ )
drivers/gpu/drm/msm/msm_gem.c +2 -2
@@ -453,7 +453,7 @@ static struct drm_gpuva *get_vma_locked(struct drm_gem_object *obj, vma =lookup_vma (obj, vm);if (!vma) { - vma =msm_gem_vma_new (vm, obj, range_start, range_end); + vma =msm_gem_vma_new (vm, obj,0 , range_start, range_end); }else {GEM_WARN_ON (vma->va.addr < range_start);GEM_WARN_ON ((vma->va.addr + obj->size) > range_end);
@@ -491,7 +491,7 @@ int msm_gem_pin_vma_locked(struct drm_gem_object *obj, struct drm_gpuva *vma)if (IS_ERR (pages))return PTR_ERR (pages); -return msm_gem_vma_map (vma, prot, msm_obj->sgt, obj->size); +return msm_gem_vma_map (vma, prot, msm_obj->sgt); }void msm_gem_unpin_locked (struct drm_gem_object *obj)
drivers/gpu/drm/msm/msm_gem.h +2 -2
@@ -110,9 +110,9 @@ struct msm_gem_vma {struct drm_gpuva *msm_gem_vma_new (struct drm_gpuvm *vm,struct drm_gem_object *obj, -u64 range_start,u64 range_end); +u64 offset,u64 range_start,u64 range_end);void msm_gem_vma_purge (struct drm_gpuva *vma); -int msm_gem_vma_map (struct drm_gpuva *vma,int prot,struct sg_table *sgt,int size); +int msm_gem_vma_map (struct drm_gpuva *vma,int prot,struct sg_table *sgt);void msm_gem_vma_close (struct drm_gpuva *vma);struct msm_gem_object {
drivers/gpu/drm/msm/msm_gem_vma.c +7 -6
@@ -38,8 +38,7 @@ void msm_gem_vma_purge(struct drm_gpuva *vma)/* Map and pin vma: */ int -msm_gem_vma_map (struct drm_gpuva *vma,int prot, -struct sg_table *sgt,int size) +msm_gem_vma_map (struct drm_gpuva *vma,int prot,struct sg_table *sgt) {struct msm_gem_vma *msm_vma =to_msm_vma (vma);struct msm_gem_vm *vm =to_msm_vm (vma->vm);
@@ -62,8 +61,9 @@ msm_gem_vma_map(struct drm_gpuva *vma, int prot,* Revisit this if we can come up with a scheme to pre-alloc pages * for the pgtable in map/unmap ops. */ - ret = vm->mmu->funcs->map (vm->mmu, vma->va.addr, sgt, size, prot); - + ret = vm->mmu->funcs->map (vm->mmu, vma->va.addr, sgt, + vma->gem.offset, vma->va.range, + prot);if (ret) { msm_vma->mapped = false; }
@@ -93,7 +93,7 @@ void msm_gem_vma_close(struct drm_gpuva *vma)/* Create a new vma and allocate an iova for it */ struct drm_gpuva *msm_gem_vma_new (struct drm_gpuvm *gpuvm,struct drm_gem_object *obj, -u64 range_start,u64 range_end) +u64 offset,u64 range_start,u64 range_end) {struct msm_gem_vm *vm =to_msm_vm (gpuvm);struct drm_gpuvm_bo *vm_bo;
@@ -107,6 +107,7 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj,return ERR_PTR (-ENOMEM );if (vm->managed) { +BUG_ON (offset !=0 ); ret =drm_mm_insert_node_in_range (&vm->mm, &vma->node, obj->size,PAGE_SIZE ,0 , range_start, range_end,0 );
@@ -120,7 +121,7 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj,GEM_WARN_ON ((range_end - range_start) > obj->size); -drm_gpuva_init (&vma->base, range_start, range_end - range_start, obj,0 ); +drm_gpuva_init (&vma->base, range_start, range_end - range_start, obj, offset); vma->mapped = false; ret =drm_gpuva_insert (&vm->base, &vma->base);
drivers/gpu/drm/msm/msm_iommu.c +20 -2
@@ -113,7 +113,8 @@ static int msm_iommu_pagetable_unmap(struct msm_mmu *mmu, u64 iova, }static int msm_iommu_pagetable_map (struct msm_mmu *mmu,u64 iova, -struct sg_table *sgt,size_t len,int prot) +struct sg_table *sgt,size_t off,size_t len, +int prot) {struct msm_iommu_pagetable *pagetable =to_pagetable (mmu);struct io_pgtable_ops *ops = pagetable->pgtbl_ops;
@@ -125,6 +126,19 @@ static int msm_iommu_pagetable_map(struct msm_mmu *mmu, u64 iova,size_t size = sg->length;phys_addr_t phys =sg_phys (sg); +if (!len) +break ; + +if (size <= off) { + off -= size; +continue ; + } + + phys += off; + size -= off; + size =min_t (size_t, size, len); + off =0 ; +while (size) {size_t pgsize, count, mapped =0 ;int ret;
@@ -140,6 +154,7 @@ static int msm_iommu_pagetable_map(struct msm_mmu *mmu, u64 iova, phys += mapped; addr += mapped; size -= mapped; + len -= mapped;if (ret) {msm_iommu_pagetable_unmap (mmu, iova, addr - iova);
@@ -388,11 +403,14 @@ static void msm_iommu_detach(struct msm_mmu *mmu) }static int msm_iommu_map (struct msm_mmu *mmu,uint64_t iova, -struct sg_table *sgt,size_t len,int prot) +struct sg_table *sgt,size_t off,size_t len, +int prot) {struct msm_iommu *iommu =to_msm_iommu (mmu);size_t ret; +WARN_ON (off !=0 ); +/* The arm-smmu driver expects the addresses to be sign extended */ if (iova &BIT_ULL (48 )) iova |=GENMASK_ULL (63 ,49 );
drivers/gpu/drm/msm/msm_mmu.h +1 -1
@@ -12,7 +12,7 @@struct msm_mmu_funcs {void (*detach)(struct msm_mmu *mmu);int (*map)(struct msm_mmu *mmu,uint64_t iova,struct sg_table *sgt, -size_t len,int prot); +size_t off,size_t len,int prot);int (*unmap)(struct msm_mmu *mmu,uint64_t iova,size_t len);void (*destroy)(struct msm_mmu *mmu);void (*set_stall)(struct msm_mmu *mmu,bool enable);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 18/42 drm/msm: Add PRR support
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Add PRR (Partial Resident Region) is a bypass address which make GPU writes go to /dev/null and reads return zero. This is used to implement vulkan sparse residency.
To support PRR/NULL mappings, we allocate a page to reserve a physical address which we know will not be used as part of a GEM object, and configure the SMMU to use this address for PRR/NULL mappings.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++ drivers/gpu/drm/msm/msm_iommu.c | 62 ++++++++++++++++++++++++- include/uapi/drm/msm_drm.h | 2 + 3 files changed, 73 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +10 -0
@@ -357,6 +357,13 @@ int adreno_fault_handler(struct msm_gpu *gpu, unsigned long iova, int flags,return 0 ; } +static bool +adreno_smmu_has_prr (struct msm_gpu *gpu) +{ +struct adreno_smmu_priv *adreno_smmu =dev_get_drvdata (&gpu->pdev->dev); +return adreno_smmu && adreno_smmu->set_prr_addr; +} +int adreno_get_param (struct msm_gpu *gpu,struct msm_context *ctx,uint32_t param,uint64_t *value,uint32_t *len) {
@@ -440,6 +447,9 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx,case MSM_PARAM_UCHE_TRAP_BASE : *value = adreno_gpu->uche_trap_base;return 0 ; +case MSM_PARAM_HAS_PRR : + *value =adreno_smmu_has_prr (gpu); +return 0 ;default :return UERR (EINVAL , drm,"%s: invalid param: %u" , gpu->name, param); }
drivers/gpu/drm/msm/msm_iommu.c +61 -1
94 lines not on this page · raw message
include/uapi/drm/msm_drm.h +2 -0
@@ -91,6 +91,8 @@ struct drm_msm_timespec {#define MSM_PARAM_UBWC_SWIZZLE 0x12/* RO */ #define MSM_PARAM_MACROTILE_MODE 0x13/* RO */ #define MSM_PARAM_UCHE_TRAP_BASE 0x14/* RO */ +/* PRR (Partially Resident Region) is required for sparse residency: */ +#define MSM_PARAM_HAS_PRR 0x15/* RO */ /* For backwards compat. The original support for preemption was based on * a single ring per priority level so # of priority levels equals the #
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 19/42 drm/msm: Rename msm_gem_vma_purge() -> _unmap()
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
This is a more descriptive name.
--- drivers/gpu/drm/msm/msm_gem.c | 6 +++--- drivers/gpu/drm/msm/msm_gem.h | 2 +- drivers/gpu/drm/msm/msm_gem_vma.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +3 -3
@@ -57,7 +57,7 @@ static void detach_vm(struct drm_gem_object *obj, struct drm_gpuvm *vm) drm_gpuvm_bo_for_each_va (vma, vm_bo) {if (vma->vm != vm)continue ; -msm_gem_vma_purge (vma); +msm_gem_vma_unmap (vma);msm_gem_vma_close (vma);break ; }
@@ -433,7 +433,7 @@ put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *vm, bool close)drm_gpuvm_bo_get (vm_bo); drm_gpuvm_bo_for_each_va_safe (vma, vmatmp, vm_bo) { -msm_gem_vma_purge (vma); +msm_gem_vma_unmap (vma);if (close)msm_gem_vma_close (vma); }
@@ -607,7 +607,7 @@ static int clear_iova(struct drm_gem_object *obj,if (!vma)return 0 ; -msm_gem_vma_purge (vma); +msm_gem_vma_unmap (vma);msm_gem_vma_close (vma);return 0 ;
drivers/gpu/drm/msm/msm_gem.h +1 -1
@@ -111,7 +111,7 @@ struct msm_gem_vma {struct drm_gpuva *msm_gem_vma_new (struct drm_gpuvm *vm,struct drm_gem_object *obj,u64 offset,u64 range_start,u64 range_end); -void msm_gem_vma_purge (struct drm_gpuva *vma); +void msm_gem_vma_unmap (struct drm_gpuva *vma);int msm_gem_vma_map (struct drm_gpuva *vma,int prot,struct sg_table *sgt);void msm_gem_vma_close (struct drm_gpuva *vma);
drivers/gpu/drm/msm/msm_gem_vma.c +1 -1
@@ -21,7 +21,7 @@ msm_gem_vm_free(struct drm_gpuvm *gpuvm) }/* Actually unmap memory for the vma */ -void msm_gem_vma_purge (struct drm_gpuva *vma) +void msm_gem_vma_unmap (struct drm_gpuva *vma) {struct msm_gem_vma *msm_vma =to_msm_vma (vma);struct msm_gem_vm *vm =to_msm_vm (vma->vm);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 20/42 drm/msm: Drop queued submits on lastclose()
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
If we haven't written the submit into the ringbuffer yet, then drop it. The submit still retires through the normal path, to preserve fence signalling order, but we can skip the IB's to userspace cmdstream.
--- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_gpu.h | 8 ++++++++ drivers/gpu/drm/msm/msm_ringbuffer.c | 6 ++++++ 3 files changed, 15 insertions(+)
drivers/gpu/drm/msm/msm_drv.c +1 -0
@@ -254,6 +254,7 @@ static int msm_open(struct drm_device *dev, struct drm_file *file)static void context_close (struct msm_context *ctx) { + ctx->closed = true;msm_submitqueue_close (ctx);msm_context_put (ctx); }
drivers/gpu/drm/msm/msm_gpu.h +8 -0
@@ -356,6 +356,14 @@ struct msm_context {*/ int queueid; +/** +* @closed: The device file associated with this context has been closed. +* +* Once the device is closed, any submits that have not been written +* to the ring buffer are no-op'd. +*/ +bool closed; +/** @vm: the per-process GPU address-space */ struct drm_gpuvm *vm;
drivers/gpu/drm/msm/msm_ringbuffer.c +6 -0
@@ -17,6 +17,7 @@ static struct dma_fence *msm_job_run(struct drm_sched_job *job)struct msm_fence_context *fctx = submit->ring->fctx;struct msm_gpu *gpu = submit->gpu;struct msm_drm_private *priv = gpu->dev->dev_private; +unsigned nr_cmds = submit->nr_cmds;int i;msm_fence_init (submit->hw_fence, fctx);
@@ -36,8 +37,13 @@ static struct dma_fence *msm_job_run(struct drm_sched_job *job)/* TODO move submit path over to using a per-ring lock.. */ mutex_lock (&gpu->lock); +if (submit->queue->ctx->closed) + submit->nr_cmds =0 ; +msm_gpu_submit (gpu, submit); + submit->nr_cmds = nr_cmds; +mutex_unlock (&gpu->lock);return dma_fence_get (submit->hw_fence);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 21/42 drm/msm: Lazily create context VM
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
In the next commit, a way for userspace to opt-in to userspace managed VM is added. For this to work, we need to defer creation of the VM until it is needed.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 3 ++- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 14 +++++++----- drivers/gpu/drm/msm/msm_drv.c | 29 ++++++++++++++++++++----- drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- drivers/gpu/drm/msm/msm_gpu.h | 9 +++++++- 5 files changed, 43 insertions(+), 14 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2 -1
@@ -112,6 +112,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gpu, {bool sysprof =refcount_read (&a6xx_gpu->base.base.sysprof_active) >1 ;struct msm_context *ctx = submit->queue->ctx; +struct drm_gpuvm *vm =msm_context_vm (submit->dev, ctx);struct adreno_gpu *adreno_gpu = &a6xx_gpu->base;phys_addr_t ttbr;u32 asid;
@@ -120,7 +121,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gpu,if (ctx->seqno == ring->cur_ctx_seqno)return ; -if (msm_iommu_pagetable_params (to_msm_vm (ctx->vm)->mmu, &ttbr, &asid)) +if (msm_iommu_pagetable_params (to_msm_vm (vm)->mmu, &ttbr, &asid))return ;if (adreno_gpu->info->family >=ADRENO_7XX_GEN1 ) {
drivers/gpu/drm/msm/adreno/adreno_gpu.c +8 -6
@@ -369,6 +369,8 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx, {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct drm_device *drm = gpu->dev; +/* Note ctx can be NULL when called from rd_open(): */ +struct drm_gpuvm *vm = ctx ?msm_context_vm (drm, ctx) :NULL ;/* No pointer params yet */ if (*len !=0 )
@@ -414,8 +416,8 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx, *value =0 ;return 0 ;case MSM_PARAM_FAULTS : -if (ctx->vm) - *value = gpu->global_faults +to_msm_vm (ctx->vm)->faults; +if (vm) + *value = gpu->global_faults +to_msm_vm (vm)->faults;else *value = gpu->global_faults;return 0 ;
@@ -423,14 +425,14 @@ int adreno_get_param(struct msm_gpu *gpu, struct msm_context *ctx, *value = gpu->suspend_count;return 0 ;case MSM_PARAM_VA_START : -if (ctx->vm == gpu->vm) +if (vm == gpu->vm)return UERR (EINVAL , drm,"requires per-process pgtables" ); - *value = ctx->vm->mm_start; + *value = vm->mm_start;return 0 ;case MSM_PARAM_VA_SIZE : -if (ctx->vm == gpu->vm) +if (vm == gpu->vm)return UERR (EINVAL , drm,"requires per-process pgtables" ); - *value = ctx->vm->mm_range; + *value = vm->mm_range;return 0 ;case MSM_PARAM_HIGHEST_BANK_BIT : *value = adreno_gpu->ubwc_config.highest_bank_bit;
drivers/gpu/drm/msm/msm_drv.c +24 -5
@@ -218,10 +218,29 @@ static void load_gpu(struct drm_device *dev)mutex_unlock (&init_lock); } +/** +* msm_context_vm - lazily create the context's VM +* +* @dev: the drm device +* @ctx: the context +* +* The VM is lazily created, so that userspace has a chance to opt-in to having +* a userspace managed VM before the VM is created. +* +* Note that this does not return a reference to the VM. Once the VM is created, +* it exists for the lifetime of the context. +*/ +struct drm_gpuvm *msm_context_vm (struct drm_device *dev,struct msm_context *ctx) +{ +struct msm_drm_private *priv = dev->dev_private; +if (!ctx->vm) + ctx->vm =msm_gpu_create_private_vm (priv->gpu, current); +return ctx->vm; +} +static int context_init (struct drm_device *dev,struct drm_file *file) {static atomic_t ident =ATOMIC_INIT (0 ); -struct msm_drm_private *priv = dev->dev_private;struct msm_context *ctx; ctx =kzalloc (sizeof (*ctx),GFP_KERNEL );
@@ -234,7 +253,6 @@ static int context_init(struct drm_device *dev, struct drm_file *file)kref_init (&ctx->ref);msm_submitqueue_init (dev, ctx); - ctx->vm =msm_gpu_create_private_vm (priv->gpu, current); file->driver_priv = ctx; ctx->seqno =atomic_inc_return (&ident);
@@ -413,7 +431,7 @@ static int msm_ioctl_gem_info_iova(struct drm_device *dev,* Don't pin the memory here - just get an address so that userspace can * be productive */ -return msm_gem_get_iova (obj, ctx->vm, iova); +return msm_gem_get_iova (obj,msm_context_vm (dev, ctx), iova); } static int msm_ioctl_gem_info_set_iova(struct drm_device *dev,
@@ -422,18 +440,19 @@ static int msm_ioctl_gem_info_set_iova(struct drm_device *dev, {struct msm_drm_private *priv = dev->dev_private;struct msm_context *ctx = file->driver_priv; +struct drm_gpuvm *vm =msm_context_vm (dev, ctx);if (!priv->gpu)return -EINVAL ;/* Only supported if per-process address space is supported: */ -if (priv->gpu->vm == ctx->vm) +if (priv->gpu->vm == vm)return UERR (EOPNOTSUPP , dev,"requires per-process pgtables" );if (should_fail (&fail_gem_iova, obj->size))return -ENOMEM ; -return msm_gem_set_iova (obj, ctx->vm, iova); +return msm_gem_set_iova (obj, vm, iova); } static int msm_ioctl_gem_info_set_metadata(struct drm_gem_object *obj,
drivers/gpu/drm/msm/msm_gem_submit.c +1 -1
@@ -63,7 +63,7 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,kref_init (&submit->ref); submit->dev = dev; - submit->vm = queue->ctx->vm; + submit->vm =msm_context_vm (dev, queue->ctx); submit->gpu = gpu; submit->cmd = (void *)&submit->bos[nr_bos]; submit->queue = queue;
drivers/gpu/drm/msm/msm_gpu.h +8 -1
@@ -364,7 +364,12 @@ struct msm_context {*/ bool closed; -/** @vm: the per-process GPU address-space */ +/** +* @vm: +* +* The per-process GPU address-space. Do not access directly, use +* msm_context_vm(). +*/ struct drm_gpuvm *vm;/** @kref: the reference count */
@@ -449,6 +454,8 @@ struct msm_context {atomic64_t ctx_mem; }; +struct drm_gpuvm *msm_context_vm (struct drm_device *dev,struct msm_context *ctx); +/** * msm_gpu_convert_priority - Map userspace priority to ring # and sched priority *
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 22/42 drm/msm: Add opt-in for VM_BIND
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Add a SET_PARAM for userspace to request to manage to the VM itself, instead of getting a kernel managed VM.
In order to transition to a userspace managed VM, this param must be set before any mappings are created.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++-- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 15 +++++++++++++ drivers/gpu/drm/msm/msm_drv.c | 22 +++++++++++++++++-- drivers/gpu/drm/msm/msm_gem.c | 8 +++++++ drivers/gpu/drm/msm/msm_gpu.c | 5 +++-- drivers/gpu/drm/msm/msm_gpu.h | 29 +++++++++++++++++++++++-- include/uapi/drm/msm_drm.h | 24 ++++++++++++++++++++ 7 files changed, 99 insertions(+), 8 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2 -2
@@ -2276,7 +2276,7 @@ a6xx_create_vm(struct msm_gpu *gpu, struct platform_device *pdev) }static struct drm_gpuvm * -a6xx_create_private_vm (struct msm_gpu *gpu) +a6xx_create_private_vm (struct msm_gpu *gpu,bool kernel_managed) {struct msm_mmu *mmu;
@@ -2286,7 +2286,7 @@ a6xx_create_private_vm(struct msm_gpu *gpu)return ERR_CAST (mmu);return msm_gem_vm_create (gpu->dev, mmu,"gpu" ,ADRENO_VM_START , -adreno_private_vm_size (gpu), true); +adreno_private_vm_size (gpu), kernel_managed); }static uint32_t a6xx_get_rptr (struct msm_gpu *gpu,struct msm_ringbuffer *ring)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +15 -0
@@ -504,6 +504,21 @@ int adreno_set_param(struct msm_gpu *gpu, struct msm_context *ctx,if (!capable (CAP_SYS_ADMIN ))return UERR (EPERM , drm,"invalid permissions" );return msm_context_set_sysprof (ctx, gpu, value); +case MSM_PARAM_EN_VM_BIND : +/* We can only support VM_BIND with per-process pgtables: */ +if (ctx->vm == gpu->vm) +return UERR (EINVAL , drm,"requires per-process pgtables" ); + +/* +* We can only swtich to VM_BIND mode if the VM has not yet +* been created: +*/ +if (ctx->vm) +return UERR (EBUSY , drm,"VM already created" ); + + ctx->userspace_managed_vm = value; + +return 0 ;default :return UERR (EINVAL , drm,"%s: invalid param: %u" , gpu->name, param); }
drivers/gpu/drm/msm/msm_drv.c +20 -2
@@ -232,9 +232,21 @@ static void load_gpu(struct drm_device *dev)*/ struct drm_gpuvm *msm_context_vm (struct drm_device *dev,struct msm_context *ctx) { +static DEFINE_MUTEX (init_lock);struct msm_drm_private *priv = dev->dev_private; -if (!ctx->vm) - ctx->vm =msm_gpu_create_private_vm (priv->gpu, current); + +/* Once ctx->vm is created it is valid for the lifetime of the context: */ +if (ctx->vm) +return ctx->vm; + +mutex_lock (&init_lock); +if (!ctx->vm) { + ctx->vm =msm_gpu_create_private_vm ( + priv->gpu, current, !ctx->userspace_managed_vm); + + } +mutex_unlock (&init_lock); +return ctx->vm; }
@@ -424,6 +436,9 @@ static int msm_ioctl_gem_info_iova(struct drm_device *dev,if (!priv->gpu)return -EINVAL ; +if (msm_context_is_vmbind (ctx)) +return UERR (EINVAL , dev,"VM_BIND is enabled" ); +if (should_fail (&fail_gem_iova, obj->size))return -ENOMEM ;
@@ -445,6 +460,9 @@ static int msm_ioctl_gem_info_set_iova(struct drm_device *dev,if (!priv->gpu)return -EINVAL ; +if (msm_context_is_vmbind (ctx)) +return UERR (EINVAL , dev,"VM_BIND is enabled" ); +/* Only supported if per-process address space is supported: */ if (priv->gpu->vm == vm)return UERR (EOPNOTSUPP , dev,"requires per-process pgtables" );
drivers/gpu/drm/msm/msm_gem.c +8 -0
@@ -81,6 +81,14 @@ static void msm_gem_close(struct drm_gem_object *obj, struct drm_file *file)if (!ctx->vm)return ; +/* +* VM_BIND does not depend on implicit teardown of VMAs on handle +* close, but instead on implicit teardown of the VM when the device +* is closed (see msm_gem_vm_close()) +*/ +if (msm_context_is_vmbind (ctx)) +return ; +/* * TODO we might need to kick this to a queue to avoid blocking * in CLOSE ioctl
drivers/gpu/drm/msm/msm_gpu.c +3 -2
@@ -829,7 +829,8 @@ static int get_clocks(struct platform_device *pdev, struct msm_gpu *gpu)/* Return a new address space for a msm_drm_private instance */ struct drm_gpuvm * -msm_gpu_create_private_vm (struct msm_gpu *gpu,struct task_struct *task) +msm_gpu_create_private_vm (struct msm_gpu *gpu,struct task_struct *task, +bool kernel_managed) {struct drm_gpuvm *vm =NULL ;
@@ -841,7 +842,7 @@ msm_gpu_create_private_vm(struct msm_gpu *gpu, struct task_struct *task)* the global one */ if (gpu->funcs->create_private_vm) { - vm = gpu->funcs->create_private_vm (gpu); + vm = gpu->funcs->create_private_vm (gpu, kernel_managed);if (!IS_ERR (vm))to_msm_vm (vm)->pid =get_pid (task_pid (task)); }
drivers/gpu/drm/msm/msm_gpu.h +27 -2
@@ -79,7 +79,7 @@ struct msm_gpu_funcs {void (*gpu_set_freq)(struct msm_gpu *gpu,struct dev_pm_opp *opp,bool suspended);struct drm_gpuvm *(*create_vm)(struct msm_gpu *gpu,struct platform_device *pdev); -struct drm_gpuvm *(*create_private_vm)(struct msm_gpu *gpu); +struct drm_gpuvm *(*create_private_vm)(struct msm_gpu *gpu,bool kernel_managed);uint32_t (*get_rptr)(struct msm_gpu *gpu,struct msm_ringbuffer *ring);/**
@@ -364,6 +364,14 @@ struct msm_context {*/ bool closed; +/** +* @userspace_managed_vm: +* +* Has userspace opted-in to userspace managed VM (ie. VM_BIND) via +* MSM_PARAM_EN_VM_BIND? +*/ +bool userspace_managed_vm; +/** * @vm: *
@@ -456,6 +464,22 @@ struct msm_context {struct drm_gpuvm *msm_context_vm (struct drm_device *dev,struct msm_context *ctx); +/** +* msm_context_is_vm_bind() - has userspace opted in to VM_BIND? +* +* @ctx: the drm_file context +* +* See MSM_PARAM_EN_VM_BIND. If userspace is managing the VM, it can +* do sparse binding including having multiple, potentially partial, +* mappings in the VM. Therefore certain legacy uabi (ie. GET_IOVA, +* SET_IOVA) are rejected because they don't have a sensible meaning. +*/ +static inline bool +msm_context_is_vmbind (struct msm_context *ctx) +{ +return ctx->userspace_managed_vm; +} +/** * msm_gpu_convert_priority - Map userspace priority to ring # and sched priority *
@@ -683,7 +707,8 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, const char *name, struct msm_gpu_config *config);struct drm_gpuvm * -msm_gpu_create_private_vm (struct msm_gpu *gpu,struct task_struct *task); +msm_gpu_create_private_vm (struct msm_gpu *gpu,struct task_struct *task, +bool kernel_managed);void msm_gpu_cleanup (struct msm_gpu *gpu);
include/uapi/drm/msm_drm.h +24 -0
@@ -93,6 +93,30 @@ struct drm_msm_timespec {#define MSM_PARAM_UCHE_TRAP_BASE 0x14/* RO */ /* PRR (Partially Resident Region) is required for sparse residency: */ #define MSM_PARAM_HAS_PRR 0x15/* RO */ +/* MSM_PARAM_EN_VM_BIND is set to 1 to enable VM_BIND ops. +* +* With VM_BIND enabled, userspace is required to allocate iova and use the +* VM_BIND ops for map/unmap ioctls. MSM_INFO_SET_IOVA and MSM_INFO_GET_IOVA +* will be rejected. (The latter does not have a sensible meaning when a BO +* can have multiple and/or partial mappings.) +* +* With VM_BIND enabled, userspace does not include a submit_bo table in the +* SUBMIT ioctl (this will be rejected), the resident set is determined by +* the the VM_BIND ops. +* +* Enabling VM_BIND will fail on devices which do not have per-process pgtables. +* And it is not allowed to disable VM_BIND once it has been enabled. +* +* Enabling VM_BIND should be done (attempted) prior to allocating any BOs or +* submitqueues of type MSM_SUBMITQUEUE_VM_BIND. +* +* Relatedly, when VM_BIND mode is enabled, the kernel will not try to recover +* from GPU faults or failed async VM_BIND ops, in particular because it is +* difficult to communicate to userspace which op failed so that userspace +* could rewind and try again. When the VM is marked unusable, the SUBMIT +* ioctl will throw -EPIPE. +*/ +#define MSM_PARAM_EN_VM_BIND 0x16/* WO, once */ /* For backwards compat. The original support for preemption was based on * a single ring per priority level so # of priority levels equals the #
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 23/42 drm/msm: Mark VM as unusable on GPU hangs
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
If userspace has opted-in to VM_BIND, then GPU hangs and VM_BIND errors will mark the VM as unusable.
--- drivers/gpu/drm/msm/msm_gem.h | 17 +++++++++++++++++ drivers/gpu/drm/msm/msm_gem_submit.c | 3 +++ drivers/gpu/drm/msm/msm_gpu.c | 16 ++++++++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gem.h +17 -0
@@ -76,6 +76,23 @@ struct msm_gem_vm {/** @managed: is this a kernel managed VM? */ bool managed; + +/** +* @unusable: True if the VM has turned unusable because something +* bad happened during an asynchronous request. +* +* We don't try to recover from such failures, because this implies +* informing userspace about the specific operation that failed, and +* hoping the userspace driver can replay things from there. This all +* sounds very complicated for little gain. +* +* Instead, we should just flag the VM as unusable, and fail any +* further request targeting this VM. +* +* As an analogy, this would be mapped to a VK_ERROR_DEVICE_LOST +* situation, where the logical device needs to be re-created. +*/ +bool unusable; };#define to_msm_vm (x) container_of(x, struct msm_gem_vm, base)
drivers/gpu/drm/msm/msm_gem_submit.c +3 -0
@@ -681,6 +681,9 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,if (args->pad)return -EINVAL ; +if (to_msm_vm (ctx->vm)->unusable) +return UERR (EPIPE , dev,"context is unusable" ); +/* for now, we just have 3d pipe.. eventually this would need to * be more clever to dispatch to appropriate gpu module: */
drivers/gpu/drm/msm/msm_gpu.c +14 -2
@@ -389,8 +389,20 @@ static void recover_worker(struct kthread_work *work)/* Increment the fault counts */ submit->queue->faults++; -if (submit->vm) -to_msm_vm (submit->vm)->faults++; +if (submit->vm) { +struct msm_gem_vm *vm =to_msm_vm (submit->vm); + + vm->faults++; + +/* +* If userspace has opted-in to VM_BIND (and therefore userspace +* management of the VM), faults mark the VM as unusuable. This +* matches vulkan expectations (vulkan is the main target for +* VM_BIND) +*/ +if (!vm->managed) + vm->unusable = true; + }get_comm_cmdline (submit, &comm, &cmd);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 24/42 drm/msm: Add _NO_SHARE flag
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Buffers that are not shared between contexts can share a single resv object. This way drm_gpuvm will not track them as external objects, and submit-time validating overhead will be O(1) for all N non-shared BOs, instead of O(n).
--- drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_gem.c | 21 +++++++++++++++++++++ drivers/gpu/drm/msm/msm_gem_prime.c | 15 +++++++++++++++ include/uapi/drm/msm_drm.h | 14 ++++++++++++++ 4 files changed, 51 insertions(+)
drivers/gpu/drm/msm/msm_drv.h +1 -0
@@ -269,6 +269,7 @@ int msm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map);void msm_gem_prime_vunmap (struct drm_gem_object *obj,struct iosys_map *map);struct drm_gem_object *msm_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg); +struct dma_buf *msm_gem_prime_export (struct drm_gem_object *obj,int flags);int msm_gem_prime_pin (struct drm_gem_object *obj);void msm_gem_prime_unpin (struct drm_gem_object *obj);
drivers/gpu/drm/msm/msm_gem.c +21 -0
@@ -546,6 +546,9 @@ static int get_and_pin_iova_range_locked(struct drm_gem_object *obj,msm_gem_assert_locked (obj); +if (to_msm_bo (obj)->flags &MSM_BO_NO_SHARE ) +return -EINVAL ; + vma =get_vma_locked (obj, vm, range_start, range_end);if (IS_ERR (vma))return PTR_ERR (vma);
@@ -1076,6 +1079,14 @@ static void msm_gem_free_object(struct drm_gem_object *obj)put_pages (obj); } +if (msm_obj->flags &MSM_BO_NO_SHARE ) { +struct drm_gem_object *r_obj = + container_of(obj->resv, struct drm_gem_object, _resv); + +/* Drop reference we hold to shared resv obj: */ +drm_gem_object_put (r_obj); + } +drm_gem_object_release (obj);kfree (msm_obj->metadata);
@@ -1108,6 +1119,15 @@ int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,if (name)msm_gem_object_set_name (obj,"%s" , name); +if (flags &MSM_BO_NO_SHARE ) { +struct msm_context *ctx = file->driver_priv; +struct drm_gem_object *r_obj =drm_gpuvm_resv_obj (ctx->vm); + +drm_gem_object_get (r_obj); + + obj->resv = r_obj->resv; + } + ret =drm_gem_handle_create (file, obj, handle);/* drop reference from allocate - handle holds it now */
@@ -1140,6 +1160,7 @@ static const struct drm_gem_object_funcs msm_gem_object_funcs = { .free = msm_gem_free_object, .open = msm_gem_open, .close = msm_gem_close, + .export = msm_gem_prime_export, .pin = msm_gem_prime_pin, .unpin = msm_gem_prime_unpin, .get_sg_table = msm_gem_prime_get_sg_table,
drivers/gpu/drm/msm/msm_gem_prime.c +15 -0
@@ -16,6 +16,9 @@ struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj)struct msm_gem_object *msm_obj =to_msm_bo (obj);int npages = obj->size >>PAGE_SHIFT ; +if (msm_obj->flags &MSM_BO_NO_SHARE ) +return ERR_PTR (-EINVAL ); +if (WARN_ON (!msm_obj->pages))/* should have already pinned! */ return ERR_PTR (-ENOMEM );
@@ -45,6 +48,15 @@ struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev,return msm_gem_import (dev, attach->dmabuf, sg); } + +struct dma_buf *msm_gem_prime_export (struct drm_gem_object *obj,int flags) +{ +if (to_msm_bo (obj)->flags &MSM_BO_NO_SHARE ) +return ERR_PTR (-EPERM ); + +return drm_gem_prime_export (obj, flags); +} +int msm_gem_prime_pin (struct drm_gem_object *obj) {struct page **pages;
@@ -53,6 +65,9 @@ int msm_gem_prime_pin(struct drm_gem_object *obj)if (drm_gem_is_imported (obj))return 0 ; +if (to_msm_bo (obj)->flags &MSM_BO_NO_SHARE ) +return -EINVAL ; + pages =msm_gem_pin_pages_locked (obj);if (IS_ERR (pages)) ret =PTR_ERR (pages);
include/uapi/drm/msm_drm.h +14 -0
@@ -140,6 +140,19 @@ struct drm_msm_param {#define MSM_BO_SCANOUT 0x00000001/* scanout capable */ #define MSM_BO_GPU_READONLY 0x00000002 +/* Private buffers do not need to be explicitly listed in the SUBMIT +* ioctl, unless referenced by a drm_msm_gem_submit_cmd. Private +* buffers may NOT be imported/exported or used for scanout (or any +* other situation where buffers can be indefinitely pinned, but +* cases other than scanout are all kernel owned BOs which are not +* visible to userspace). +* +* In exchange for those constraints, all private BOs associated with +* a single context (drm_file) share a single dma_resv, and if there +* has been no eviction since the last submit, there are no per-BO +* bookeeping to do, significantly cutting the SUBMIT overhead. +*/ +#define MSM_BO_NO_SHARE 0x00000004#define MSM_BO_CACHE_MASK 0x000f0000/* cache modes */ #define MSM_BO_CACHED 0x00010000
@@ -149,6 +162,7 @@ struct drm_msm_param {#define MSM_BO_FLAGS (MSM_BO_SCANOUT | \ MSM_BO_GPU_READONLY | \ + MSM_BO_NO_SHARE | \ MSM_BO_CACHE_MASK)struct drm_msm_gem_new {
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 25/42 drm/msm: Crashdump prep for sparse mappings
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
In this case, userspace could request dumping partial GEM obj mappings. Also drop use of should_dump() helper, which really only makes sense in the old submit->bos[] table world.
--- drivers/gpu/drm/msm/msm_gpu.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/msm_gpu.c +10 -7
@@ -219,13 +219,14 @@ static void msm_gpu_devcoredump_free(void *data) }static void msm_gpu_crashstate_get_bo (struct msm_gpu_state *state, -struct drm_gem_object *obj,u64 iova,bool full) +struct drm_gem_object *obj,u64 iova, +bool full,size_t offset,size_t size) {struct msm_gpu_state_bo *state_bo = &state->bos[state->nr_bos];struct msm_gem_object *msm_obj =to_msm_bo (obj);/* Don't record write only objects */ - state_bo->size = obj->size; + state_bo->size = size; state_bo->flags = msm_obj->flags; state_bo->iova = iova;
@@ -236,7 +237,7 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state,if (full) {void *ptr; - state_bo->data =kvmalloc (obj->size,GFP_KERNEL ); + state_bo->data =kvmalloc (size,GFP_KERNEL );if (!state_bo->data) goto out;
@@ -249,7 +250,7 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state, goto out; } -memcpy (state_bo->data, ptr, obj->size); +memcpy (state_bo->data, ptr + offset, size);msm_gem_put_vaddr (obj); } out:
@@ -281,6 +282,7 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, state->fault_info = *fault_info;if (submit) { +extern bool rd_full;int i;if (state->fault_info.ttbr0) {
@@ -296,9 +298,10 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, sizeof(struct msm_gpu_state_bo), GFP_KERNEL);for (i =0 ; state->bos && i < submit->nr_bos; i++) { -msm_gpu_crashstate_get_bo (state, submit->bos[i].obj, - submit->bos[i].iova, -should_dump (submit, i)); +struct drm_gem_object *obj = submit->bos[i].obj; +bool dump = rd_full || (submit->bos[i].flags &MSM_SUBMIT_BO_DUMP ); +msm_gpu_crashstate_get_bo (state, obj, submit->bos[i].iova, + dump,0 , obj->size); } }
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 26/42 drm/msm: rd dumping prep for sparse mappings
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Similar to the previous commit, add support for dumping partial mappings.
--- drivers/gpu/drm/msm/msm_gem.h | 10 --------- drivers/gpu/drm/msm/msm_rd.c | 38 ++++++++++++++++------------------- 2 files changed, 17 insertions(+), 31 deletions(-)
drivers/gpu/drm/msm/msm_gem.h +0 -10
@@ -403,14 +403,4 @@ static inline void msm_gem_submit_put(struct msm_gem_submit *submit)void msm_submit_retire (struct msm_gem_submit *submit); -/* helper to determine of a buffer in submit should be dumped, used for both -* devcoredump and debugfs cmdstream dumping: -*/ -static inline bool -should_dump (struct msm_gem_submit *submit,int idx) -{ -extern bool rd_full; -return rd_full || (submit->bos[idx].flags &MSM_SUBMIT_BO_DUMP ); -} -#endif /* __MSM_GEM_H__ */
drivers/gpu/drm/msm/msm_rd.c +17 -21
@@ -308,21 +308,11 @@ void msm_rd_debugfs_cleanup(struct msm_drm_private *priv) priv->hangrd =NULL ; } -static void snapshot_buf (struct msm_rd_state *rd, -struct msm_gem_submit *submit,int idx, -uint64_t iova,uint32_t size,bool full) +static void snapshot_buf (struct msm_rd_state *rd,struct drm_gem_object *obj, +uint64_t iova,bool full,size_t offset,size_t size) { -struct drm_gem_object *obj = submit->bos[idx].obj; -unsigned offset =0 ;const char *buf; -if (iova) { - offset = iova - submit->bos[idx].iova; - }else { - iova = submit->bos[idx].iova; - size = obj->size; - } -/* * Always write the GPUADDR header so can get a complete list of all the * buffers in the cmd
@@ -333,10 +323,6 @@ static void snapshot_buf(struct msm_rd_state *rd,if (!full)return ; -/* But only dump the contents of buffers marked READ */ -if (!(submit->bos[idx].flags &MSM_SUBMIT_BO_READ )) -return ; - buf =msm_gem_get_vaddr_active (obj);if (IS_ERR (buf))return ;
@@ -352,6 +338,7 @@ static void snapshot_buf(struct msm_rd_state *rd,void msm_rd_dump_submit (struct msm_rd_state *rd,struct msm_gem_submit *submit,const char *fmt, ...) { +extern bool rd_full;struct task_struct *task;char msg[256 ];int i, n;
@@ -385,16 +372,25 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,rd_write_section (rd,RD_CMD , msg,ALIGN (n,4 )); -for (i =0 ; i < submit->nr_bos; i++) -snapshot_buf (rd, submit, i,0 ,0 ,should_dump (submit, i)); +for (i =0 ; i < submit->nr_bos; i++) { +struct drm_gem_object *obj = submit->bos[i].obj; +bool dump = rd_full || (submit->bos[i].flags &MSM_SUBMIT_BO_DUMP ); + +snapshot_buf (rd, obj, submit->bos[i].iova, dump,0 , obj->size); + }for (i =0 ; i < submit->nr_cmds; i++) {uint32_t szd = submit->cmd[i].size;/* in dwords */ +int idx = submit->cmd[i].idx; +bool dump = rd_full || (submit->bos[idx].flags &MSM_SUBMIT_BO_DUMP );/* snapshot cmdstream bo's (if we haven't already): */ -if (!should_dump (submit, i)) { -snapshot_buf (rd, submit, submit->cmd[i].idx, - submit->cmd[i].iova, szd *4 , true); +if (!dump) { +struct drm_gem_object *obj = submit->bos[idx].obj; +size_t offset = submit->cmd[i].iova - submit->bos[idx].iova; + +snapshot_buf (rd, obj, submit->cmd[i].iova, true, + offset, szd *4 ); } }
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 27/42 drm/msm: Crashdump support for sparse
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
In this case, we need to iterate the VMAs looking for ones with MSM_VMA_DUMP flag.
--- drivers/gpu/drm/msm/msm_gpu.c | 96 ++++++++++++++++++++++++++--------- 1 file changed, 72 insertions(+), 24 deletions(-)
drivers/gpu/drm/msm/msm_gpu.c +72 -24
@@ -241,9 +241,7 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state,if (!state_bo->data) goto out; -msm_gem_lock (obj); ptr =msm_gem_get_vaddr_active (obj); -msm_gem_unlock (obj);if (IS_ERR (ptr)) {kvfree (state_bo->data); state_bo->data =NULL ;
@@ -251,12 +249,75 @@ static void msm_gpu_crashstate_get_bo(struct msm_gpu_state *state, }memcpy (state_bo->data, ptr + offset, size); -msm_gem_put_vaddr (obj); +msm_gem_put_vaddr_locked (obj); } out: state->nr_bos++; } +static void crashstate_get_bos (struct msm_gpu_state *state,struct msm_gem_submit *submit) +{ +extern bool rd_full; + +if (!submit) +return ; + +if (msm_context_is_vmbind (submit->queue->ctx)) { +struct drm_exec exec; +struct drm_gpuva *vma; +unsigned cnt =0 ; + +drm_exec_init (&exec,DRM_EXEC_IGNORE_DUPLICATES ,0 ); + drm_exec_until_all_locked(&exec) { + cnt =0 ; + +drm_exec_lock_obj (&exec,drm_gpuvm_resv_obj (submit->vm)); +drm_exec_retry_on_contention (&exec); + + drm_gpuvm_for_each_va (vma, submit->vm) { +if (!vma->gem.obj) +continue ; + + cnt++; +drm_exec_lock_obj (&exec, vma->gem.obj); +drm_exec_retry_on_contention (&exec); + } + + } + +drm_gpuvm_for_each_va (vma, submit->vm) + cnt++; + + state->bos =kcalloc (cnt,sizeof (struct msm_gpu_state_bo ),GFP_KERNEL ); + + drm_gpuvm_for_each_va (vma, submit->vm) { +bool dump = rd_full || (vma->flags &MSM_VMA_DUMP ); + +/* Skip MAP_NULL/PRR VMAs: */ +if (!vma->gem.obj) +continue ; + +msm_gpu_crashstate_get_bo (state, vma->gem.obj, vma->va.addr, + dump, vma->gem.offset, vma->va.range); + } + +drm_exec_fini (&exec); + }else { + state->bos =kcalloc (submit->nr_bos, +sizeof (struct msm_gpu_state_bo ),GFP_KERNEL ); + +for (int i =0 ; state->bos && i < submit->nr_bos; i++) { +struct drm_gem_object *obj = submit->bos[i].obj;; +bool dump = rd_full || (submit->bos[i].flags &MSM_SUBMIT_BO_DUMP ); + +msm_gem_lock (obj); +msm_gpu_crashstate_get_bo (state, obj, submit->bos[i].iova, + dump,0 , obj->size); +msm_gem_unlock (obj); + } + } +} +static void msm_gpu_crashstate_capture (struct msm_gpu *gpu,struct msm_gem_submit *submit,struct msm_gpu_fault_info *fault_info,char *comm,char *cmd)
@@ -281,30 +342,17 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,if (fault_info) state->fault_info = *fault_info; -if (submit) { -extern bool rd_full; -int i; - -if (state->fault_info.ttbr0) { -struct msm_gpu_fault_info *info = &state->fault_info; -struct msm_mmu *mmu =to_msm_vm (submit->vm)->mmu; +if (submit && state->fault_info.ttbr0) { +struct msm_gpu_fault_info *info = &state->fault_info; +struct msm_mmu *mmu =to_msm_vm (submit->vm)->mmu; -msm_iommu_pagetable_params (mmu, &info->pgtbl_ttbr0, - &info->asid); -msm_iommu_pagetable_walk (mmu, info->iova, info->ptes); - } - - state->bos =kcalloc (submit->nr_bos, -sizeof (struct msm_gpu_state_bo ),GFP_KERNEL ); - -for (i =0 ; state->bos && i < submit->nr_bos; i++) { -struct drm_gem_object *obj = submit->bos[i].obj; -bool dump = rd_full || (submit->bos[i].flags &MSM_SUBMIT_BO_DUMP ); -msm_gpu_crashstate_get_bo (state, obj, submit->bos[i].iova, - dump,0 , obj->size); - } +msm_iommu_pagetable_params (mmu, &info->pgtbl_ttbr0, + &info->asid); +msm_iommu_pagetable_walk (mmu, info->iova, info->ptes); } +crashstate_get_bos (state, submit); +/* Set the active crash state to be dumped on failure */ gpu->crashstate = state;
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 28/42 drm/msm: rd dumping support for sparse
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
As with devcoredump, we need to iterate the VMAs to figure out what to dump.
--- drivers/gpu/drm/msm/msm_rd.c | 48 +++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 15 deletions(-)
drivers/gpu/drm/msm/msm_rd.c +33 -15
@@ -372,25 +372,43 @@ void msm_rd_dump_submit(struct msm_rd_state *rd, struct msm_gem_submit *submit,rd_write_section (rd,RD_CMD , msg,ALIGN (n,4 )); -for (i =0 ; i < submit->nr_bos; i++) { -struct drm_gem_object *obj = submit->bos[i].obj; -bool dump = rd_full || (submit->bos[i].flags &MSM_SUBMIT_BO_DUMP ); +if (msm_context_is_vmbind (submit->queue->ctx)) { +struct drm_gpuva *vma; -snapshot_buf (rd, obj, submit->bos[i].iova, dump,0 , obj->size); - } +drm_gpuvm_resv_assert_held (submit->vm); -for (i =0 ; i < submit->nr_cmds; i++) { -uint32_t szd = submit->cmd[i].size;/* in dwords */ -int idx = submit->cmd[i].idx; -bool dump = rd_full || (submit->bos[idx].flags &MSM_SUBMIT_BO_DUMP ); + drm_gpuvm_for_each_va (vma, submit->vm) { +bool dump = rd_full || (vma->flags &MSM_VMA_DUMP ); + +/* Skip MAP_NULL/PRR VMAs: */ +if (!vma->gem.obj) +continue ; + +snapshot_buf (rd, vma->gem.obj, vma->va.addr, dump, + vma->gem.offset, vma->va.range); + } + + }else { +for (i =0 ; i < submit->nr_bos; i++) { +struct drm_gem_object *obj = submit->bos[i].obj; +bool dump = rd_full || (submit->bos[i].flags &MSM_SUBMIT_BO_DUMP ); + +snapshot_buf (rd, obj, submit->bos[i].iova, dump,0 , obj->size); + } + +for (i =0 ; i < submit->nr_cmds; i++) { +uint32_t szd = submit->cmd[i].size;/* in dwords */ +int idx = submit->cmd[i].idx; +bool dump = rd_full || (submit->bos[idx].flags &MSM_SUBMIT_BO_DUMP ); -/* snapshot cmdstream bo's (if we haven't already): */ -if (!dump) { -struct drm_gem_object *obj = submit->bos[idx].obj; -size_t offset = submit->cmd[i].iova - submit->bos[idx].iova; +/* snapshot cmdstream bo's (if we haven't already): */ +if (!dump) { +struct drm_gem_object *obj = submit->bos[idx].obj; +size_t offset = submit->cmd[i].iova - submit->bos[idx].iova; -snapshot_buf (rd, obj, submit->cmd[i].iova, true, - offset, szd *4 ); +snapshot_buf (rd, obj, submit->cmd[i].iova, true, + offset, szd *4 ); + } } }
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 29/42 drm/msm: Extract out syncobj helpers
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
We'll be re-using these for the VM_BIND ioctl.
Also, rename a few things in the uapi header to reflect that syncobj use is not specific to the submit ioctl.
--- drivers/gpu/drm/msm/Makefile | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 192 ++------------------------- drivers/gpu/drm/msm/msm_syncobj.c | 172 ++++++++++++++++++++++++ drivers/gpu/drm/msm/msm_syncobj.h | 37 ++++++ include/uapi/drm/msm_drm.h | 26 ++-- 5 files changed, 235 insertions(+), 193 deletions(-) create mode 100644 drivers/gpu/drm/msm/msm_syncobj.c create mode 100644 drivers/gpu/drm/msm/msm_syncobj.h
drivers/gpu/drm/msm/Makefile +1 -0
@@ -127,6 +127,7 @@ msm-y += \ msm_rd.o \ msm_ringbuffer.o \ msm_submitqueue.o \ + msm_syncobj.o \ msm_gpu_tracepoints.o \ msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o
drivers/gpu/drm/msm/msm_gem_submit.c +12 -180
228 lines not on this page · raw message
drivers/gpu/drm/msm/msm_syncobj.c new file +172 -0
172 lines not on this page · raw message
drivers/gpu/drm/msm/msm_syncobj.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 2020 Google, Inc */ + +#ifndef __MSM_GEM_SYNCOBJ_H__ +#define __MSM_GEM_SYNCOBJ_H__ + +#include "drm/drm_device.h" +#include "drm/drm_syncobj.h" +#include "drm/gpu_scheduler.h" + +struct msm_syncobj_post_dep { +struct drm_syncobj *syncobj; +uint64_t point; +struct dma_fence_chain *chain; +}; + +struct drm_syncobj ** +msm_syncobj_parse_deps (struct drm_device *dev, +struct drm_sched_job *job, +struct drm_file *file, +uint64_t in_syncobjs_addr, +uint32_t nr_in_syncobjs, +size_t syncobj_stride); + +void msm_syncobj_reset (struct drm_syncobj **syncobjs,uint32_t nr_syncobjs); + +struct msm_syncobj_post_dep * +msm_syncobj_parse_post_deps (struct drm_device *dev, +struct drm_file *file, +uint64_t syncobjs_addr, +uint32_t nr_syncobjs, +size_t syncobj_stride); + +void msm_syncobj_process_post_deps (struct msm_syncobj_post_dep *post_deps, +uint32_t count,struct dma_fence *fence); + +#endif /* __MSM_GEM_SYNCOBJ_H__ */
include/uapi/drm/msm_drm.h +13 -13
@@ -220,6 +220,17 @@ struct drm_msm_gem_cpu_fini {* Cmdstream Submission: */ +#define MSM_SYNCOBJ_RESET 0x00000001/* Reset syncobj after wait. */ +#define MSM_SYNCOBJ_FLAGS ( \ + MSM_SYNCOBJ_RESET | \ + 0) + +struct drm_msm_syncobj { +__u32 handle;/* in, syncobj handle. */ +__u32 flags;/* in, from MSM_SUBMIT_SYNCOBJ_FLAGS */ +__u64 point;/* in, timepoint for timeline syncobjs. */ +}; +/* The value written into the cmdstream is logically: * * ((relocbuf->gpuaddr + reloc_offset) << shift) | or
@@ -309,17 +320,6 @@ struct drm_msm_gem_submit_bo {MSM_SUBMIT_FENCE_SN_IN | \ 0) -#define MSM_SUBMIT_SYNCOBJ_RESET 0x00000001/* Reset syncobj after wait. */ -#define MSM_SUBMIT_SYNCOBJ_FLAGS ( \ - MSM_SUBMIT_SYNCOBJ_RESET | \ - 0) - -struct drm_msm_gem_submit_syncobj { -__u32 handle;/* in, syncobj handle. */ -__u32 flags;/* in, from MSM_SUBMIT_SYNCOBJ_FLAGS */ -__u64 point;/* in, timepoint for timeline syncobjs. */ -}; -/* Each cmdstream submit consists of a table of buffers involved, and * one or more cmdstream buffers. This allows for conditional execution * (context-restore), and IB buffers needed for per tile/bin draw cmds.
@@ -333,8 +333,8 @@ struct drm_msm_gem_submit {__u64 cmds;/* in, ptr to array of submit_cmd's */ __s32 fence_fd;/* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */ __u32 queueid;/* in, submitqueue id */ -__u64 in_syncobjs;/* in, ptr to array of drm_msm_gem_submit_syncobj */ -__u64 out_syncobjs;/* in, ptr to array of drm_msm_gem_submit_syncobj */ +__u64 in_syncobjs;/* in, ptr to array of drm_msm_syncobj */ +__u64 out_syncobjs;/* in, ptr to array of drm_msm_syncobj */ __u32 nr_in_syncobjs;/* in, number of entries in in_syncobj */ __u32 nr_out_syncobjs;/* in, number of entries in out_syncobj. */ __u32 syncobj_stride;/* in, stride of syncobj arrays. */
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 30/42 drm/msm: Use DMA_RESV_USAGE_BOOKKEEP/KERNEL
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Any place we wait for a BO to become idle, we should use BOOKKEEP usage, to ensure that it waits for _any_ activity.
--- drivers/gpu/drm/msm/msm_gem.c | 6 +++--- drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +3 -3
@@ -93,8 +93,8 @@ static void msm_gem_close(struct drm_gem_object *obj, struct drm_file *file)* TODO we might need to kick this to a queue to avoid blocking * in CLOSE ioctl */ -dma_resv_wait_timeout (obj->resv,DMA_RESV_USAGE_READ , false, -msecs_to_jiffies (1000 )); +dma_resv_wait_timeout (obj->resv,DMA_RESV_USAGE_BOOKKEEP , false, +MAX_SCHEDULE_TIMEOUT );msm_gem_lock_vm_and_obj (&exec, obj, ctx->vm);put_iova_spaces (obj, ctx->vm, true);
@@ -895,7 +895,7 @@ bool msm_gem_active(struct drm_gem_object *obj)if (to_msm_bo (obj)->pin_count)return true; -return !dma_resv_test_signaled (obj->resv,dma_resv_usage_rw (true)); +return !dma_resv_test_signaled (obj->resv,DMA_RESV_USAGE_BOOKKEEP ); }int msm_gem_cpu_prep (struct drm_gem_object *obj,uint32_t op,ktime_t *timeout)
drivers/gpu/drm/msm/msm_gem_shrinker.c +1 -1
@@ -139,7 +139,7 @@ evict(struct drm_gem_object *obj, struct ww_acquire_ctx *ticket)static bool wait_for_idle (struct drm_gem_object *obj) { -enum dma_resv_usage usage =dma_resv_usage_rw (true); +enum dma_resv_usage usage =DMA_RESV_USAGE_BOOKKEEP ;return dma_resv_wait_timeout (obj->resv, usage, false,10 ) >0 ; }
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 31/42 drm/msm: Add VM_BIND submitqueue
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
This submitqueue type isn't tied to a hw ringbuffer, but instead executes on the CPU for performing async VM_BIND ops.
--- drivers/gpu/drm/msm/msm_gem.h | 12 +++++ drivers/gpu/drm/msm/msm_gem_submit.c | 60 +++++++++++++++++++--- drivers/gpu/drm/msm/msm_gem_vma.c | 71 +++++++++++++++++++++++++++ drivers/gpu/drm/msm/msm_gpu.h | 3 ++ drivers/gpu/drm/msm/msm_submitqueue.c | 67 +++++++++++++++++++------ include/uapi/drm/msm_drm.h | 9 +++- 6 files changed, 197 insertions(+), 25 deletions(-)
drivers/gpu/drm/msm/msm_gem.h +12 -0
@@ -53,6 +53,13 @@ struct msm_gem_vm {/** @base: Inherit from drm_gpuvm. */ struct drm_gpuvm base; +/** +* @sched: Scheduler used for asynchronous VM_BIND request. +* +* Unused for kernel managed VMs (where all operations are synchronous). +*/ +struct drm_gpu_scheduler sched; +/** * @mm: Memory management for kernel managed VA allocations *
@@ -71,6 +78,9 @@ struct msm_gem_vm {*/ struct pid *pid; +/** @last_fence: Fence for last pending work scheduled on the VM */ +struct dma_fence *last_fence; +/** @faults: the number of GPU hangs associated with this address space */ int faults;
@@ -100,6 +110,8 @@ struct drm_gpuvm * msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char *name, u64 va_start, u64 va_size, bool managed); +void msm_gem_vm_close (struct drm_gpuvm *gpuvm); +struct msm_fence_context ;#define MSM_VMA_DUMP (DRM_GPUVA_USERBITS << 0)
drivers/gpu/drm/msm/msm_gem_submit.c +52 -8
115 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem_vma.c +71 -0
97 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gpu.h +3 -0
@@ -564,6 +564,9 @@ struct msm_gpu_submitqueue {struct mutex lock;struct kref ref;struct drm_sched_entity *entity; + +/** @_vm_bind_entity: used for @entity pointer for VM_BIND queues */ +struct drm_sched_entity _vm_bind_entity[0 ]; };struct msm_gpu_state_bo {
drivers/gpu/drm/msm/msm_submitqueue.c +51 -16
108 lines not on this page · raw message
include/uapi/drm/msm_drm.h +8 -1
@@ -385,12 +385,19 @@ struct drm_msm_gem_madvise {/* * Draw queues allow the user to set specific submission parameter. Command * submissions specify a specific submitqueue to use. ID 0 is reserved for -* backwards compatibility as a "default" submitqueue +* backwards compatibility as a "default" submitqueue. +* +* Because VM_BIND async updates happen on the CPU, they must run on a +* virtual queue created with the flag MSM_SUBMITQUEUE_VM_BIND. If we had +* a way to do pgtable updates on the GPU, we could drop this restriction. */ #define MSM_SUBMITQUEUE_ALLOW_PREEMPT 0x00000001 +#define MSM_SUBMITQUEUE_VM_BIND 0x00000002/* virtual queue for VM_BIND ops */ +#define MSM_SUBMITQUEUE_FLAGS ( \ MSM_SUBMITQUEUE_ALLOW_PREEMPT | \ + MSM_SUBMITQUEUE_VM_BIND | \ 0)/*
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 32/42 drm/msm: Support IO_PGTABLE_QUIRK_NO_WARN_ON
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
With user managed VMs and multiple queues, it is in theory possible to trigger map/unmap errors. These will (in a later patch) mark the VM as unusable. But we want to tell the io-pgtable helpers not to spam the log. In addition, in the unmap path, we don't want to bail early from the unmap, to ensure we don't leave some dangling pages mapped.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/msm_iommu.c | 23 ++++++++++++++++++----- drivers/gpu/drm/msm/msm_mmu.h | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +1 -1
@@ -2280,7 +2280,7 @@ a6xx_create_private_vm(struct msm_gpu *gpu, bool kernel_managed) {struct msm_mmu *mmu; - mmu =msm_iommu_pagetable_create (to_msm_vm (gpu->vm)->mmu); + mmu =msm_iommu_pagetable_create (to_msm_vm (gpu->vm)->mmu, kernel_managed);if (IS_ERR (mmu))return ERR_CAST (mmu);
drivers/gpu/drm/msm/msm_iommu.c +18 -5
@@ -94,15 +94,24 @@ static int msm_iommu_pagetable_unmap(struct msm_mmu *mmu, u64 iova, {struct msm_iommu_pagetable *pagetable =to_pagetable (mmu);struct io_pgtable_ops *ops = pagetable->pgtbl_ops; +int ret =0 ;while (size) { -size_t unmapped, pgsize, count; +size_t pgsize, count; +ssize_t unmapped; pgsize =calc_pgsize (pagetable, iova, iova, size, &count); unmapped = ops->unmap_pages (ops, iova, pgsize, count,NULL ); -if (!unmapped) -break ; +if (unmapped <=0 ) { + ret = -EINVAL ; +/* +* Continue attempting to unamp the remained of the +* range, so we don't end up with some dangling +* mapped pages +*/ + unmapped =PAGE_SIZE ; + } iova += unmapped; size -= unmapped;
@@ -110,7 +119,7 @@ static int msm_iommu_pagetable_unmap(struct msm_mmu *mmu, u64 iova,iommu_flush_iotlb_all (to_msm_iommu (pagetable->parent)->domain); -return (size ==0 ) ?0 : -EINVAL ; +return ret; }static int msm_iommu_pagetable_map_prr (struct msm_mmu *mmu,u64 iova,size_t len,int prot)
@@ -324,7 +333,7 @@ static const struct iommu_flush_ops tlb_ops = {static int msm_gpu_fault_handler (struct iommu_domain *domain,struct device *dev,unsigned long iova,int flags,void *arg); -struct msm_mmu *msm_iommu_pagetable_create (struct msm_mmu *parent) +struct msm_mmu *msm_iommu_pagetable_create (struct msm_mmu *parent,bool kernel_managed) {struct adreno_smmu_priv *adreno_smmu =dev_get_drvdata (parent->dev);struct msm_iommu *iommu =to_msm_iommu (parent);
@@ -358,6 +367,10 @@ struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent) ttbr0_cfg.quirks &= ~IO_PGTABLE_QUIRK_ARM_TTBR1 ; ttbr0_cfg.tlb = &tlb_ops; +if (!kernel_managed) { + ttbr0_cfg.quirks |=IO_PGTABLE_QUIRK_NO_WARN ; + } + pagetable->pgtbl_ops =alloc_io_pgtable_ops (ARM_64_LPAE_S1 , &ttbr0_cfg, pagetable);
drivers/gpu/drm/msm/msm_mmu.h +1 -1
@@ -51,7 +51,7 @@ static inline void msm_mmu_set_fault_handler(struct msm_mmu *mmu, void *arg, mmu->handler = handler; } -struct msm_mmu *msm_iommu_pagetable_create (struct msm_mmu *parent); +struct msm_mmu *msm_iommu_pagetable_create (struct msm_mmu *parent,bool kernel_managed);int msm_iommu_pagetable_params (struct msm_mmu *mmu,phys_addr_t *ttbr,int *asid);
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 33/42 drm/msm: Support pgtable preallocation
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Introduce a mechanism to count the worst case # of pages required in a VM_BIND op.
Note that previously we would have had to somehow account for allocations in unmap, when splitting a block. This behavior was removed in commit 33729a5fc0ca ("iommu/io-pgtable-arm: Remove split on unmap behavior)"
--- drivers/gpu/drm/msm/msm_gem.h | 1 + drivers/gpu/drm/msm/msm_iommu.c | 191 +++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/msm_mmu.h | 34 ++++++ 3 files changed, 225 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gem.h +1 -0
@@ -7,6 +7,7 @@#ifndef __MSM_GEM_H__#define __MSM_GEM_H__ +#include "msm_mmu.h" #include <linux/kref.h> #include <linux/dma-resv.h> #include "drm/drm_exec.h"
drivers/gpu/drm/msm/msm_iommu.c +190 -1
248 lines not on this page · raw message
drivers/gpu/drm/msm/msm_mmu.h +34 -0
@@ -9,8 +9,16 @@#include <linux/iommu.h> +struct msm_mmu_prealloc ; +struct msm_mmu ; +struct msm_gpu ; +struct msm_mmu_funcs {void (*detach)(struct msm_mmu *mmu); +void (*prealloc_count)(struct msm_mmu *mmu,struct msm_mmu_prealloc *p, +uint64_t iova,size_t len); +int (*prealloc_allocate)(struct msm_mmu *mmu,struct msm_mmu_prealloc *p); +void (*prealloc_cleanup)(struct msm_mmu *mmu,struct msm_mmu_prealloc *p);int (*map)(struct msm_mmu *mmu,uint64_t iova,struct sg_table *sgt,size_t off,size_t len,int prot);int (*unmap)(struct msm_mmu *mmu,uint64_t iova,size_t len);
@@ -24,12 +32,38 @@ enum msm_mmu_type { MSM_MMU_IOMMU_PAGETABLE, }; +/** +* struct msm_mmu_prealloc - Tracking for pre-allocated pages for MMU updates. +*/ +struct msm_mmu_prealloc { +/** @count: Number of pages reserved. */ +uint32_t count; +/** @ptr: Index of first unused page in @pages */ +uint32_t ptr; +/** +* @pages: Array of pages preallocated for MMU table updates. +* +* After a VM operation, there might be free pages remaining in this +* array (since the amount allocated is a worst-case). These are +* returned to the pt_cache at mmu->prealloc_cleanup(). +*/ +void **pages; +}; +struct msm_mmu {const struct msm_mmu_funcs *funcs;struct device *dev;int (*handler)(void *arg,unsigned long iova,int flags,void *data);void *arg;enum msm_mmu_type type; + +/** +* @prealloc: pre-allocated pages for pgtable +* +* Set while a VM_BIND job is running, serialized under +* msm_gem_vm::mmu_lock. +*/ +struct msm_mmu_prealloc *prealloc; }; static inline void msm_mmu_init(struct msm_mmu *mmu, struct device *dev,
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 34/42 drm/msm: Split out map/unmap ops
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
With async VM_BIND, the actual pgtable updates are deferred. Synchronously, a list of map/unmap ops will be generated, but the actual pgtable changes are deferred. To support that, split out op handlers and change the existing non-VM_BIND paths to use them.
Note in particular, the vma itself may already be destroyed/freed by the time an UNMAP op runs (or even a MAP op if there is a later queued UNMAP). For this reason, the op handlers cannot reference the vma pointer.
--- drivers/gpu/drm/msm/msm_gem_vma.c | 63 +++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/msm_gem_vma.c +56 -7
@@ -8,6 +8,34 @@#include "msm_gem.h" #include "msm_mmu.h" +#define vm_dbg (fmt, ...) pr_debug("%s:%d: "fmt"\n", __func__, __LINE__, ##__VA_ARGS__) + +/** +* struct msm_vm_map_op - create new pgtable mapping +*/ +struct msm_vm_map_op { +/** @iova: start address for mapping */ +uint64_t iova; +/** @range: size of the region to map */ +uint64_t range; +/** @offset: offset into @sgt to map */ +uint64_t offset; +/** @sgt: pages to map, or NULL for a PRR mapping */ +struct sg_table *sgt; +/** @prot: the mapping protection flags */ +int prot; +}; + +/** +* struct msm_vm_unmap_op - unmap a range of pages from pgtable +*/ +struct msm_vm_unmap_op { +/** @iova: start address for unmap */ +uint64_t iova; +/** @range: size of region to unmap */ +uint64_t range; +}; +static void msm_gem_vm_free (struct drm_gpuvm *gpuvm) {
@@ -21,18 +49,36 @@ msm_gem_vm_free(struct drm_gpuvm *gpuvm)kfree (vm); } +static void +vm_unmap_op (struct msm_gem_vm *vm,const struct msm_vm_unmap_op *op) +{ +vm_dbg ("%p: %016llx %016llx" , vm, op->iova, op->iova + op->range); + + vm->mmu->funcs->unmap (vm->mmu, op->iova, op->range); +} + +static int +vm_map_op (struct msm_gem_vm *vm,const struct msm_vm_map_op *op) +{ +vm_dbg ("%p: %016llx %016llx" , vm, op->iova, op->iova + op->range); + +return vm->mmu->funcs->map (vm->mmu, op->iova, op->sgt, op->offset, + op->range, op->prot); +} +/* Actually unmap memory for the vma */ void msm_gem_vma_unmap (struct drm_gpuva *vma) {struct msm_gem_vma *msm_vma =to_msm_vma (vma); -struct msm_gem_vm *vm =to_msm_vm (vma->vm); -unsigned size = vma->va.range;/* Don't do anything if the memory isn't mapped */ if (!msm_vma->mapped)return ; - vm->mmu->funcs->unmap (vm->mmu, vma->va.addr, size); +vm_unmap_op (to_msm_vm (vma->vm), &(struct msm_vm_unmap_op ){ + .iova = vma->va.addr, + .range = vma->va.range, + }); msm_vma->mapped = false; }
@@ -42,7 +88,6 @@ int msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct sg_table *sgt) { struct msm_gem_vma *msm_vma = to_msm_vma(vma); -struct msm_gem_vm *vm =to_msm_vm (vma->vm);int ret;if (GEM_WARN_ON (!vma->va.addr))
@@ -62,9 +107,13 @@ msm_gem_vma_map(struct drm_gpuva *vma, int prot, struct sg_table *sgt)* Revisit this if we can come up with a scheme to pre-alloc pages * for the pgtable in map/unmap ops. */ - ret = vm->mmu->funcs->map (vm->mmu, vma->va.addr, sgt, - vma->gem.offset, vma->va.range, - prot); + ret =vm_map_op (to_msm_vm (vma->vm), &(struct msm_vm_map_op ){ + .iova = vma->va.addr, + .range = vma->va.range, + .offset = vma->gem.offset, + .sgt = sgt, + .prot = prot, + });if (ret) { msm_vma->mapped = false; }
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 35/42 drm/msm: Add VM_BIND ioctl
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Add a VM_BIND ioctl for binding/unbinding buffers into a VM. This is only supported if userspace has opted in to MSM_PARAM_EN_VM_BIND.
--- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_drv.h | 4 +- drivers/gpu/drm/msm/msm_gem.c | 40 +- drivers/gpu/drm/msm/msm_gem.h | 4 + drivers/gpu/drm/msm/msm_gem_submit.c | 22 +- drivers/gpu/drm/msm/msm_gem_vma.c | 1092 +++++++++++++++++++++++++- include/uapi/drm/msm_drm.h | 74 +- 7 files changed, 1204 insertions(+), 33 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +1 -0
@@ -795,6 +795,7 @@ static const struct drm_ioctl_desc msm_ioctls[] = {DRM_IOCTL_DEF_DRV (MSM_SUBMITQUEUE_NEW , msm_ioctl_submitqueue_new,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (MSM_SUBMITQUEUE_CLOSE , msm_ioctl_submitqueue_close,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (MSM_SUBMITQUEUE_QUERY , msm_ioctl_submitqueue_query,DRM_RENDER_ALLOW ), + DRM_IOCTL_DEF_DRV(MSM_VM_BIND, msm_ioctl_vm_bind, DRM_RENDER_ALLOW), };static void msm_show_fdinfo (struct drm_printer *p,struct drm_file *file)
drivers/gpu/drm/msm/msm_drv.h +3 -1
@@ -255,7 +255,9 @@ struct drm_gpuvm *msm_kms_init_vm(struct drm_device *dev);bool msm_use_mmu (struct drm_device *dev);int msm_ioctl_gem_submit (struct drm_device *dev,void *data, -struct drm_file *file); +struct drm_file *file); +int msm_ioctl_vm_bind (struct drm_device *dev,void *data, +struct drm_file *file);#ifdef CONFIG_DEBUG_FS unsigned long msm_gem_shrinker_shrink (struct drm_device *dev,unsigned long nr_to_scan);
drivers/gpu/drm/msm/msm_gem.c +29 -11
@@ -251,8 +251,7 @@ static void put_pages(struct drm_gem_object *obj) } } -static struct page **msm_gem_get_pages_locked (struct drm_gem_object *obj, -unsigned madv) +struct page **msm_gem_get_pages_locked (struct drm_gem_object *obj,unsigned madv) {struct msm_gem_object *msm_obj =to_msm_bo (obj);
@@ -1052,18 +1051,37 @@ static void msm_gem_free_object(struct drm_gem_object *obj)/* * We need to lock any VMs the object is still attached to, but not * the object itself (see explaination in msm_gem_assert_locked()), -* so just open-code this special case: +* so just open-code this special case. +* +* Note that we skip the dance if we aren't attached to any VM. This +* is load bearing. The driver needs to support two usage models: +* +* 1. Legacy kernel managed VM: Userspace expects the VMA's to be +* implicitly torn down when the object is freed, the VMA's do +* not hold a hard reference to the BO. +* +* 2. VM_BIND, userspace managed VM: The VMA holds a reference to the +* BO. This can be dropped when the VM is closed and it's associated +* VMAs are torn down. (See msm_gem_vm_close()). +* +* In the latter case the last reference to a BO can be dropped while +* we already have the VM locked. It would have already been removed +* from the gpuva list, but lockdep doesn't know that. Or understand +* the differences between the two usage models. */ -drm_exec_init (&exec,0 ,0 ); - drm_exec_until_all_locked (&exec) { -struct drm_gpuvm_bo *vm_bo; - drm_gem_for_each_gpuvm_bo (vm_bo, obj) { -drm_exec_lock_obj (&exec,drm_gpuvm_resv_obj (vm_bo->vm)); -drm_exec_retry_on_contention (&exec); +if (!list_empty (&obj->gpuva.list)) { +drm_exec_init (&exec,0 ,0 ); + drm_exec_until_all_locked (&exec) { +struct drm_gpuvm_bo *vm_bo; + drm_gem_for_each_gpuvm_bo (vm_bo, obj) { +drm_exec_lock_obj (&exec, +drm_gpuvm_resv_obj (vm_bo->vm)); +drm_exec_retry_on_contention (&exec); + } } +put_iova_spaces (obj,NULL , true); +drm_exec_fini (&exec);/* drop locks */ } -put_iova_spaces (obj,NULL , true); -drm_exec_fini (&exec);/* drop locks */ if (drm_gem_is_imported (obj)) {GEM_WARN_ON (msm_obj->vaddr);
drivers/gpu/drm/msm/msm_gem.h +4 -0
@@ -73,6 +73,9 @@ struct msm_gem_vm {/** @mmu: The mmu object which manages the pgtables */ struct msm_mmu *mmu; +/** @mmu_lock: Protects access to the mmu */ +struct mutex mmu_lock; +/** * @pid: For address spaces associated with a specific process, this * will be non-NULL:
@@ -205,6 +208,7 @@ int msm_gem_get_and_pin_iova(struct drm_gem_object *obj, struct drm_gpuvm *vm, uint64_t *iova);void msm_gem_unpin_iova (struct drm_gem_object *obj,struct drm_gpuvm *vm);void msm_gem_pin_obj_locked (struct drm_gem_object *obj); +struct page **msm_gem_get_pages_locked (struct drm_gem_object *obj,unsigned madv);struct page **msm_gem_pin_pages_locked (struct drm_gem_object *obj);void msm_gem_unpin_pages_locked (struct drm_gem_object *obj); int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev,
drivers/gpu/drm/msm/msm_gem_submit.c +20 -2
@@ -193,6 +193,7 @@ static int submit_lookup_objects(struct msm_gem_submit *submit,static int submit_lookup_cmds (struct msm_gem_submit *submit,struct drm_msm_gem_submit *args,struct drm_file *file) { +struct msm_context *ctx = file->driver_priv;unsigned i;size_t sz;int ret =0 ;
@@ -224,6 +225,20 @@ static int submit_lookup_cmds(struct msm_gem_submit *submit, goto out; } +if (msm_context_is_vmbind (ctx)) { +if (submit_cmd.nr_relocs) { + ret =SUBMIT_ERROR (EINVAL , submit,"nr_relocs must be zero" ); + goto out; + } + +if (submit_cmd.submit_idx || submit_cmd.submit_offset) { + ret =SUBMIT_ERROR (EINVAL , submit,"submit_idx/offset must be zero" ); + goto out; + } + + submit->cmd[i].iova = submit_cmd.iova; + } + submit->cmd[i].type = submit_cmd.type; submit->cmd[i].size = submit_cmd.size /4 ; submit->cmd[i].offset = submit_cmd.submit_offset /4 ;
@@ -532,6 +547,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,struct msm_syncobj_post_dep *post_deps =NULL ;struct drm_syncobj **syncobjs_to_reset =NULL ;struct sync_file *sync_file =NULL ; +unsigned cmds_to_parse;int out_fence_fd =-1 ;unsigned i;int ret;
@@ -655,7 +671,9 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,if (ret) goto out; -for (i =0 ; i < args->nr_cmds; i++) { + cmds_to_parse =msm_context_is_vmbind (ctx) ?0 : args->nr_cmds; + +for (i =0 ; i < cmds_to_parse; i++) {struct drm_gem_object *obj;uint64_t iova;
@@ -686,7 +704,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, goto out; } - submit->nr_cmds = i; + submit->nr_cmds = args->nr_cmds;idr_preload (GFP_KERNEL );
drivers/gpu/drm/msm/msm_gem_vma.c +1074 -18
1,223 lines not on this page · raw message
include/uapi/drm/msm_drm.h +73 -1
99 lines not on this page · raw message
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 36/42 drm/msm: Add VM logging for VM_BIND updates
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
When userspace opts in to VM_BIND, the submit no longer holds references keeping the VMA alive. This makes it difficult to distinguish between UMD/KMD/app bugs. So add a debug option for logging the most recent VM updates and capturing these in GPU devcoredumps.
The submitqueue id is also captured, a value of zero means the operation did not go via a submitqueue (ie. comes from msm_gem_vm_close() tearing down the remaining mappings when the device file is closed.
--- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 11 +++ drivers/gpu/drm/msm/msm_gem.h | 24 +++++ drivers/gpu/drm/msm/msm_gem_vma.c | 124 ++++++++++++++++++++++-- drivers/gpu/drm/msm/msm_gpu.c | 52 +++++++++- drivers/gpu/drm/msm/msm_gpu.h | 4 + 5 files changed, 202 insertions(+), 13 deletions(-)
drivers/gpu/drm/msm/adreno/adreno_gpu.c +11 -0
@@ -833,6 +833,7 @@ void adreno_gpu_state_destroy(struct msm_gpu_state *state)for (i =0 ; state->bos && i < state->nr_bos; i++)kvfree (state->bos[i].data); +kfree (state->vm_logs);kfree (state->bos);kfree (state->comm);kfree (state->cmd);
@@ -973,6 +974,16 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, info->ptes[0], info->ptes[1], info->ptes[2], info->ptes[3]); } +if (state->vm_logs) { +drm_puts (p,"vm-log:\n" ); +for (i =0 ; i < state->nr_vm_logs; i++) { +struct msm_gem_vm_log_entry *e = &state->vm_logs[i]; +drm_printf (p," - %s:%d: 0x%016llx-0x%016llx\n" , + e->op, e->queue_id, e->iova, + e->iova + e->range); + } + } +drm_printf (p,"rbbm-status: 0x%08x\n" , state->rbbm_status);drm_puts (p,"ringbuffer:\n" );
drivers/gpu/drm/msm/msm_gem.h +24 -0
@@ -24,6 +24,20 @@#define MSM_BO_STOLEN 0x10000000/* try to use stolen/splash memory */ #define MSM_BO_MAP_PRIV 0x20000000/* use IOMMU_PRIV when mapping */ +/** +* struct msm_gem_vm_log_entry - An entry in the VM log +* +* For userspace managed VMs, a log of recent VM updates is tracked and +* captured in GPU devcore dumps, to aid debugging issues caused by (for +* example) incorrectly synchronized VM updates +*/ +struct msm_gem_vm_log_entry { +const char *op; +uint64_t iova; +uint64_t range; +int queue_id; +}; +/** * struct msm_gem_vm - VM object *
@@ -85,6 +99,15 @@ struct msm_gem_vm {/** @last_fence: Fence for last pending work scheduled on the VM */ struct dma_fence *last_fence; +/** @log: A log of recent VM updates */ +struct msm_gem_vm_log_entry *log; + +/** @log_shift: length of @log is (1 << @log_shift) */ +uint32_t log_shift; + +/** @log_idx: index of next @log entry to write */ +uint32_t log_idx; +/** @faults: the number of GPU hangs associated with this address space */ int faults;
@@ -115,6 +138,7 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char *name, u64 va_start, u64 va_size, bool managed);void msm_gem_vm_close (struct drm_gpuvm *gpuvm); +void msm_gem_vm_unusable (struct drm_gpuvm *gpuvm);struct msm_fence_context ;
drivers/gpu/drm/msm/msm_gem_vma.c +116 -8
210 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gpu.c +47 -5
76 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gpu.h +4 -0
@@ -20,6 +20,7 @@#include "msm_gem.h" struct msm_gem_submit ; +struct msm_gem_vm_log_entry ;struct msm_gpu_perfcntr ;struct msm_gpu_state ;struct msm_context ;
@@ -603,6 +604,9 @@ struct msm_gpu_state {struct msm_gpu_fault_info fault_info; +int nr_vm_logs; +struct msm_gem_vm_log_entry *vm_logs; +int nr_bos;struct msm_gpu_state_bo *bos; };
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 37/42 drm/msm: Add VMA unmap reason
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Make the VM log a bit more useful by providing a reason for the unmap (ie. closing VM vs evict/purge, etc)
--- drivers/gpu/drm/msm/msm_gem.c | 20 +++++++++++--------- drivers/gpu/drm/msm/msm_gem.h | 2 +- drivers/gpu/drm/msm/msm_gem_vma.c | 15 ++++++++++++--- 3 files changed, 24 insertions(+), 13 deletions(-)
drivers/gpu/drm/msm/msm_gem.c +11 -9
@@ -43,7 +43,8 @@ static int msm_gem_open(struct drm_gem_object *obj, struct drm_file *file)return 0 ; } -static void put_iova_spaces (struct drm_gem_object *obj,struct drm_gpuvm *vm,bool close); +static void put_iova_spaces (struct drm_gem_object *obj,struct drm_gpuvm *vm, +bool close,const char *reason);static void detach_vm (struct drm_gem_object *obj,struct drm_gpuvm *vm) {
@@ -57,7 +58,7 @@ static void detach_vm(struct drm_gem_object *obj, struct drm_gpuvm *vm) drm_gpuvm_bo_for_each_va (vma, vm_bo) {if (vma->vm != vm)continue ; -msm_gem_vma_unmap (vma); +msm_gem_vma_unmap (vma,"detach" );msm_gem_vma_close (vma);break ; }
@@ -97,7 +98,7 @@ static void msm_gem_close(struct drm_gem_object *obj, struct drm_file *file) MAX_SCHEDULE_TIMEOUT);msm_gem_lock_vm_and_obj (&exec, obj, ctx->vm); -put_iova_spaces (obj, ctx->vm, true); +put_iova_spaces (obj, ctx->vm, true,"close" );detach_vm (obj, ctx->vm);drm_exec_fini (&exec);/* drop locks */ }
@@ -425,7 +426,8 @@ static struct drm_gpuva *lookup_vma(struct drm_gem_object *obj,* mapping. */ static void -put_iova_spaces (struct drm_gem_object *obj,struct drm_gpuvm *vm,bool close) +put_iova_spaces (struct drm_gem_object *obj,struct drm_gpuvm *vm, +bool close,const char *reason) {struct drm_gpuvm_bo *vm_bo, *tmp;
@@ -440,7 +442,7 @@ put_iova_spaces(struct drm_gem_object *obj, struct drm_gpuvm *vm, bool close)drm_gpuvm_bo_get (vm_bo); drm_gpuvm_bo_for_each_va_safe (vma, vmatmp, vm_bo) { -msm_gem_vma_unmap (vma); +msm_gem_vma_unmap (vma, reason);if (close)msm_gem_vma_close (vma); }
@@ -617,7 +619,7 @@ static int clear_iova(struct drm_gem_object *obj,if (!vma)return 0 ; -msm_gem_vma_unmap (vma); +msm_gem_vma_unmap (vma,NULL );msm_gem_vma_close (vma);return 0 ;
@@ -829,7 +831,7 @@ void msm_gem_purge(struct drm_gem_object *obj)GEM_WARN_ON (!is_purgeable (msm_obj));/* Get rid of any iommu mapping(s): */ -put_iova_spaces (obj,NULL , false); +put_iova_spaces (obj,NULL , false,"purge" );msm_gem_vunmap (obj);
@@ -867,7 +869,7 @@ void msm_gem_evict(struct drm_gem_object *obj)GEM_WARN_ON (is_unevictable (msm_obj));/* Get rid of any iommu mapping(s): */ -put_iova_spaces (obj,NULL , false); +put_iova_spaces (obj,NULL , false,"evict" );drm_vma_node_unmap (&obj->vma_node, dev->anon_inode->i_mapping);
@@ -1079,7 +1081,7 @@ static void msm_gem_free_object(struct drm_gem_object *obj)drm_exec_retry_on_contention (&exec); } } -put_iova_spaces (obj,NULL , true); +put_iova_spaces (obj,NULL , true,"free" );drm_exec_fini (&exec);/* drop locks */ }
drivers/gpu/drm/msm/msm_gem.h +1 -1
@@ -168,7 +168,7 @@ struct msm_gem_vma {struct drm_gpuva *msm_gem_vma_new (struct drm_gpuvm *vm,struct drm_gem_object *obj,u64 offset,u64 range_start,u64 range_end); -void msm_gem_vma_unmap (struct drm_gpuva *vma); +void msm_gem_vma_unmap (struct drm_gpuva *vma,const char *reason);int msm_gem_vma_map (struct drm_gpuva *vma,int prot,struct sg_table *sgt);void msm_gem_vma_close (struct drm_gpuva *vma);
drivers/gpu/drm/msm/msm_gem_vma.c +12 -3
@@ -53,6 +53,9 @@ struct msm_vm_unmap_op {/** @range: size of region to unmap */ uint64_t range; +/** @reason: The reason for the unmap */ +const char *reason; +/** * @queue_id: The id of the submitqueue the operation is performed * on, or zero for (in particular) UNMAP ops triggered outside of
@@ -242,7 +245,12 @@ vm_log(struct msm_gem_vm *vm, const char *op, uint64_t iova, uint64_t range, intstatic void vm_unmap_op (struct msm_gem_vm *vm,const struct msm_vm_unmap_op *op) { -vm_log (vm,"unmap" , op->iova, op->range, op->queue_id); +const char *reason = op->reason; + +if (!reason) + reason ="unmap" ; + +vm_log (vm, reason, op->iova, op->range, op->queue_id); vm->mmu->funcs->unmap (vm->mmu, op->iova, op->range); }
@@ -257,7 +265,7 @@ vm_map_op(struct msm_gem_vm *vm, const struct msm_vm_map_op *op) }/* Actually unmap memory for the vma */ -void msm_gem_vma_unmap (struct drm_gpuva *vma) +void msm_gem_vma_unmap (struct drm_gpuva *vma,const char *reason) {struct msm_gem_vm *vm =to_msm_vm (vma->vm);struct msm_gem_vma *msm_vma =to_msm_vma (vma);
@@ -277,6 +285,7 @@ void msm_gem_vma_unmap(struct drm_gpuva *vma)vm_unmap_op (vm, &(struct msm_vm_unmap_op ){ .iova = vma->va.addr, .range = vma->va.range, + .reason = reason, });if (!vm->managed)
@@ -863,7 +872,7 @@ msm_gem_vm_close(struct drm_gpuvm *gpuvm)drm_exec_retry_on_contention (&exec); } -msm_gem_vma_unmap (vma); +msm_gem_vma_unmap (vma,"close" );msm_gem_vma_close (vma);if (obj) {
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 38/42 drm/msm: Add mmu prealloc tracepoint
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
So we can monitor how many pages are getting preallocated vs how many get used.
--- drivers/gpu/drm/msm/msm_gpu_trace.h | 14 ++++++++++++++ drivers/gpu/drm/msm/msm_iommu.c | 4 ++++ 2 files changed, 18 insertions(+)
drivers/gpu/drm/msm/msm_gpu_trace.h +14 -0
@@ -205,6 +205,20 @@ TRACE_EVENT(msm_gpu_preemption_irq,TP_printk ("preempted to %u" , __entry->ring_id) ); +TRACE_EVENT (msm_mmu_prealloc_cleanup, + TP_PROTO(u32 count, u32 remaining), +TP_ARGS (count, remaining), +TP_STRUCT__entry ( + __field(u32, count) +__field (u32, remaining) + ), +TP_fast_assign ( + __entry->count = count; + __entry->remaining = remaining; + ), +TP_printk ("count=%u, remaining=%u" , __entry->count, __entry->remaining) +); +#endif #undef TRACE_INCLUDE_PATH
drivers/gpu/drm/msm/msm_iommu.c +4 -0
@@ -8,6 +8,7 @@#include <linux/io-pgtable.h> #include <linux/kmemleak.h> #include "msm_drv.h" +#include "msm_gpu_trace.h" #include "msm_mmu.h" struct msm_iommu {
@@ -346,6 +347,9 @@ msm_iommu_pagetable_prealloc_cleanup(struct msm_mmu *mmu, struct msm_mmu_preallostruct kmem_cache *pt_cache =get_pt_cache (mmu);uint32_t remaining_pt_count = p->count - p->ptr; +if (p->count >0 ) +trace_msm_mmu_prealloc_cleanup (p->count, remaining_pt_count); +kmem_cache_free_bulk (pt_cache, remaining_pt_count, &p->pages[p->ptr]);kvfree (p->pages); }
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 39/42 drm/msm: use trylock for debugfs
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
This resolves a potential deadlock vs msm_gem_vm_close(). Otherwise for _NO_SHARE buffers msm_gem_describe() could be trying to acquire the shared vm resv, while already holding priv->obj_lock. But _vm_close() might drop the last reference to a GEM obj while already holding the vm resv, and msm_gem_free_object() needs to grab priv->obj_lock, a locking inversion.
OTOH this is only for debugfs and it isn't critical if we undercount by skipping a locked obj. So just use trylock() and move along if we can't get the lock.
--- drivers/gpu/drm/msm/msm_gem.c | 3 ++- drivers/gpu/drm/msm/msm_gem.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gem.c +2 -1
@@ -938,7 +938,8 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m,uint64_t off =drm_vma_node_start (&obj->vma_node);const char *madv; -msm_gem_lock (obj); +if (!msm_gem_trylock (obj)) +return ; stats->all.count++; stats->all.size += obj->size;
drivers/gpu/drm/msm/msm_gem.h +6 -0
@@ -280,6 +280,12 @@ msm_gem_lock(struct drm_gem_object *obj)dma_resv_lock (obj->resv,NULL ); } +static inline bool __must_check +msm_gem_trylock (struct drm_gem_object *obj) +{ +return dma_resv_trylock (obj->resv); +} +static inline int msm_gem_lock_interruptible (struct drm_gem_object *obj) {
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 40/42 drm/msm: Bump UAPI version
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
Bump version to signal to userspace that VM_BIND is supported.
--- drivers/gpu/drm/msm/msm_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_drv.c +2 -1
@@ -41,9 +41,10 @@* - 1.10.0 - Add MSM_SUBMIT_BO_NO_IMPLICIT * - 1.11.0 - Add wait boost (MSM_WAIT_FENCE_BOOST, MSM_PREP_BOOST) * - 1.12.0 - Add MSM_INFO_SET_METADATA and MSM_INFO_GET_METADATA +* - 1.13.0 - Add VM_BIND */ #define MSM_VERSION_MAJOR 1 -#define MSM_VERSION_MINOR 12 +#define MSM_VERSION_MINOR 13#define MSM_VERSION_PATCHLEVEL 0bool dumpstate;
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 41/42 drm/msm: Defer VMA unmap for fb unpins
In reply to Rob ClarkWith the conversion to drm_gpuvm, we lost the lazy VMA cleanup, which means that fb cleanup/unpin when pageflipping to new scanout buffers immediately unmaps the scanout buffer. This is costly (with tlbinv, it can be 4-6ms for a 1080p scanout buffer, and more for higher resolutions)!
To avoid this, introduce a vma_ref, which is incremented whenever userspace has a GEM handle or dma-buf fd. When unpinning if the vm is the kms->vm we defer tearing down the VMA until the vma_ref drops to zero. If the buffer is still part of a flip-chain then userspace will be holding some sort of reference to the BO, either via a GEM handle and/or dma-buf fd. So this avoids unmapping the VMA when there is a strong possibility that it will be needed again.
--- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/gpu/drm/msm/msm_drv.h | 1 + drivers/gpu/drm/msm/msm_fb.c | 5 ++- drivers/gpu/drm/msm/msm_gem.c | 60 ++++++++++++++++++----------- drivers/gpu/drm/msm/msm_gem.h | 28 ++++++++++++++ drivers/gpu/drm/msm/msm_gem_prime.c | 54 +++++++++++++++++++++++++- 6 files changed, 123 insertions(+), 26 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +1 -0
@@ -830,6 +830,7 @@ static const struct drm_driver msm_driver = { .postclose = msm_postclose, .dumb_create = msm_gem_dumb_create, .dumb_map_offset = msm_gem_dumb_map_offset, + .gem_prime_import = msm_gem_prime_import, .gem_prime_import_sg_table = msm_gem_prime_import_sg_table, #ifdef CONFIG_DEBUG_FS .debugfs_init = msm_debugfs_init,
drivers/gpu/drm/msm/msm_drv.h +1 -0
@@ -269,6 +269,7 @@ void msm_gem_shrinker_cleanup(struct drm_device *dev);struct sg_table *msm_gem_prime_get_sg_table (struct drm_gem_object *obj);int msm_gem_prime_vmap (struct drm_gem_object *obj,struct iosys_map *map);void msm_gem_prime_vunmap (struct drm_gem_object *obj,struct iosys_map *map); +struct drm_gem_object *msm_gem_prime_import (struct drm_device *dev,struct dma_buf *buf);struct drm_gem_object *msm_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sg);struct dma_buf *msm_gem_prime_export (struct drm_gem_object *obj,int flags);
drivers/gpu/drm/msm/msm_fb.c +4 -1
@@ -89,6 +89,7 @@ int msm_framebuffer_prepare(struct drm_framebuffer *fb, bool needs_dirtyfb)return 0 ;for (i =0 ; i < n; i++) { +msm_gem_vma_get (fb->obj[i]); ret =msm_gem_get_and_pin_iova (fb->obj[i], vm, &msm_fb->iova[i]);drm_dbg_state (fb->dev,"FB[%u]: iova[%d]: %08llx (%d)\n" , fb->base.id, i, msm_fb->iova[i], ret);
@@ -114,8 +115,10 @@ void msm_framebuffer_cleanup(struct drm_framebuffer *fb, bool needed_dirtyfb)memset (msm_fb->iova,0 ,sizeof (msm_fb->iova)); -for (i =0 ; i < n; i++) +for (i =0 ; i < n; i++) {msm_gem_unpin_iova (fb->obj[i], vm); +msm_gem_vma_put (fb->obj[i]); + } }uint32_t msm_framebuffer_iova (struct drm_framebuffer *fb,int plane)
drivers/gpu/drm/msm/msm_gem.c +37 -23
102 lines not on this page · raw message
drivers/gpu/drm/msm/msm_gem.h +28 -0
@@ -211,9 +211,37 @@ struct msm_gem_object {* Protected by LRU lock. */ int pin_count; + +/** +* @vma_ref: Reference count of VMA users. +* +* With the vm_bo/vma holding a reference to the GEM object, we'd +* otherwise have to actively tear down a VMA when, for example, +* a buffer is unpinned for scanout, vs. the pre-drm_gpuvm approach +* where a VMA did not hold a reference to the BO, but instead was +* implicitly torn down when the BO was freed. +* +* To regain the lazy VMA teardown, we use the @vma_ref. It is +* incremented for any of the following: +* +* 1) the BO is exported as a dma_buf +* 2) the BO has open userspace handle +* +* All of those conditions will hold an reference to the BO, +* preventing it from being freed. So lazily keeping around the +* VMA will not prevent the BO from being freed. (Or rather, the +* reference loop is harmless in this case.) +* +* When the @vma_ref drops to zero, then kms->vm VMA will be +* torn down. +*/ +atomic_t vma_ref; };#define to_msm_bo (x) container_of(x, struct msm_gem_object, base) +void msm_gem_vma_get (struct drm_gem_object *obj); +void msm_gem_vma_put (struct drm_gem_object *obj); +uint64_t msm_gem_mmap_offset (struct drm_gem_object *obj);int msm_gem_prot (struct drm_gem_object *obj);int msm_gem_pin_vma_locked (struct drm_gem_object *obj,struct drm_gpuva *vma);
drivers/gpu/drm/msm/msm_gem_prime.c +52 -2
77 lines not on this page · raw message
Signature · 1 line
2.50.0
Rob Clark
maintainerPATCH v9 42/42 drm/msm: Add VM_BIND throttling
In reply to Rob ClarkA large number of (unsorted or separate) small (<2MB) mappings can cause a lot of, probably unnecessary, prealloc pages. Ie. a single 4k page size mapping will pre-allocate 3 pages (for levels 2-4) for the pagetable. Which can chew up a large amount of unneeded memory. So add a mechanism to put an upper bound on the # of pre-alloc pages.
--- drivers/gpu/drm/msm/msm_gem.h | 20 ++++++++++++++++++++ drivers/gpu/drm/msm/msm_gem_vma.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/msm_gem.h +20 -0
@@ -75,6 +75,26 @@ struct msm_gem_vm {*/ struct drm_gpu_scheduler sched; +/** +* @prealloc_throttle: Used to throttle VM_BIND ops if too much pre- +* allocated memory is in flight. +* +* Because we have to pre-allocate pgtable pages for the worst case +* (ie. new mappings do not share any PTEs with existing mappings) +* we could end up consuming a lot of resources transiently. The +* prealloc_throttle puts an upper bound on that. +*/ +struct { +/** @wait: Notified when preallocated resources are released */ +wait_queue_head_t wait; + +/** +* @in_flight: The # of preallocated pgtable pages in-flight +* for queued VM_BIND jobs. +*/ +atomic_t in_flight; + } prealloc_throttle; +/** * @mm: Memory management for kernel managed VA allocations *
drivers/gpu/drm/msm/msm_gem_vma.c +26 -2
@@ -705,6 +705,8 @@ msm_vma_job_free(struct drm_sched_job *_job) vm->mmu->funcs->prealloc_cleanup (vm->mmu, &job->prealloc); +atomic_sub (job->prealloc.count, &vm->prealloc_throttle.in_flight); +drm_sched_job_cleanup (_job);job_foreach_bo (obj, job)
@@ -721,6 +723,8 @@ msm_vma_job_free(struct drm_sched_job *_job)kfree (op); } +wake_up (&vm->prealloc_throttle.wait); +kfree (job); }
@@ -783,6 +787,8 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char *name, ret =drm_sched_init (&vm->sched, &args);if (ret) goto err_free_dummy; + +init_waitqueue_head (&vm->prealloc_throttle.wait); } drm_gpuvm_init(&vm->base, name, flags, drm, dummy_gem,
@@ -1089,10 +1095,12 @@ ops_are_same_pte(struct msm_vm_bind_op *first, struct msm_vm_bind_op *next)* them as a single mapping. Otherwise the prealloc_count() will not realize * they can share pagetable pages and vastly overcount. */ -static void +static int vm_bind_prealloc_count (struct msm_vm_bind_job *job) {struct msm_vm_bind_op *first =NULL , *last =NULL ; +struct msm_gem_vm *vm =to_msm_vm (job->vm); +int ret;for (int i =0 ; i < job->nr_ops; i++) {struct msm_vm_bind_op *op = &job->ops[i];
@@ -1121,6 +1129,20 @@ vm_bind_prealloc_count(struct msm_vm_bind_job *job)/* Flush the remaining range: */ prealloc_count (job, first, last); + +/* +* Now that we know the needed amount to pre-alloc, throttle on pending +* VM_BIND jobs if we already have too much pre-alloc memory in flight +*/ + ret =wait_event_interruptible ( + vm->prealloc_throttle.wait, +atomic_read (&vm->prealloc_throttle.in_flight) <=1024 ); +if (ret) +return ret; + +atomic_add (job->prealloc.count, &vm->prealloc_throttle.in_flight); + +return 0 ; }/*
@@ -1411,7 +1433,9 @@ msm_ioctl_vm_bind(struct drm_device *dev, void *data, struct drm_file *file)if (ret) goto out_unlock; -vm_bind_prealloc_count (job); + ret =vm_bind_prealloc_count (job); +if (ret) + goto out_unlock;struct drm_exec exec;unsigned flags =DRM_EXEC_IGNORE_DUPLICATES |DRM_EXEC_INTERRUPTIBLE_WAIT ;
Signature · 1 line
2.50.0