Unverified Commit dec92020 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm: Use the state pointer directly in planes atomic_check 



Now that atomic_check takes the global atomic state as a parameter, we
don't need to go through the pointer in the plane state.

This was done using the following coccinelle script:

@ plane_atomic_func @
identifier helpers;
identifier func;
@@

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

@@
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_new_plane_state(state, plane);
  <... when != plane_state
- plane_state->state
+ state
  ...>
 }

@@
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_new_plane_state(state, plane);
  <...
- plane_state->state
+ state
  ...>
 }

Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210219120032.260676-5-maxime@cerno.tech
parent 7c11b99a

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

+1 −1
Original line number Diff line number Diff line
@@ -6451,7 +6451,7 @@ static int dm_plane_atomic_check(struct drm_plane *plane, 
		return 0;



	new_crtc_state =

		drm_atomic_get_new_crtc_state(new_plane_state->state,

		drm_atomic_get_new_crtc_state(state,

					      new_plane_state->crtc);

	if (!new_crtc_state)

		return -EINVAL;

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

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ komeda_plane_atomic_check(struct drm_plane *plane, 
	if (!new_plane_state->crtc || !new_plane_state->fb)

		return 0;



	crtc_st = drm_atomic_get_crtc_state(new_plane_state->state,

	crtc_st = drm_atomic_get_crtc_state(state,

					    new_plane_state->crtc);

	if (IS_ERR(crtc_st) || !crtc_st->enable) {

		DRM_DEBUG_ATOMIC("Cannot update plane on a disabled CRTC.\n");

drivers/gpu/drm/arm/hdlcd_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static int hdlcd_plane_atomic_check(struct drm_plane *plane, 
		return -EINVAL;

	}



	for_each_new_crtc_in_state(new_plane_state->state, crtc, crtc_state,

	for_each_new_crtc_in_state(state, crtc, crtc_state,

				   i) {

		/* we cannot disable the plane while the CRTC is active */

		if (!new_plane_state->fb && crtc_state->active)

drivers/gpu/drm/armada/armada_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ int armada_drm_plane_atomic_check(struct drm_plane *plane, 
		return 0;

	}



	if (new_plane_state->state)

		crtc_state = drm_atomic_get_existing_crtc_state(new_plane_state->state,

	if (state)

		crtc_state = drm_atomic_get_existing_crtc_state(state,

								crtc);

	else

		crtc_state = crtc->state;

drivers/gpu/drm/ast/ast_mode.c

+2 −2
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static int ast_primary_plane_helper_atomic_check(struct drm_plane *plane, 
	if (!new_plane_state->crtc)

		return 0;



	crtc_state = drm_atomic_get_new_crtc_state(new_plane_state->state,

	crtc_state = drm_atomic_get_new_crtc_state(state,

						   new_plane_state->crtc);



	ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state,
@@ -769,7 +769,7 @@ static int ast_cursor_plane_helper_atomic_check(struct drm_plane *plane, 
	if (!new_plane_state->crtc)

		return 0;



	crtc_state = drm_atomic_get_new_crtc_state(new_plane_state->state,

	crtc_state = drm_atomic_get_new_crtc_state(state,

						   new_plane_state->crtc);



	ret = drm_atomic_helper_check_plane_state(new_plane_state, crtc_state,