Unverified Commit 7c11b99a authored Feb 19, 2021 by Maxime Ripard

drm/atomic: Pass the full state to planes atomic_check



The current atomic helpers have either their object state being passed as
an argument or the full atomic state.

The former is the pattern that was done at first, before switching to the
latter for new hooks or when it was needed.

Let's convert all the remaining helpers to provide a consistent
interface, starting with the planes atomic_check.

The conversion was done using the coccinelle script below plus some
manual changes for vmwgfx, built tested on all the drivers.

@@
identifier plane, plane_state;
symbol state;
@@

 struct drm_plane_helper_funcs {
 	...
	int (*atomic_check)(struct drm_plane *plane,
-			    struct drm_plane_state *plane_state);
+			    struct drm_atomic_state *state);
	...
}

@ plane_atomic_func @
identifier helpers;
identifier func;
@@

static const struct drm_plane_helper_funcs helpers = {
	...,
 	.atomic_check = func,
	...,
};

@@
struct drm_plane_helper_funcs *FUNCS;
identifier f;
identifier dev;
identifier plane, plane_state, state;
@@

 f(struct drm_device *dev, struct drm_atomic_state *state)
 {
 	<+...
-	FUNCS->atomic_check(plane, plane_state)
+	FUNCS->atomic_check(plane, state)
 	...+>
 }

@ ignores_new_state @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@

 func(struct drm_plane *plane, struct drm_plane_state *new_plane_state)
 {
	... when != new_plane_state
 }

@ adds_new_state depends on plane_atomic_func && !ignores_new_state @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@

 func(struct drm_plane *plane, struct drm_plane_state *new_plane_state)
 {
+	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane);
 	...
 }

@ depends on plane_atomic_func @
identifier plane_atomic_func.func;
identifier plane, new_plane_state;
@@

 func(struct drm_plane *plane,
-     struct drm_plane_state *new_plane_state
+     struct drm_atomic_state *state
     )
 { ... }

@ include depends on adds_new_state @
@@

 #include <drm/drm_atomic.h>

@ no_include depends on !include && adds_new_state @
@@

+ #include <drm/drm_atomic.h>
  #include <drm/...>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-4-maxime@cerno.tech

parent 6af70eb3

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -6432,8 +6432,10 @@ static int dm_plane_helper_check_state(struct drm_plane_state *state,
		}

		static int dm_plane_atomic_check(struct drm_plane *plane,
		struct drm_plane_state *new_plane_state)
		struct drm_atomic_state *state)
		{
		struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
		plane);
		struct amdgpu_device *adev = drm_to_adev(plane->dev);
		struct dc *dc = adev->dm.dc;
		struct dm_plane_state *dm_plane_state;

drivers/gpu/drm/arm/display/komeda/komeda_plane.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -69,8 +69,10 @@ komeda_plane_init_data_flow(struct drm_plane_state *st,
		*/
		static int
		komeda_plane_atomic_check(struct drm_plane *plane,
		struct drm_plane_state *new_plane_state)
		struct drm_atomic_state *state)
		{
		struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
		plane);
		struct komeda_plane *kplane = to_kplane(plane);
		struct komeda_plane_state *kplane_st = to_kplane_st(new_plane_state);
		struct komeda_layer *layer = kplane->layer;

drivers/gpu/drm/arm/hdlcd_crtc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -229,8 +229,10 @@ static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = {
		};

		static int hdlcd_plane_atomic_check(struct drm_plane *plane,
		struct drm_plane_state *new_plane_state)
		struct drm_atomic_state *state)
		{
		struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
		plane);
		int i;
		struct drm_crtc *crtc;
		struct drm_crtc_state *crtc_state;

drivers/gpu/drm/arm/malidp_planes.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -502,8 +502,10 @@ static void malidp_de_prefetch_settings(struct malidp_plane *mp,
		}

		static int malidp_de_plane_check(struct drm_plane *plane,
		struct drm_plane_state *new_plane_state)
		struct drm_atomic_state *state)
		{
		struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
		plane);
		struct malidp_plane *mp = to_malidp_plane(plane);
		struct malidp_plane_state *ms = to_malidp_plane_state(new_plane_state);
		bool rotated = new_plane_state->rotation & MALIDP_ROTATED_MASK;

drivers/gpu/drm/armada/armada_plane.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -106,8 +106,10 @@ void armada_drm_plane_cleanup_fb(struct drm_plane *plane,
		}

		int armada_drm_plane_atomic_check(struct drm_plane *plane,
		struct drm_plane_state *new_plane_state)
		struct drm_atomic_state *state)
		{
		struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,
		plane);
		struct armada_plane_state *st = to_armada_plane_state(new_plane_state);
		struct drm_crtc *crtc = new_plane_state->crtc;
		struct drm_crtc_state *crtc_state;