| Message ID | 20201208155451.8421-4-p.zabel@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: managed encoder/plane/crtc allocation | expand |
On Tue, Dec 08, 2020 at 04:54:35PM +0100, Philipp Zabel wrote: > Add an alternative to drm_simple_encoder_init() that allocates and > initializes a simple encoder and registers drm_encoder_cleanup() with > drmm_add_action_or_reset(). > > Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > Changes since v3: > - drop drmm_simple_encoder_funcs_empty, now that encoder control > functions are optional > --- > drivers/gpu/drm/drm_simple_kms_helper.c | 9 +++++++++ > include/drm/drm_simple_kms_helper.h | 24 ++++++++++++++++++++++++ > 2 files changed, 33 insertions(+) > > diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c > index 743e57c1b44f..ccf0908eb82e 100644 > --- a/drivers/gpu/drm/drm_simple_kms_helper.c > +++ b/drivers/gpu/drm/drm_simple_kms_helper.c > @@ -9,6 +9,7 @@ > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_bridge.h> > +#include <drm/drm_managed.h> > #include <drm/drm_plane_helper.h> > #include <drm/drm_probe_helper.h> > #include <drm/drm_simple_kms_helper.h> > @@ -71,6 +72,14 @@ int drm_simple_encoder_init(struct drm_device *dev, Please also address the FIXME in the kerneldoc for drm_simple_encoder_init and replace it with a recommendation to use this new function you're adding here. > } > EXPORT_SYMBOL(drm_simple_encoder_init); > > +void *__drmm_simple_encoder_alloc(struct drm_device *dev, size_t size, > + size_t offset, int encoder_type) > +{ > + return __drmm_encoder_alloc(dev, size, offset, NULL, encoder_type, > + NULL); > +} > +EXPORT_SYMBOL(__drmm_simple_encoder_alloc); > + > static enum drm_mode_status > drm_simple_kms_crtc_mode_valid(struct drm_crtc *crtc, > const struct drm_display_mode *mode) > diff --git a/include/drm/drm_simple_kms_helper.h b/include/drm/drm_simple_kms_helper.h > index a026375464ff..e6dbf3161c2f 100644 > --- a/include/drm/drm_simple_kms_helper.h > +++ b/include/drm/drm_simple_kms_helper.h > @@ -185,4 +185,28 @@ int drm_simple_encoder_init(struct drm_device *dev, > struct drm_encoder *encoder, > int encoder_type); > > +void *__drmm_simple_encoder_alloc(struct drm_device *dev, size_t size, > + size_t offset, int encoder_type); > + > +/** > + * drmm_simple_encoder_alloc - Allocate and initialize an encoder with basic > + * functionality. > + * @dev: drm device > + * @type: the type of the struct which contains struct &drm_encoder > + * @member: the name of the &drm_encoder within @type. > + * @encoder_type: user visible type of the encoder > + * > + * Allocates and initializes an encoder that has no further functionality. > + * Settings for possible CRTC and clones are left to their initial values. > + * Cleanup is automatically handled through registering drm_encoder_cleanup() > + * with drmm_add_action(). > + * > + * Returns: > + * Pointer to new encoder, or ERR_PTR on failure. > + */ > +#define drmm_simple_encoder_alloc(dev, type, member, encoder_type) \ > + ((type *)__drmm_simple_encoder_alloc(dev, sizeof(type), \ Same comment about container_of. Also, since this is a dummy encoder, do we really need the subclassing support here? I guess it makes sense for consistency at least, which is always good. With the nits addressed: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > + offsetof(type, member), \ > + encoder_type)) > + > #endif /* __LINUX_DRM_SIMPLE_KMS_HELPER_H */ > -- > 2.20.1 >
diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c index 743e57c1b44f..ccf0908eb82e 100644 --- a/drivers/gpu/drm/drm_simple_kms_helper.c +++ b/drivers/gpu/drm/drm_simple_kms_helper.c @@ -9,6 +9,7 @@ #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> +#include <drm/drm_managed.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> #include <drm/drm_simple_kms_helper.h> @@ -71,6 +72,14 @@ int drm_simple_encoder_init(struct drm_device *dev, } EXPORT_SYMBOL(drm_simple_encoder_init); +void *__drmm_simple_encoder_alloc(struct drm_device *dev, size_t size, + size_t offset, int encoder_type) +{ + return __drmm_encoder_alloc(dev, size, offset, NULL, encoder_type, + NULL); +} +EXPORT_SYMBOL(__drmm_simple_encoder_alloc); + static enum drm_mode_status drm_simple_kms_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode) diff --git a/include/drm/drm_simple_kms_helper.h b/include/drm/drm_simple_kms_helper.h index a026375464ff..e6dbf3161c2f 100644 --- a/include/drm/drm_simple_kms_helper.h +++ b/include/drm/drm_simple_kms_helper.h @@ -185,4 +185,28 @@ int drm_simple_encoder_init(struct drm_device *dev, struct drm_encoder *encoder, int encoder_type); +void *__drmm_simple_encoder_alloc(struct drm_device *dev, size_t size, + size_t offset, int encoder_type); + +/** + * drmm_simple_encoder_alloc - Allocate and initialize an encoder with basic + * functionality. + * @dev: drm device + * @type: the type of the struct which contains struct &drm_encoder + * @member: the name of the &drm_encoder within @type. + * @encoder_type: user visible type of the encoder + * + * Allocates and initializes an encoder that has no further functionality. + * Settings for possible CRTC and clones are left to their initial values. + * Cleanup is automatically handled through registering drm_encoder_cleanup() + * with drmm_add_action(). + * + * Returns: + * Pointer to new encoder, or ERR_PTR on failure. + */ +#define drmm_simple_encoder_alloc(dev, type, member, encoder_type) \ + ((type *)__drmm_simple_encoder_alloc(dev, sizeof(type), \ + offsetof(type, member), \ + encoder_type)) + #endif /* __LINUX_DRM_SIMPLE_KMS_HELPER_H */