On 26/11/2025 12:44, Boris Brezillon wrote: > From: Faith Ekstrand <[email protected]> > > This will be used by the UMD to synchronize CPU-cached mappings when > the UMD can't do it directly (no usermode cache maintenance instruction > on Arm32). > > v2: > - Add more to the commit message > - Change the flags to better match the drm_gem_shmem_sync semantics > > v3: > - Add Steve's R-b > > v4: > - No changes > > v5: > - Drop Steve's R-b (semantics changes requiring a new review) > > v6: > - Bail out early in panfrost_ioctl_sync_bo() if op_count is zero > > Signed-off-by: Faith Ekstrand <[email protected]> > Signed-off-by: Boris Brezillon <[email protected]>
Reviewed-by: Steven Price <[email protected]> > --- > drivers/gpu/drm/panfrost/panfrost_drv.c | 51 +++++++++++++++++++++++++ > drivers/gpu/drm/panfrost/panfrost_gem.c | 21 ++++++++++ > drivers/gpu/drm/panfrost/panfrost_gem.h | 2 + > include/uapi/drm/panfrost_drm.h | 45 ++++++++++++++++++++++ > 4 files changed, 119 insertions(+) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c > b/drivers/gpu/drm/panfrost/panfrost_drv.c > index 54ac9d2ececf..85ae2eefca04 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > @@ -580,6 +580,56 @@ static int panfrost_ioctl_jm_ctx_destroy(struct > drm_device *dev, void *data, > return panfrost_jm_ctx_destroy(file, args->handle); > } > > +static int panfrost_ioctl_sync_bo(struct drm_device *ddev, void *data, > + struct drm_file *file) > +{ > + struct drm_panfrost_sync_bo *args = data; > + struct drm_panfrost_bo_sync_op *ops; > + struct drm_gem_object *obj; > + int ret; > + u32 i; > + > + if (args->pad) > + return -EINVAL; > + > + if (!args->op_count) > + return 0; > + > + ops = kvmalloc_array(args->op_count, sizeof(*ops), GFP_KERNEL); > + if (!ops) { > + DRM_DEBUG("Failed to allocate incoming BO sync ops array\n"); > + return -ENOMEM; > + } > + > + if (copy_from_user(ops, (void __user *)(uintptr_t)args->ops, > + args->op_count * sizeof(*ops))) { > + DRM_DEBUG("Failed to copy in BO sync ops\n"); > + ret = -EFAULT; > + goto err_ops; > + } NIT: there's a helper vmemdup_array_user() which does this, but we do already have similar code in panfrost_copy_in_sync(), so it's fine by me whichever way. Thanks, Steve > + > + for (i = 0; i < args->op_count; i++) { > + obj = drm_gem_object_lookup(file, ops[i].handle); > + if (!obj) { > + ret = -ENOENT; > + goto err_ops; > + } > + > + ret = panfrost_gem_sync(obj, ops[i].type, > + ops[i].offset, ops[i].size); > + > + drm_gem_object_put(obj); > + > + if (ret) > + goto err_ops; > + } > + > +err_ops: > + kvfree(ops); > + > + return ret; > +} > + > int panfrost_unstable_ioctl_check(void) > { > if (!unstable_ioctls) > @@ -649,6 +699,7 @@ static const struct drm_ioctl_desc > panfrost_drm_driver_ioctls[] = { > PANFROST_IOCTL(SET_LABEL_BO, set_label_bo, DRM_RENDER_ALLOW), > PANFROST_IOCTL(JM_CTX_CREATE, jm_ctx_create, DRM_RENDER_ALLOW), > PANFROST_IOCTL(JM_CTX_DESTROY, jm_ctx_destroy, DRM_RENDER_ALLOW), > + PANFROST_IOCTL(SYNC_BO, sync_bo, DRM_RENDER_ALLOW), > }; > > static void panfrost_gpu_show_fdinfo(struct panfrost_device *pfdev, > diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c > b/drivers/gpu/drm/panfrost/panfrost_gem.c > index 292f3ce6287f..ca884bf216d6 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_gem.c > +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c > @@ -379,6 +379,27 @@ panfrost_gem_set_label(struct drm_gem_object *obj, const > char *label) > kfree_const(old_label); > } > > +int > +panfrost_gem_sync(struct drm_gem_object *obj, u32 type, > + u32 offset, u32 size) > +{ > + struct panfrost_gem_object *bo = to_panfrost_bo(obj); > + enum drm_gem_shmem_sync_type shmem_sync_type; > + > + switch (type) { > + case PANFROST_BO_SYNC_CPU_CACHE_FLUSH: > + shmem_sync_type = DRM_GEM_SHMEM_SYNC_CPU_CACHE_FLUSH; > + break; > + case PANFROST_BO_SYNC_CPU_CACHE_FLUSH_AND_INVALIDATE: > + shmem_sync_type = > DRM_GEM_SHMEM_SYNC_CPU_CACHE_FLUSH_AND_INVALIDATE; > + break; > + default: > + return -EINVAL; > + } > + > + return drm_gem_shmem_sync(&bo->base, offset, size, shmem_sync_type); > +} > + > void > panfrost_gem_internal_set_label(struct drm_gem_object *obj, const char > *label) > { > diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.h > b/drivers/gpu/drm/panfrost/panfrost_gem.h > index 9ad35e2d99fc..30438ad335de 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_gem.h > +++ b/drivers/gpu/drm/panfrost/panfrost_gem.h > @@ -150,6 +150,8 @@ int panfrost_gem_shrinker_init(struct drm_device *dev); > void panfrost_gem_shrinker_cleanup(struct drm_device *dev); > > void panfrost_gem_set_label(struct drm_gem_object *obj, const char *label); > +int panfrost_gem_sync(struct drm_gem_object *obj, u32 type, > + u32 offset, u32 size); > void panfrost_gem_internal_set_label(struct drm_gem_object *obj, const char > *label); > > #ifdef CONFIG_DEBUG_FS > diff --git a/include/uapi/drm/panfrost_drm.h b/include/uapi/drm/panfrost_drm.h > index 0c59714ae42b..e194e087a0c8 100644 > --- a/include/uapi/drm/panfrost_drm.h > +++ b/include/uapi/drm/panfrost_drm.h > @@ -24,6 +24,7 @@ extern "C" { > #define DRM_PANFROST_SET_LABEL_BO 0x09 > #define DRM_PANFROST_JM_CTX_CREATE 0x0a > #define DRM_PANFROST_JM_CTX_DESTROY 0x0b > +#define DRM_PANFROST_SYNC_BO 0x0c > > #define DRM_IOCTL_PANFROST_SUBMIT DRM_IOW(DRM_COMMAND_BASE + > DRM_PANFROST_SUBMIT, struct drm_panfrost_submit) > #define DRM_IOCTL_PANFROST_WAIT_BO DRM_IOW(DRM_COMMAND_BASE + > DRM_PANFROST_WAIT_BO, struct drm_panfrost_wait_bo) > @@ -35,6 +36,7 @@ extern "C" { > #define DRM_IOCTL_PANFROST_SET_LABEL_BO > DRM_IOWR(DRM_COMMAND_BASE + DRM_PANFROST_SET_LABEL_BO, struct > drm_panfrost_set_label_bo) > #define DRM_IOCTL_PANFROST_JM_CTX_CREATE DRM_IOWR(DRM_COMMAND_BASE + > DRM_PANFROST_JM_CTX_CREATE, struct drm_panfrost_jm_ctx_create) > #define DRM_IOCTL_PANFROST_JM_CTX_DESTROY DRM_IOWR(DRM_COMMAND_BASE + > DRM_PANFROST_JM_CTX_DESTROY, struct drm_panfrost_jm_ctx_destroy) > +#define DRM_IOCTL_PANFROST_SYNC_BO DRM_IOWR(DRM_COMMAND_BASE + > DRM_PANFROST_SYNC_BO, struct drm_panfrost_sync_bo) > > /* > * Unstable ioctl(s): only exposed when the unsafe unstable_ioctls module > @@ -308,6 +310,49 @@ struct drm_panfrost_set_label_bo { > __u64 label; > }; > > +/* Valid flags to pass to drm_panfrost_bo_sync_op */ > +#define PANFROST_BO_SYNC_CPU_CACHE_FLUSH 0 > +#define PANFROST_BO_SYNC_CPU_CACHE_FLUSH_AND_INVALIDATE 1 > + > +/** > + * struct drm_panthor_bo_flush_map_op - BO map sync op > + */ > +struct drm_panfrost_bo_sync_op { > + /** @handle: Handle of the buffer object to sync. */ > + __u32 handle; > + > + /** @type: Type of sync operation. */ > + __u32 type; > + > + /** > + * @offset: Offset into the BO at which the sync range starts. > + * > + * This will be rounded down to the nearest cache line as needed. > + */ > + __u32 offset; > + > + /** > + * @size: Size of the range to sync > + * > + * @size + @offset will be rounded up to the nearest cache line as > + * needed. > + */ > + __u32 size; > +}; > + > +/** > + * struct drm_panfrost_sync_bo - ioctl argument for syncing BO maps > + */ > +struct drm_panfrost_sync_bo { > + /** Array of struct drm_panfrost_bo_sync_op */ > + __u64 ops; > + > + /** Number of BO sync ops */ > + __u32 op_count; > + > + __u32 pad; > +}; > + > /* Definitions for coredump decoding in user space */ > #define PANFROSTDUMP_MAJOR 1 > #define PANFROSTDUMP_MINOR 0
