Commit 9dbb70fd authored by Philipp Zabel's avatar Philipp Zabel
Browse files

drm/crtc: add drmm_crtc_alloc_with_planes() 



Add an alternative to drm_crtc_init_with_planes() that allocates
and initializes a crtc and registers drm_crtc_cleanup() with
drmm_add_action_or_reset().

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0a1b813f

drivers/gpu/drm/drm_crtc.c

+97 −28
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <drm/drm_crtc.h>

#include <drm/drm_edid.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_managed.h>

#include <drm/drm_modeset_lock.h>

#include <drm/drm_atomic.h>

#include <drm/drm_auth.h>
@@ -240,30 +241,12 @@ struct dma_fence *drm_crtc_create_fence(struct drm_crtc *crtc) 
 * 		Nearest Neighbor scaling filter

 */



/**

 * drm_crtc_init_with_planes - Initialise a new CRTC object with

 *    specified primary and cursor planes.

 * @dev: DRM device

 * @crtc: CRTC object to init

 * @primary: Primary plane for CRTC

 * @cursor: Cursor plane for CRTC

 * @funcs: callbacks for the new CRTC

 * @name: printf style format string for the CRTC name, or NULL for default name

 *

 * Inits a new object created as base part of a driver crtc object. Drivers

 * should use this function instead of drm_crtc_init(), which is only provided

 * for backwards compatibility with drivers which do not yet support universal

 * planes). For really simple hardware which has only 1 plane look at

 * drm_simple_display_pipe_init() instead.

 *

 * Returns:

 * Zero on success, error code on failure.

 */

int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc,

__printf(6, 0)

static int __drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc,

				       struct drm_plane *primary,

				       struct drm_plane *cursor,

				       const struct drm_crtc_funcs *funcs,

			      const char *name, ...)

				       const char *name, va_list ap)

{

	struct drm_mode_config *config = &dev->mode_config;

	int ret;
@@ -291,11 +274,7 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc, 
		return ret;



	if (name) {

		va_list ap;



		va_start(ap, name);

		crtc->name = kvasprintf(GFP_KERNEL, name, ap);

		va_end(ap);

	} else {

		crtc->name = kasprintf(GFP_KERNEL, "crtc-%d",

				       drm_num_crtcs(dev));
@@ -339,8 +318,98 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc, 


	return 0;

}



/**

 * drm_crtc_init_with_planes - Initialise a new CRTC object with

 *    specified primary and cursor planes.

 * @dev: DRM device

 * @crtc: CRTC object to init

 * @primary: Primary plane for CRTC

 * @cursor: Cursor plane for CRTC

 * @funcs: callbacks for the new CRTC

 * @name: printf style format string for the CRTC name, or NULL for default name

 *

 * Inits a new object created as base part of a driver crtc object. Drivers

 * should use this function instead of drm_crtc_init(), which is only provided

 * for backwards compatibility with drivers which do not yet support universal

 * planes). For really simple hardware which has only 1 plane look at

 * drm_simple_display_pipe_init() instead.

 * The &drm_crtc_funcs.destroy hook should call drm_crtc_cleanup() and kfree()

 * the crtc structure. The crtc structure should not be allocated with

 * devm_kzalloc().

 *

 * Note: consider using drmm_crtc_alloc_with_planes() instead of

 * drm_crtc_init_with_planes() to let the DRM managed resource infrastructure

 * take care of cleanup and deallocation.

 *

 * Returns:

 * Zero on success, error code on failure.

 */

int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc,

			      struct drm_plane *primary,

			      struct drm_plane *cursor,

			      const struct drm_crtc_funcs *funcs,

			      const char *name, ...)

{

	va_list ap;

	int ret;



	WARN_ON(!funcs->destroy);



	va_start(ap, name);

	ret = __drm_crtc_init_with_planes(dev, crtc, primary, cursor, funcs,

					  name, ap);

	va_end(ap);



	return ret;

}

EXPORT_SYMBOL(drm_crtc_init_with_planes);



static void drmm_crtc_alloc_with_planes_cleanup(struct drm_device *dev,

						void *ptr)

{

	struct drm_crtc *crtc = ptr;



	drm_crtc_cleanup(crtc);

}



void *__drmm_crtc_alloc_with_planes(struct drm_device *dev,

				    size_t size, size_t offset,

				    struct drm_plane *primary,

				    struct drm_plane *cursor,

				    const struct drm_crtc_funcs *funcs,

				    const char *name, ...)

{

	void *container;

	struct drm_crtc *crtc;

	va_list ap;

	int ret;



	if (WARN_ON(!funcs || funcs->destroy))

		return ERR_PTR(-EINVAL);



	container = drmm_kzalloc(dev, size, GFP_KERNEL);

	if (!container)

		return ERR_PTR(-ENOMEM);



	crtc = container + offset;



	va_start(ap, name);

	ret = __drm_crtc_init_with_planes(dev, crtc, primary, cursor, funcs,

					  name, ap);

	va_end(ap);

	if (ret)

		return ERR_PTR(ret);



	ret = drmm_add_action_or_reset(dev, drmm_crtc_alloc_with_planes_cleanup,

				       crtc);

	if (ret)

		return ERR_PTR(ret);



	return container;

}

EXPORT_SYMBOL(__drmm_crtc_alloc_with_planes);



/**

 * drm_crtc_cleanup - Clean up the core crtc usage

 * @crtc: CRTC to cleanup

include/drm/drm_crtc.h

+33 −0
Original line number Diff line number Diff line
@@ -1223,6 +1223,39 @@ int drm_crtc_init_with_planes(struct drm_device *dev, 
			      const char *name, ...);

void drm_crtc_cleanup(struct drm_crtc *crtc);



__printf(7, 8)

void *__drmm_crtc_alloc_with_planes(struct drm_device *dev,

				    size_t size, size_t offset,

				    struct drm_plane *primary,

				    struct drm_plane *cursor,

				    const struct drm_crtc_funcs *funcs,

				    const char *name, ...);



/**

 * drm_crtc_alloc_with_planes - Allocate and initialize a new CRTC object with

 *    specified primary and cursor planes.

 * @dev: DRM device

 * @type: the type of the struct which contains struct &drm_crtc

 * @member: the name of the &drm_crtc within @type.

 * @primary: Primary plane for CRTC

 * @cursor: Cursor plane for CRTC

 * @funcs: callbacks for the new CRTC

 * @name: printf style format string for the CRTC name, or NULL for default name

 *

 * Allocates and initializes a new crtc object. Cleanup is automatically

 * handled through registering drmm_crtc_cleanup() with drmm_add_action().

 *

 * The @drm_crtc_funcs.destroy hook must be NULL.

 *

 * Returns:

 * Pointer to new crtc, or ERR_PTR on failure.

 */

#define drmm_crtc_alloc_with_planes(dev, type, member, primary, cursor, funcs, name, ...) \

	((type *)__drmm_crtc_alloc_with_planes(dev, sizeof(type), \

					       offsetof(type, member), \

					       primary, cursor, funcs, \

					       name, ##__VA_ARGS__))



/**

 * drm_crtc_index - find the index of a registered CRTC

 * @crtc: CRTC to find index for