| Message ID | 20240524133518.976-2-michal.wajdeczko@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add DRM-managed drm_mm_init() | expand |
On Fri, May 24, 2024 at 03:35:17PM +0200, Michal Wajdeczko wrote: > Add drmm_mm_init(), a helper that provides managed allocator cleanup. > The allocator will be cleaned up with the final reference of the DRM > device. > > Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/drm_managed.c | 27 +++++++++++++++++++++++++++ > include/drm/drm_managed.h | 3 +++ > 2 files changed, 30 insertions(+) > > diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.c > index 7646f67bda4e..2fb9656bada3 100644 > --- a/drivers/gpu/drm/drm_managed.c > +++ b/drivers/gpu/drm/drm_managed.c > @@ -13,6 +13,7 @@ > #include <linux/spinlock.h> > > #include <drm/drm_device.h> > +#include <drm/drm_mm.h> > #include <drm/drm_print.h> > > #include "drm_internal.h" > @@ -310,3 +311,29 @@ void __drmm_mutex_release(struct drm_device *dev, void *res) > mutex_destroy(lock); > } > EXPORT_SYMBOL(__drmm_mutex_release); > + > +static void __drmm_mm_takedown(struct drm_device *dev, void *res) > +{ > + struct drm_mm *mm = res; > + > + drm_mm_takedown(mm); > +} > + > +/** > + * drmm_mm_init - &drm_device managed drm_mm_init() > + * @dev: DRM device > + * @mm: the drm_mm structure to initialize > + * @start: start of the range managed by @mm > + * @size: end of the range managed by @mm > + * > + * This is a &drm_device managed version of drm_mm_init(). > + * The initialized allocator will be cleaned up on the final drm_dev_put(). > + * > + * Return: 0 on success, or a negative errno code otherwise. > + */ > +int drmm_mm_init(struct drm_device *dev, struct drm_mm *mm, u64 start, u64 size) > +{ > + drm_mm_init(mm, start, size); > + return drmm_add_action_or_reset(dev, __drmm_mm_takedown, mm); > +} > +EXPORT_SYMBOL(drmm_mm_init); > diff --git a/include/drm/drm_managed.h b/include/drm/drm_managed.h > index f547b09ca023..e8c2f29cb88a 100644 > --- a/include/drm/drm_managed.h > +++ b/include/drm/drm_managed.h > @@ -8,6 +8,7 @@ > #include <linux/types.h> > > struct drm_device; > +struct drm_mm; > struct mutex; > > typedef void (*drmres_release_t)(struct drm_device *dev, void *res); > @@ -127,4 +128,6 @@ void __drmm_mutex_release(struct drm_device *dev, void *res); > drmm_add_action_or_reset(dev, __drmm_mutex_release, lock); \ > }) \ > > +int drmm_mm_init(struct drm_device *dev, struct drm_mm *mm, u64 start, u64 size); Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > + > #endif > -- > 2.43.0 >
diff --git a/drivers/gpu/drm/drm_managed.c b/drivers/gpu/drm/drm_managed.c index 7646f67bda4e..2fb9656bada3 100644 --- a/drivers/gpu/drm/drm_managed.c +++ b/drivers/gpu/drm/drm_managed.c @@ -13,6 +13,7 @@ #include <linux/spinlock.h> #include <drm/drm_device.h> +#include <drm/drm_mm.h> #include <drm/drm_print.h> #include "drm_internal.h" @@ -310,3 +311,29 @@ void __drmm_mutex_release(struct drm_device *dev, void *res) mutex_destroy(lock); } EXPORT_SYMBOL(__drmm_mutex_release); + +static void __drmm_mm_takedown(struct drm_device *dev, void *res) +{ + struct drm_mm *mm = res; + + drm_mm_takedown(mm); +} + +/** + * drmm_mm_init - &drm_device managed drm_mm_init() + * @dev: DRM device + * @mm: the drm_mm structure to initialize + * @start: start of the range managed by @mm + * @size: end of the range managed by @mm + * + * This is a &drm_device managed version of drm_mm_init(). + * The initialized allocator will be cleaned up on the final drm_dev_put(). + * + * Return: 0 on success, or a negative errno code otherwise. + */ +int drmm_mm_init(struct drm_device *dev, struct drm_mm *mm, u64 start, u64 size) +{ + drm_mm_init(mm, start, size); + return drmm_add_action_or_reset(dev, __drmm_mm_takedown, mm); +} +EXPORT_SYMBOL(drmm_mm_init); diff --git a/include/drm/drm_managed.h b/include/drm/drm_managed.h index f547b09ca023..e8c2f29cb88a 100644 --- a/include/drm/drm_managed.h +++ b/include/drm/drm_managed.h @@ -8,6 +8,7 @@ #include <linux/types.h> struct drm_device; +struct drm_mm; struct mutex; typedef void (*drmres_release_t)(struct drm_device *dev, void *res); @@ -127,4 +128,6 @@ void __drmm_mutex_release(struct drm_device *dev, void *res); drmm_add_action_or_reset(dev, __drmm_mutex_release, lock); \ }) \ +int drmm_mm_init(struct drm_device *dev, struct drm_mm *mm, u64 start, u64 size); + #endif
Add drmm_mm_init(), a helper that provides managed allocator cleanup. The allocator will be cleaned up with the final reference of the DRM device. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/drm_managed.c | 27 +++++++++++++++++++++++++++ include/drm/drm_managed.h | 3 +++ 2 files changed, 30 insertions(+)