Unverified Commit 77c5fb12 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/vc4: plane: Take possible_crtcs as an argument 



vc4_plane_init() currently initialises the plane with no possible CRTCs,
and will expect the caller to set it up by itself.

Let's change that logic a bit to follow the syntax of
drm_universal_plane_init() and pass the possible CRTCs bitmask as an
argument to the function instead.

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-18-maxime@cerno.tech
parent 398e7cea

drivers/gpu/drm/vc4/vc4_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -1244,7 +1244,7 @@ int vc4_crtc_init(struct drm_device *drm, struct vc4_crtc *vc4_crtc, 
	 * requirement of the plane configuration, and reject ones

	 * that will take too much.

	 */

	primary_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_PRIMARY);

	primary_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_PRIMARY, 0);

	if (IS_ERR(primary_plane)) {

		dev_err(drm->dev, "failed to construct primary plane\n");

		return PTR_ERR(primary_plane);

drivers/gpu/drm/vc4/vc4_drv.h

+2 −1
Original line number Diff line number Diff line
@@ -960,7 +960,8 @@ int vc4_kms_load(struct drm_device *dev); 


/* vc4_plane.c */

struct drm_plane *vc4_plane_init(struct drm_device *dev,

				 enum drm_plane_type type);

				 enum drm_plane_type type,

				 uint32_t possible_crtcs);

int vc4_plane_create_additional_planes(struct drm_device *dev);

u32 vc4_plane_write_dlist(struct drm_plane *plane, u32 __iomem *dlist);

u32 vc4_plane_dlist_size(const struct drm_plane_state *state);

drivers/gpu/drm/vc4/vc4_plane.c

+7 −8
Original line number Diff line number Diff line
@@ -1492,7 +1492,8 @@ static const struct drm_plane_funcs vc4_plane_funcs = { 
};



struct drm_plane *vc4_plane_init(struct drm_device *dev,

				 enum drm_plane_type type)

				 enum drm_plane_type type,

				 uint32_t possible_crtcs)

{

	struct vc4_dev *vc4 = to_vc4_dev(dev);

	struct drm_plane *plane = NULL;
@@ -1523,7 +1524,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev, 
	}



	plane = &vc4_plane->base;

	ret = drm_universal_plane_init(dev, plane, 0,

	ret = drm_universal_plane_init(dev, plane, possible_crtcs,

				       &vc4_plane_funcs,

				       formats, num_formats,

				       modifiers, type, NULL);
@@ -1575,13 +1576,11 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) 
	 */

	for (i = 0; i < 16; i++) {

		struct drm_plane *plane =

			vc4_plane_init(drm, DRM_PLANE_TYPE_OVERLAY);

			vc4_plane_init(drm, DRM_PLANE_TYPE_OVERLAY,

				       GENMASK(drm->mode_config.num_crtc - 1, 0));



		if (IS_ERR(plane))

			continue;



		plane->possible_crtcs =

			GENMASK(drm->mode_config.num_crtc - 1, 0);

	}



	drm_for_each_crtc(crtc, drm) {
@@ -1589,9 +1588,9 @@ int vc4_plane_create_additional_planes(struct drm_device *drm) 
		 * since we overlay planes on the CRTC in the order they were

		 * initialized.

		 */

		cursor_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_CURSOR);

		cursor_plane = vc4_plane_init(drm, DRM_PLANE_TYPE_CURSOR,

					      drm_crtc_mask(crtc));

		if (!IS_ERR(cursor_plane)) {

			cursor_plane->possible_crtcs = drm_crtc_mask(crtc);

			crtc->cursor = cursor_plane;

		}

	}