Commit 7221941c authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Lyude Paul <lyude@redhat.com> # nouveau
Acked-by: default avatarJyri Sarha <jyri.sarha@iki.fi>
Link: https://patchwork.freedesktop.org/patch/msgid/20220909105947.6487-2-tzimmermann@suse.de
parent ee34b77f

drivers/gpu/drm/drm_modeset_helper.c

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

drivers/gpu/drm/drm_plane.c

+0 −32
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/nouveau/dispnv04/overlay.c

+7 −6
Original line number Diff line number Diff line
@@ -296,9 +296,10 @@ nv10_overlay_init(struct drm_device *device) 
		break;

	}



	ret = drm_plane_init(device, &plane->base, 3 /* both crtc's */,

	ret = drm_universal_plane_init(device, &plane->base, 3 /* both crtc's */,

				       &nv10_plane_funcs,

			     formats, num_formats, false);

				       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;

drivers/gpu/drm/shmobile/shmob_drm_plane.c

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

}

drivers/gpu/drm/tilcdc/tilcdc_plane.c

+4 −5
Original line number Diff line number Diff line
@@ -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,

	ret = drm_universal_plane_init(dev, plane, 1, &tilcdc_plane_funcs,

				       priv->pixelformats,

				       priv->num_pixelformats,

			     true);

				       NULL, DRM_PLANE_TYPE_PRIMARY, NULL);

	if (ret) {

		dev_err(dev->dev, "Failed to initialize plane: %d\n", ret);

		return ret;