| Message ID | 20240405201753.1176914-5-mcanal@igalia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/v3d: Enable Big and Super Pages | expand |
On 05/04/2024 19:29, Maíra Canal wrote: > Create a function `drm_gem_shmem_create_with_mnt()`, similar to > `drm_gem_shmem_create()`, that has a mountpoint as a argument. This > function will create a shmem GEM object in a given tmpfs mountpoint. > > This function will be useful for drivers that have a special mountpoint > with flags enabled. > > Signed-off-by: Maíra Canal <mcanal@igalia.com> > --- > drivers/gpu/drm/drm_gem_shmem_helper.c | 30 ++++++++++++++++++++++---- > include/drm/drm_gem_shmem_helper.h | 3 +++ > 2 files changed, 29 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c > index 177773bcdbfd..10b7c4c769a3 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -49,7 +49,8 @@ static const struct drm_gem_object_funcs drm_gem_shmem_funcs = { > }; > > static struct drm_gem_shmem_object * > -__drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private) > +__drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private, > + struct vfsmount *gemfs) > { > struct drm_gem_shmem_object *shmem; > struct drm_gem_object *obj; > @@ -76,7 +77,7 @@ __drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private) > drm_gem_private_object_init(dev, obj, size); > shmem->map_wc = false; /* dma-buf mappings use always writecombine */ > } else { > - ret = drm_gem_object_init(dev, obj, size); > + ret = drm_gem_object_init_with_mnt(dev, obj, size, gemfs); > } > if (ret) { > drm_gem_private_object_fini(obj); > @@ -123,10 +124,31 @@ __drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private) > */ > struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t size) > { > - return __drm_gem_shmem_create(dev, size, false); > + return __drm_gem_shmem_create(dev, size, false, NULL); > } > EXPORT_SYMBOL_GPL(drm_gem_shmem_create); > > +/** > + * drm_gem_shmem_create_with_mnt - Allocate an object with the given size in a > + * given mountpoint > + * @dev: DRM device > + * @size: Size of the object to allocate > + * @gemfs: tmpfs mount where the GEM object will be created > + * > + * This function creates a shmem GEM object in a given tmpfs mountpoint. > + * > + * Returns: > + * A struct drm_gem_shmem_object * on success or an ERR_PTR()-encoded negative > + * error code on failure. > + */ > +struct drm_gem_shmem_object *drm_gem_shmem_create_with_mnt(struct drm_device *dev, > + size_t size, > + struct vfsmount *gemfs) > +{ > + return __drm_gem_shmem_create(dev, size, false, gemfs); > +} > +EXPORT_SYMBOL_GPL(drm_gem_shmem_create_with_mnt); > + > /** > * drm_gem_shmem_free - Free resources associated with a shmem GEM object > * @shmem: shmem GEM object to free > @@ -760,7 +782,7 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev, > size_t size = PAGE_ALIGN(attach->dmabuf->size); > struct drm_gem_shmem_object *shmem; > > - shmem = __drm_gem_shmem_create(dev, size, true); > + shmem = __drm_gem_shmem_create(dev, size, true, NULL); > if (IS_ERR(shmem)) > return ERR_CAST(shmem); > > diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h > index efbc9f27312b..d22e3fb53631 100644 > --- a/include/drm/drm_gem_shmem_helper.h > +++ b/include/drm/drm_gem_shmem_helper.h > @@ -97,6 +97,9 @@ struct drm_gem_shmem_object { > container_of(obj, struct drm_gem_shmem_object, base) > > struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t size); > +struct drm_gem_shmem_object *drm_gem_shmem_create_with_mnt(struct drm_device *dev, > + size_t size, > + struct vfsmount *gemfs); > void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem); > > void drm_gem_shmem_put_pages(struct drm_gem_shmem_object *shmem); Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com> Regards, Tvrtko
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 177773bcdbfd..10b7c4c769a3 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -49,7 +49,8 @@ static const struct drm_gem_object_funcs drm_gem_shmem_funcs = { }; static struct drm_gem_shmem_object * -__drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private) +__drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private, + struct vfsmount *gemfs) { struct drm_gem_shmem_object *shmem; struct drm_gem_object *obj; @@ -76,7 +77,7 @@ __drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private) drm_gem_private_object_init(dev, obj, size); shmem->map_wc = false; /* dma-buf mappings use always writecombine */ } else { - ret = drm_gem_object_init(dev, obj, size); + ret = drm_gem_object_init_with_mnt(dev, obj, size, gemfs); } if (ret) { drm_gem_private_object_fini(obj); @@ -123,10 +124,31 @@ __drm_gem_shmem_create(struct drm_device *dev, size_t size, bool private) */ struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t size) { - return __drm_gem_shmem_create(dev, size, false); + return __drm_gem_shmem_create(dev, size, false, NULL); } EXPORT_SYMBOL_GPL(drm_gem_shmem_create); +/** + * drm_gem_shmem_create_with_mnt - Allocate an object with the given size in a + * given mountpoint + * @dev: DRM device + * @size: Size of the object to allocate + * @gemfs: tmpfs mount where the GEM object will be created + * + * This function creates a shmem GEM object in a given tmpfs mountpoint. + * + * Returns: + * A struct drm_gem_shmem_object * on success or an ERR_PTR()-encoded negative + * error code on failure. + */ +struct drm_gem_shmem_object *drm_gem_shmem_create_with_mnt(struct drm_device *dev, + size_t size, + struct vfsmount *gemfs) +{ + return __drm_gem_shmem_create(dev, size, false, gemfs); +} +EXPORT_SYMBOL_GPL(drm_gem_shmem_create_with_mnt); + /** * drm_gem_shmem_free - Free resources associated with a shmem GEM object * @shmem: shmem GEM object to free @@ -760,7 +782,7 @@ drm_gem_shmem_prime_import_sg_table(struct drm_device *dev, size_t size = PAGE_ALIGN(attach->dmabuf->size); struct drm_gem_shmem_object *shmem; - shmem = __drm_gem_shmem_create(dev, size, true); + shmem = __drm_gem_shmem_create(dev, size, true, NULL); if (IS_ERR(shmem)) return ERR_CAST(shmem); diff --git a/include/drm/drm_gem_shmem_helper.h b/include/drm/drm_gem_shmem_helper.h index efbc9f27312b..d22e3fb53631 100644 --- a/include/drm/drm_gem_shmem_helper.h +++ b/include/drm/drm_gem_shmem_helper.h @@ -97,6 +97,9 @@ struct drm_gem_shmem_object { container_of(obj, struct drm_gem_shmem_object, base) struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t size); +struct drm_gem_shmem_object *drm_gem_shmem_create_with_mnt(struct drm_device *dev, + size_t size, + struct vfsmount *gemfs); void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem); void drm_gem_shmem_put_pages(struct drm_gem_shmem_object *shmem);
Create a function `drm_gem_shmem_create_with_mnt()`, similar to `drm_gem_shmem_create()`, that has a mountpoint as a argument. This function will create a shmem GEM object in a given tmpfs mountpoint. This function will be useful for drivers that have a special mountpoint with flags enabled. Signed-off-by: Maíra Canal <mcanal@igalia.com> --- drivers/gpu/drm/drm_gem_shmem_helper.c | 30 ++++++++++++++++++++++---- include/drm/drm_gem_shmem_helper.h | 3 +++ 2 files changed, 29 insertions(+), 4 deletions(-)