Merge tag 'imx-drm-next-2021-01-04' of git://git.pengutronix.de/git/pza/linux into...
[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_crtc.c
index a6336c7154d67b54bb9294d2658614672e3c9ec0..9c4f9947b194fcaf954ada858b73a41fd680ea15 100644 (file)
@@ -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,33 +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.
- *
- * The @primary and @cursor planes are only relevant for legacy uAPI, see
- * &drm_crtc.primary and &drm_crtc.cursor.
- *
- * 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, ...)
+__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, va_list ap)
 {
        struct drm_mode_config *config = &dev->mode_config;
        int ret;
@@ -294,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));
@@ -342,8 +318,101 @@ 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().
+ *
+ * The @primary and @cursor planes are only relevant for legacy uAPI, see
+ * &drm_crtc.primary and &drm_crtc.cursor.
+ *
+ * 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