drm: Pass 'name' to drm_universal_plane_init()

Done with coccinelle for the most part. It choked on
msm/mdp/mdp5/mdp5_plane.c like so:
"BAD:!!!!!  enum drm_plane_type type;"
No idea how to deal with that, so I just fixed that up
by hand.

Also it thinks '...' is part of the semantic patch, so I put an
'int DOTDOTDOT' placeholder in its place and got rid of it with
sed afterwards.

I didn't convert drm_plane_init() since passing the varargs through
would mean either cpp macros or va_list, and I figured we don't
care about these legacy functions enough to warrant the extra pain.

@@
typedef uint32_t;
identifier dev, plane, possible_crtcs, funcs, formats, format_count, type;
@@
 int drm_universal_plane_init(struct drm_device *dev,
                              struct drm_plane *plane,
                              unsigned long possible_crtcs,
                              const struct drm_plane_funcs *funcs,
                              const uint32_t *formats,
                              unsigned int format_count,
                              enum drm_plane_type type
+                             ,const char *name, int DOTDOTDOT
                              )
{ ... }

@@
identifier dev, plane, possible_crtcs, funcs, formats, format_count, type;
@@
 int drm_universal_plane_init(struct drm_device *dev,
                              struct drm_plane *plane,
                              unsigned long possible_crtcs,
                              const struct drm_plane_funcs *funcs,
                              const uint32_t *formats,
                              unsigned int format_count,
                              enum drm_plane_type type
+                             ,const char *name, int DOTDOTDOT
                              );

@@
expression E1, E2, E3, E4, E5, E6, E7;
@@
 drm_universal_plane_init(E1, E2, E3, E4, E5, E6, E7
+                         ,NULL
                          )

v2: Split crtc and plane changes apart
    Pass NUL for no-name instead of ""
    Leave drm_plane_init() alone
v3: Add ', or NULL...' to @name kernel doc (Jani)
    Annotate the function with __printf() attribute (Jani)

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449670795-2853-1-git-send-email-ville.syrjala@linux.intel.com

22 files changed, 43 insertions, 33 deletions

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index c3f3a7031bb1..9bdc28cf927e 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1216,7 +1216,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,
                                        &armada_primary_plane_funcs,
                                        armada_primary_formats,
                                        ARRAY_SIZE(armada_primary_formats),
-                                       DRM_PLANE_TYPE_PRIMARY);
+                                       DRM_PLANE_TYPE_PRIMARY, NULL);
         if (ret) {
                 kfree(primary);
                 return ret;
diff --git a/drivers/gpu/drm/armada/armada_overlay.c b/drivers/gpu/drm/armada/armada_overlay.c
index 5c22b380f8f3..148e8a42b2c6 100644
--- a/drivers/gpu/drm/armada/armada_overlay.c
+++ b/drivers/gpu/drm/armada/armada_overlay.c
@@ -460,7 +460,7 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)
                                        &armada_ovl_plane_funcs,
                                        armada_ovl_formats,
                                        ARRAY_SIZE(armada_ovl_formats),
-                                       DRM_PLANE_TYPE_OVERLAY);
+                                       DRM_PLANE_TYPE_OVERLAY, NULL);
         if (ret) {
                 kfree(dplane);
                 return ret;
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
index d0299aed517e..1ffe9c329c46 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
@@ -941,7 +941,7 @@ atmel_hlcdc_plane_create(struct drm_device *dev,
         ret = drm_universal_plane_init(dev, &plane->base, 0,
                                        &layer_plane_funcs,
                                        desc->formats->formats,
-                                       desc->formats->nformats, type);
+                                       desc->formats->nformats, type, NULL);
         if (ret)
                 return ERR_PTR(ret);
 
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 27922bbcde35..20d67a06efce 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1152,6 +1152,7 @@ EXPORT_SYMBOL(drm_encoder_cleanup);
  * @formats: array of supported formats (%DRM_FORMAT_*)
  * @format_count: number of elements in @formats
  * @type: type of plane (overlay, primary, cursor)
+ * @name: printf style format string for the plane name, or NULL for default name
  *
  * Initializes a plane object of type @type.
  *
@@ -1162,7 +1163,8 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane,
                              unsigned long possible_crtcs,
                              const struct drm_plane_funcs *funcs,
                              const uint32_t *formats, unsigned int format_count,
-                             enum drm_plane_type type)
+                             enum drm_plane_type type,
+                             const char *name, ...)
 {
         struct drm_mode_config *config = &dev->mode_config;
         int ret;
@@ -1242,7 +1244,7 @@ int drm_plane_init(struct drm_device *dev, struct drm_plane *plane,
 
         type = is_primary ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY;
         return drm_universal_plane_init(dev, plane, possible_crtcs, funcs,
-                                        formats, format_count, type);
+                                        formats, format_count, type, NULL);
 }
 EXPORT_SYMBOL(drm_plane_init);
 
diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index f5a4273e71b5..369d2898ff9e 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -375,7 +375,7 @@ static struct drm_plane *create_primary_plane(struct drm_device *dev)
                                        &drm_primary_helper_funcs,
                                        safe_modeset_formats,
                                        ARRAY_SIZE(safe_modeset_formats),
-                                       DRM_PLANE_TYPE_PRIMARY);
+                                       DRM_PLANE_TYPE_PRIMARY, NULL);
         if (ret) {
                 kfree(primary);
                 primary = NULL;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
index 179311760bb7..383ee1edb965 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@ -228,7 +228,7 @@ int exynos_plane_init(struct drm_device *dev,
 
         err = drm_universal_plane_init(dev, &exynos_plane->base, possible_crtcs,
                                        &exynos_plane_funcs, formats, fcount,
-                                       type);
+                                       type, NULL);
         if (err) {
                 DRM_ERROR("failed to initialize plane\n");
                 return err;
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
index 51daaea40b4d..4b13cf919575 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c
@@ -249,7 +249,7 @@ struct drm_plane *fsl_dcu_drm_primary_create_plane(struct drm_device *dev)
                                        &fsl_dcu_drm_plane_funcs,
                                        fsl_dcu_drm_plane_formats,
                                        ARRAY_SIZE(fsl_dcu_drm_plane_formats),
-                                       DRM_PLANE_TYPE_PRIMARY);
+                                       DRM_PLANE_TYPE_PRIMARY, NULL);
         if (ret) {
                 kfree(primary);
                 primary = NULL;
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 5a3370798ba3..fc0d53a4eab3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13904,7 +13904,7 @@ static struct drm_plane *intel_primary_plane_create(struct drm_device *dev,
         drm_universal_plane_init(dev, &primary->base, 0,
                                  &intel_plane_funcs,
                                  intel_primary_formats, num_formats,
-                                 DRM_PLANE_TYPE_PRIMARY);
+                                 DRM_PLANE_TYPE_PRIMARY, NULL);
 
         if (INTEL_INFO(dev)->gen >= 4)
                 intel_create_rotation_property(dev, primary);
@@ -14043,7 +14043,7 @@ static struct drm_plane *intel_cursor_plane_create(struct drm_device *dev,
                                  &intel_plane_funcs,
                                  intel_cursor_formats,
                                  ARRAY_SIZE(intel_cursor_formats),
-                                 DRM_PLANE_TYPE_CURSOR);
+                                 DRM_PLANE_TYPE_CURSOR, NULL);
 
         if (INTEL_INFO(dev)->gen >= 4) {
                 if (!dev->mode_config.rotation_property)
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index 2b96f336589e..dbf421351b5c 100644
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1123,7 +1123,7 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
         ret = drm_universal_plane_init(dev, &intel_plane->base, possible_crtcs,
                                        &intel_plane_funcs,
                                        plane_formats, num_plane_formats,
-                                       DRM_PLANE_TYPE_OVERLAY);
+                                       DRM_PLANE_TYPE_OVERLAY, NULL);
         if (ret) {
                 kfree(intel_plane);
                 goto out;
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index e2ff410bab74..591ba2f1ae03 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -401,7 +401,8 @@ struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,
 
         ret = drm_universal_plane_init(dev, &ipu_plane->base, possible_crtcs,
                                        &ipu_plane_funcs, ipu_plane_formats,
-                                       ARRAY_SIZE(ipu_plane_formats), type);
+                                       ARRAY_SIZE(ipu_plane_formats), type,
+                                       NULL);
         if (ret) {
                 DRM_ERROR("failed to initialize plane\n");
                 kfree(ipu_plane);
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c
index 30d57e74c42f..9f96dfe67769 100644
--- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c
+++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c
@@ -397,7 +397,8 @@ struct drm_plane *mdp4_plane_init(struct drm_device *dev,
 
         type = private_plane ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY;
         ret = drm_universal_plane_init(dev, plane, 0xff, &mdp4_plane_funcs,
-                                 mdp4_plane->formats, mdp4_plane->nformats, type);
+                                 mdp4_plane->formats, mdp4_plane->nformats,
+                                 type, NULL);
         if (ret)
                 goto fail;
 
diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
index 81cd49045ffc..432c09836b0e 100644
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c
@@ -904,7 +904,7 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev,
         type = private_plane ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY;
         ret = drm_universal_plane_init(dev, plane, 0xff, &mdp5_plane_funcs,
                                  mdp5_plane->formats, mdp5_plane->nformats,
-                                 type);
+                                 type, NULL);
         if (ret)
                 goto fail;
 
diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 3054bda72688..d5ecabd6c14c 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -366,7 +366,7 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
 
         ret = drm_universal_plane_init(dev, plane, (1 << priv->num_crtcs) - 1,
                                        &omap_plane_funcs, omap_plane->formats,
-                                       omap_plane->nformats, type);
+                                       omap_plane->nformats, type, NULL);
         if (ret < 0)
                 goto error;
 
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
index ffa583712cd9..c3ed9522c0e1 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c
@@ -410,7 +410,8 @@ int rcar_du_planes_init(struct rcar_du_group *rgrp)
 
                 ret = drm_universal_plane_init(rcdu->ddev, &plane->plane, crtcs,
                                                &rcar_du_plane_funcs, formats,
-                                               ARRAY_SIZE(formats), type);
+                                               ARRAY_SIZE(formats), type,
+                                               NULL);
                 if (ret < 0)
                         return ret;
 
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index 8e89e80ec906..dd8e0860ad4e 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1478,7 +1478,7 @@ static int vop_create_crtc(struct vop *vop)
                                                0, &vop_plane_funcs,
                                                win_data->phy->data_formats,
                                                win_data->phy->nformats,
-                                               win_data->type);
+                                               win_data->type, NULL);
                 if (ret) {
                         DRM_ERROR("failed to initialize plane\n");
                         goto err_cleanup_planes;
@@ -1515,7 +1515,7 @@ static int vop_create_crtc(struct vop *vop)
                                                &vop_plane_funcs,
                                                win_data->phy->data_formats,
                                                win_data->phy->nformats,
-                                               win_data->type);
+                                               win_data->type, NULL);
                 if (ret) {
                         DRM_ERROR("failed to initialize overlay plane\n");
                         goto err_cleanup_crtc;
diff --git a/drivers/gpu/drm/sti/sti_cursor.c b/drivers/gpu/drm/sti/sti_cursor.c
index dd1032195051..807863106b8d 100644
--- a/drivers/gpu/drm/sti/sti_cursor.c
+++ b/drivers/gpu/drm/sti/sti_cursor.c
@@ -272,7 +272,7 @@ struct drm_plane *sti_cursor_create(struct drm_device *drm_dev,
                                        &sti_plane_helpers_funcs,
                                        cursor_supported_formats,
                                        ARRAY_SIZE(cursor_supported_formats),
-                                       DRM_PLANE_TYPE_CURSOR);
+                                       DRM_PLANE_TYPE_CURSOR, NULL);
         if (res) {
                 DRM_ERROR("Failed to initialize universal plane\n");
                 goto err_plane;
diff --git a/drivers/gpu/drm/sti/sti_gdp.c b/drivers/gpu/drm/sti/sti_gdp.c
index c85dc7d6b005..f9a1d92c9d95 100644
--- a/drivers/gpu/drm/sti/sti_gdp.c
+++ b/drivers/gpu/drm/sti/sti_gdp.c
@@ -630,7 +630,7 @@ struct drm_plane *sti_gdp_create(struct drm_device *drm_dev,
                                        &sti_plane_helpers_funcs,
                                        gdp_supported_formats,
                                        ARRAY_SIZE(gdp_supported_formats),
-                                       type);
+                                       type, NULL);
         if (res) {
                 DRM_ERROR("Failed to initialize universal plane\n");
                 goto err;
diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c
index ea0690bc77d5..43861b52261d 100644
--- a/drivers/gpu/drm/sti/sti_hqvdp.c
+++ b/drivers/gpu/drm/sti/sti_hqvdp.c
@@ -973,7 +973,7 @@ static struct drm_plane *sti_hqvdp_create(struct drm_device *drm_dev,
                                        &sti_plane_helpers_funcs,
                                        hqvdp_supported_formats,
                                        ARRAY_SIZE(hqvdp_supported_formats),
-                                       DRM_PLANE_TYPE_OVERLAY);
+                                       DRM_PLANE_TYPE_OVERLAY, NULL);
         if (res) {
                 DRM_ERROR("Failed to initialize universal plane\n");
                 return NULL;
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index be894103fa49..1f5cb68357c7 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -660,7 +660,8 @@ static struct drm_plane *tegra_dc_primary_plane_create(struct drm_device *drm,
 
         err = drm_universal_plane_init(drm, &plane->base, possible_crtcs,
                                        &tegra_primary_plane_funcs, formats,
-                                       num_formats, DRM_PLANE_TYPE_PRIMARY);
+                                       num_formats, DRM_PLANE_TYPE_PRIMARY,
+                                       NULL);
         if (err < 0) {
                 kfree(plane);
                 return ERR_PTR(err);
@@ -827,7 +828,8 @@ static struct drm_plane *tegra_dc_cursor_plane_create(struct drm_device *drm,
 
         err = drm_universal_plane_init(drm, &plane->base, 1 << dc->pipe,
                                        &tegra_cursor_plane_funcs, formats,
-                                       num_formats, DRM_PLANE_TYPE_CURSOR);
+                                       num_formats, DRM_PLANE_TYPE_CURSOR,
+                                       NULL);
         if (err < 0) {
                 kfree(plane);
                 return ERR_PTR(err);
@@ -890,7 +892,8 @@ static struct drm_plane *tegra_dc_overlay_plane_create(struct drm_device *drm,
 
         err = drm_universal_plane_init(drm, &plane->base, 1 << dc->pipe,
                                        &tegra_overlay_plane_funcs, formats,
-                                       num_formats, DRM_PLANE_TYPE_OVERLAY);
+                                       num_formats, DRM_PLANE_TYPE_OVERLAY,
+                                       NULL);
         if (err < 0) {
                 kfree(plane);
                 return ERR_PTR(err);
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 887f3caad0be..f34c422733dc 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -317,7 +317,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev,
         ret = drm_universal_plane_init(dev, plane, 0xff,
                                        &vc4_plane_funcs,
                                        formats, ARRAY_SIZE(formats),
-                                       type);
+                                       type, NULL);
 
         drm_plane_helper_add(plane, &vc4_plane_helper_funcs);
 
diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c
index 4a74129c5708..572fb351feab 100644
--- a/drivers/gpu/drm/virtio/virtgpu_plane.c
+++ b/drivers/gpu/drm/virtio/virtgpu_plane.c
@@ -107,7 +107,7 @@ struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev,
                                        &virtio_gpu_plane_funcs,
                                        virtio_gpu_formats,
                                        ARRAY_SIZE(virtio_gpu_formats),
-                                       DRM_PLANE_TYPE_PRIMARY);
+                                       DRM_PLANE_TYPE_PRIMARY, NULL);
         if (ret)
                 goto err_plane_init;
 
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index f0127e7b0ee2..a6f0e25cbd51 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -2214,13 +2214,15 @@ static inline bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
         return !!(encoder->possible_crtcs & drm_crtc_mask(crtc));
 }
 
-extern int drm_universal_plane_init(struct drm_device *dev,
-                                    struct drm_plane *plane,
-                                    unsigned long possible_crtcs,
-                                    const struct drm_plane_funcs *funcs,
-                                    const uint32_t *formats,
-                                    unsigned int format_count,
-                                    enum drm_plane_type type);
+extern __printf(8, 9)
+int drm_universal_plane_init(struct drm_device *dev,
+                             struct drm_plane *plane,
+                             unsigned long possible_crtcs,
+                             const struct drm_plane_funcs *funcs,
+                             const uint32_t *formats,
+                             unsigned int format_count,
+                             enum drm_plane_type type,
+                             const char *name, ...);
 extern int drm_plane_init(struct drm_device *dev,
                           struct drm_plane *plane,
                           unsigned long possible_crtcs,