Unverified Commit 37418bf1 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm: Use state helper instead of the plane state pointer 



Many drivers reference the plane->state pointer in order to get the
current plane state in their atomic_update or atomic_disable hooks,
which would be the new plane state in the global atomic state since
_swap_state happened when those hooks are run.

Use the drm_atomic_get_new_plane_state helper to get that state to make it
more obvious.

This was made using the coccinelle script below:

@ plane_atomic_func @
identifier helpers;
identifier func;
@@

(
 static const struct drm_plane_helper_funcs helpers = {
 	...,
 	.atomic_disable = func,
	...,
 };
|
 static const struct drm_plane_helper_funcs helpers = {
 	...,
 	.atomic_update = func,
	...,
 };
)

@ adds_new_state @
identifier plane_atomic_func.func;
identifier plane, state;
identifier new_state;
@@

 func(struct drm_plane *plane, struct drm_atomic_state *state)
 {
 	...
-	struct drm_plane_state *new_state = plane->state;
+	struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state, plane);
	...
 }

@ 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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/r/20210219120032.260676-1-maxime@cerno.tech
parent 977697e2

drivers/gpu/drm/arc/arcpgu_crtc.c

+3 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com)

 */



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_device.h>

#include <drm/drm_fb_cma_helper.h>
@@ -147,7 +148,8 @@ 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_atomic_state *state)

{

	struct drm_plane_state *new_plane_state = plane->state;

	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,

										 plane);

	struct arcpgu_drm_private *arcpgu;

	struct drm_gem_cma_object *gem;

drivers/gpu/drm/arm/hdlcd_crtc.c

+2 −1
Original line number Diff line number Diff line
@@ -262,7 +262,8 @@ static int hdlcd_plane_atomic_check(struct drm_plane *plane, 
static void hdlcd_plane_atomic_update(struct drm_plane *plane,

				      struct drm_atomic_state *state)

{

	struct drm_plane_state *new_plane_state = plane->state;

	struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state,

										 plane);

	struct drm_framebuffer *fb = new_plane_state->fb;

	struct hdlcd_drm_private *hdlcd;

	u32 dest_h;

drivers/gpu/drm/arm/malidp_planes.c

+2 −1
Original line number Diff line number Diff line
@@ -797,7 +797,8 @@ static void malidp_de_plane_update(struct drm_plane *plane, 
									   plane);

	struct malidp_plane *mp;

	struct malidp_plane_state *ms = to_malidp_plane_state(plane->state);

	struct drm_plane_state *new_state = plane->state;

	struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state,

									   plane);

	u16 pixel_alpha = new_state->pixel_blend_mode;

	u8 plane_alpha = new_state->alpha >> 8;

	u32 src_w, src_h, dest_w, dest_h, val;

drivers/gpu/drm/armada/armada_overlay.c

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ static void armada_drm_overlay_plane_atomic_update(struct drm_plane *plane, 
{

	struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,

									   plane);

	struct drm_plane_state *new_state = plane->state;

	struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state,

									   plane);

	struct armada_crtc *dcrtc;

	struct armada_regs *regs;

	unsigned int idx;

drivers/gpu/drm/armada/armada_plane.c

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ static void armada_drm_primary_plane_atomic_update(struct drm_plane *plane, 
{

	struct drm_plane_state *old_state = drm_atomic_get_old_plane_state(state,

									   plane);

	struct drm_plane_state *new_state = plane->state;

	struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state,

									   plane);

	struct armada_crtc *dcrtc;

	struct armada_regs *regs;

	u32 cfg, cfg_mask, val;