Unverified Commit 9872c7a3 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: plane: Switch to drmm_universal_plane_alloc() 



Let's switch to drmm_universal_plane_alloc() for our plane allocation and
initialisation to make the driver a bit simpler.

Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220711173939.1132294-20-maxime@cerno.tech
parent 02792a93

drivers/gpu/drm/vc4/vc4_crtc.c

+0 −1
Original line number Diff line number Diff line
@@ -1282,7 +1282,6 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data) 
	const struct vc4_pv_data *pv_data;

	struct vc4_crtc *vc4_crtc;

	struct drm_crtc *crtc;

	struct drm_plane *destroy_plane, *temp;

	int ret;



	vc4_crtc = devm_kzalloc(dev, sizeof(*vc4_crtc), GFP_KERNEL);

drivers/gpu/drm/vc4/vc4_plane.c

+8 −15
Original line number Diff line number Diff line
@@ -1483,8 +1483,6 @@ static bool vc4_format_mod_supported(struct drm_plane *plane, 
static const struct drm_plane_funcs vc4_plane_funcs = {

	.update_plane = drm_atomic_helper_update_plane,

	.disable_plane = drm_atomic_helper_disable_plane,

	.destroy = drm_plane_cleanup,

	.set_property = NULL,

	.reset = vc4_plane_reset,

	.atomic_duplicate_state = vc4_plane_duplicate_state,

	.atomic_destroy_state = vc4_plane_destroy_state,
@@ -1496,11 +1494,10 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, 
				 uint32_t possible_crtcs)

{

	struct vc4_dev *vc4 = to_vc4_dev(dev);

	struct drm_plane *plane = NULL;

	struct drm_plane *plane;

	struct vc4_plane *vc4_plane;

	u32 formats[ARRAY_SIZE(hvs_formats)];

	int num_formats = 0;

	int ret = 0;

	unsigned i;

	static const uint64_t modifiers[] = {

		DRM_FORMAT_MOD_BROADCOM_VC4_T_TILED,
@@ -1511,11 +1508,6 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, 
		DRM_FORMAT_MOD_INVALID

	};



	vc4_plane = devm_kzalloc(dev->dev, sizeof(*vc4_plane),

				 GFP_KERNEL);

	if (!vc4_plane)

		return ERR_PTR(-ENOMEM);



	for (i = 0; i < ARRAY_SIZE(hvs_formats); i++) {

		if (!hvs_formats[i].hvs5_only || vc4->is_vc5) {

			formats[num_formats] = hvs_formats[i].drm;
@@ -1523,13 +1515,14 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, 
		}

	}



	plane = &vc4_plane->base;

	ret = drm_universal_plane_init(dev, plane, possible_crtcs,

	vc4_plane = drmm_universal_plane_alloc(dev, struct vc4_plane, base,

					       possible_crtcs,

					       &vc4_plane_funcs,

					       formats, num_formats,

					       modifiers, type, NULL);

	if (ret)

		return ERR_PTR(ret);

	if (IS_ERR(vc4_plane))

		return ERR_CAST(vc4_plane);

	plane = &vc4_plane->base;



	if (vc4->is_vc5)

		drm_plane_helper_add(plane, &vc5_plane_helper_funcs);