drm/plane: Remove drm_plane_init()

Open-code drm_plane_init() and remove the function from DRM. The
implementation of drm_plane_init() is a simple wrapper around a call
to drm_universal_plane_init(), so drivers can just use that instead.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Lyude Paul <lyude@redhat.com> # nouveau
Acked-by: Jyri Sarha <jyri.sarha@iki.fi>
Link: https://patchwork.freedesktop.org/patch/msgid/20220909105947.6487-2-tzimmermann@suse.de

diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_modeset_helper.c
index bd609a9788481cfc15013ae097d75aef42f4f721..611dd01fb6048788366beebb88b874bf5b68d65d 100644 (file)
--- a/drivers/gpu/drm/drm_modeset_helper.c
+++ b/drivers/gpu/drm/drm_modeset_helper.c
@@ -100,8 +100,7 @@ EXPORT_SYMBOL(drm_helper_mode_fill_fb_struct);
  * This is the minimal list of formats that seem to be safe for modeset use
  * with all current DRM drivers.  Most hardware can actually support more
  * formats than this and drivers may specify a more accurate list when
- * creating the primary plane.  However drivers that still call
- * drm_plane_init() will use this minimal format list as the default.
+ * creating the primary plane.
  */
 static const uint32_t safe_modeset_formats[] = {
        DRM_FORMAT_XRGB8888,

diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 726f2f163c269f9f4d6a7c5d47294a1514e60ef3..0f14b4d3bb1097783d767d93bfd632c02739d914 100644 (file)
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -482,38 +482,6 @@ void drm_plane_unregister_all(struct drm_device *dev)
        }
 }
 
-/**
- * drm_plane_init - Initialize a legacy plane
- * @dev: DRM device
- * @plane: plane object to init
- * @possible_crtcs: bitmask of possible CRTCs
- * @funcs: callbacks for the new plane
- * @formats: array of supported formats (DRM_FORMAT\_\*)
- * @format_count: number of elements in @formats
- * @is_primary: plane type (primary vs overlay)
- *
- * Legacy API to initialize a DRM plane.
- *
- * New drivers should call drm_universal_plane_init() instead.
- *
- * Returns:
- * Zero on success, error code on failure.
- */
-int drm_plane_init(struct drm_device *dev, struct drm_plane *plane,
-                  uint32_t possible_crtcs,
-                  const struct drm_plane_funcs *funcs,
-                  const uint32_t *formats, unsigned int format_count,
-                  bool is_primary)
-{
-       enum drm_plane_type type;
-
-       type = is_primary ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY;
-       return drm_universal_plane_init(dev, plane, possible_crtcs, funcs,
-                                       formats, format_count,
-                                       NULL, type, NULL);
-}
-EXPORT_SYMBOL(drm_plane_init);
-
 /**
  * drm_plane_cleanup - Clean up the core plane usage
  * @plane: plane to cleanup

diff --git a/drivers/gpu/drm/nouveau/dispnv04/overlay.c b/drivers/gpu/drm/nouveau/dispnv04/overlay.c
index 37e63e98cd08afbaf1b980ff456db43a98c75d50..33f29736024a547a8d9c689e9d594c5029b1857f 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/overlay.c
@@ -296,9 +296,10 @@ nv10_overlay_init(struct drm_device *device)
                break;
        }
 
-       ret = drm_plane_init(device, &plane->base, 3 /* both crtc's */,
-                            &nv10_plane_funcs,
-                            formats, num_formats, false);
+       ret = drm_universal_plane_init(device, &plane->base, 3 /* both crtc's */,
+                                      &nv10_plane_funcs,
+                                      formats, num_formats, NULL,
+                                      DRM_PLANE_TYPE_OVERLAY, NULL);
        if (ret)
                goto err;
 
@@ -475,9 +476,9 @@ nv04_overlay_init(struct drm_device *device)
        if (!plane)
                return;
 
-       ret = drm_plane_init(device, &plane->base, 1 /* single crtc */,
-                            &nv04_plane_funcs,
-                            formats, 2, false);
+       ret = drm_universal_plane_init(device, &plane->base, 1 /* single crtc */,
+                                      &nv04_plane_funcs, formats, 2, NULL,
+                                      DRM_PLANE_TYPE_OVERLAY, NULL);
        if (ret)
                goto err;
 

diff --git a/drivers/gpu/drm/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/shmobile/shmob_drm_plane.c
index 54228424793a7edc5fc019420d82ff9175505907..6c5f0cbe7d95b94cb37bd0639929bde5f5577ed6 100644 (file)
--- a/drivers/gpu/drm/shmobile/shmob_drm_plane.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_plane.c
@@ -252,9 +252,10 @@ int shmob_drm_plane_create(struct shmob_drm_device *sdev, unsigned int index)
        splane->index = index;
        splane->alpha = 255;
 
-       ret = drm_plane_init(sdev->ddev, &splane->plane, 1,
-                            &shmob_drm_plane_funcs, formats,
-                            ARRAY_SIZE(formats), false);
+       ret = drm_universal_plane_init(sdev->ddev, &splane->plane, 1,
+                                      &shmob_drm_plane_funcs,
+                                      formats, ARRAY_SIZE(formats), NULL,
+                                      DRM_PLANE_TYPE_OVERLAY, NULL);
 
        return ret;
 }

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
index 0ccf791301cbdade6bf349cf0b9cfb5e79ff5504..cf77a8ce7398040814ec20eeffc6da960e36dfc0 100644 (file)
--- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c
@@ -105,11 +105,10 @@ int tilcdc_plane_init(struct drm_device *dev,
        struct tilcdc_drm_private *priv = dev->dev_private;
        int ret;
 
-       ret = drm_plane_init(dev, plane, 1,
-                            &tilcdc_plane_funcs,
-                            priv->pixelformats,
-                            priv->num_pixelformats,
-                            true);
+       ret = drm_universal_plane_init(dev, plane, 1, &tilcdc_plane_funcs,
+                                      priv->pixelformats,
+                                      priv->num_pixelformats,
+                                      NULL, DRM_PLANE_TYPE_PRIMARY, NULL);
        if (ret) {
                dev_err(dev->dev, "Failed to initialize plane: %d\n", ret);
                return ret;

diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index 89ea54652e87457a9033c30ab71f0a3d6a0c7d33..910cb941f3d525aad06e6309e9447693b6111ec6 100644 (file)
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -631,7 +631,7 @@ struct drm_plane {
        unsigned int format_count;
        /**
         * @format_default: driver hasn't supplied supported formats for the
-        * plane. Used by the drm_plane_init compatibility wrapper only.
+        * plane. Used by the non-atomic driver compatibility wrapper only.
         */
        bool format_default;
 
@@ -762,12 +762,6 @@ int drm_universal_plane_init(struct drm_device *dev,
                             const uint64_t *format_modifiers,
                             enum drm_plane_type type,
                             const char *name, ...);
-int drm_plane_init(struct drm_device *dev,
-                  struct drm_plane *plane,
-                  uint32_t possible_crtcs,
-                  const struct drm_plane_funcs *funcs,
-                  const uint32_t *formats, unsigned int format_count,
-                  bool is_primary);
 void drm_plane_cleanup(struct drm_plane *plane);
 
 __printf(10, 11)