Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0b3b795 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1449670795-2853-1-git-send-email-ville.syrjala@linux.intel.com
parent f9882876

drivers/gpu/drm/armada/armada_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/armada/armada_overlay.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/drm_crtc.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/drm_plane_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -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;