Unverified Commit 977697e2 authored Feb 19, 2021 by Maxime Ripard

drm/atomic: Pass the full state to planes atomic disable and update



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 the remaining helpers to provide a consistent interface,
this time with the planes atomic_update and atomic_disable.

The conversion was done using the coccinelle script below, built tested on
all the drivers.

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

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

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

 struct drm_plane_helper_funcs {
	...
	void (*atomic_disable)(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_update = func,
	...,
 };
|
 static const struct drm_plane_helper_funcs helpers = {
 	...,
 	.atomic_disable = func,
	...,
 };
)

@@
struct drm_plane_helper_funcs *FUNCS;
identifier f;
identifier crtc_state;
identifier plane, plane_state, state;
expression e;
@@

 f(struct drm_crtc_state *crtc_state)
 {
 	...
 	struct drm_atomic_state *state = e;
 	<+...
(
-	FUNCS->atomic_disable(plane, plane_state)
+	FUNCS->atomic_disable(plane, state)
|
-	FUNCS->atomic_update(plane, plane_state)
+	FUNCS->atomic_update(plane, state)
)
 	...+>
 }

@@
identifier plane_atomic_func.func;
identifier plane;
symbol state;
@@

 func(struct drm_plane *plane,
-    struct drm_plane_state *state)
+    struct drm_plane_state *old_plane_state)
 {
	<...
-	state
+	old_plane_state
	...>
 }

@ ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, old_state;
@@

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

@ adds_old_state depends on plane_atomic_func && !ignores_old_state @
identifier plane_atomic_func.func;
identifier plane, plane_state;
@@

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

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

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

@ include depends on adds_old_state @
@@

 #include <drm/drm_atomic.h>

@ no_include depends on !include && adds_old_state @
@@

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

@@
identifier plane_atomic_func.func;
identifier plane, state;
identifier plane_state;
@@

 func(struct drm_plane *plane, struct drm_atomic_state *state) {
 	...
 	struct drm_plane_state *plane_state = drm_atomic_get_old_plane_state(state, plane);
 	<+...
-	plane_state->state
+	state
 	...+>
 }

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-9-maxime@cerno.tech

parent 41016fe1

drivers/gpu/drm/arc/arcpgu_crtc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ static const struct drm_crtc_helper_funcs arc_pgu_crtc_helper_funcs = {
		};

		static void arc_pgu_plane_atomic_update(struct drm_plane *plane,
		struct drm_plane_state *state)
		struct drm_atomic_state *state)
		{
		struct drm_plane_state *new_plane_state = plane->state;
		struct arcpgu_drm_private *arcpgu;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,7 @@ komeda_plane_atomic_check(struct drm_plane *plane,
		*/
		static void
		komeda_plane_atomic_update(struct drm_plane *plane,
		struct drm_plane_state *old_state)
		struct drm_atomic_state *state)
		{
		}

drivers/gpu/drm/arm/hdlcd_crtc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -260,7 +260,7 @@ static int hdlcd_plane_atomic_check(struct drm_plane *plane,
		}

		static void hdlcd_plane_atomic_update(struct drm_plane *plane,
		struct drm_plane_state *state)
		struct drm_atomic_state *state)
		{
		struct drm_plane_state *new_plane_state = plane->state;
		struct drm_framebuffer *fb = new_plane_state->fb;

drivers/gpu/drm/arm/malidp_planes.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -791,8 +791,10 @@ static void malidp_de_set_plane_afbc(struct drm_plane *plane)
		}

		static void malidp_de_plane_update(struct drm_plane *plane,
		struct drm_plane_state *old_state)
		struct drm_atomic_state *state)
		{
		struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,
		plane);
		struct malidp_plane *mp;
		struct malidp_plane_state *ms = to_malidp_plane_state(plane->state);
		struct drm_plane_state *new_state = plane->state;
		@@ -909,7 +911,7 @@ static void malidp_de_plane_update(struct drm_plane *plane,
		}

		static void malidp_de_plane_disable(struct drm_plane *plane,
		struct drm_plane_state *state)
		struct drm_atomic_state *state)
		{
		struct malidp_plane *mp = to_malidp_plane(plane);

drivers/gpu/drm/armada/armada_overlay.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -66,8 +66,10 @@ static inline u32 armada_csc(struct drm_plane_state *state)

		/* === Plane support === */
		static void armada_drm_overlay_plane_atomic_update(struct drm_plane *plane,
		struct drm_plane_state *old_state)
		struct drm_atomic_state *state)
		{
		struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,
		plane);
		struct drm_plane_state *new_state = plane->state;
		struct armada_crtc *dcrtc;
		struct armada_regs *regs;
		@@ -214,8 +216,10 @@ static void armada_drm_overlay_plane_atomic_update(struct drm_plane *plane,
		}

		static void armada_drm_overlay_plane_atomic_disable(struct drm_plane *plane,
		struct drm_plane_state *old_state)
		struct drm_atomic_state *state)
		{
		struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,
		plane);
		struct armada_crtc *dcrtc;
		struct armada_regs *regs;
		unsigned int idx = 0;