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

drm: Use the state pointer directly in 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 CRTC state.

This was done using the following coccinelle script:

@ crtc_atomic_func @
identifier helpers;
identifier func;
@@

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

@@
identifier crtc_atomic_func.func;
identifier crtc, state;
@@

  func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
  ...
- struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
  ... when != crtc_state
- crtc_state->state
+ state
  ...
 }

@@
struct drm_crtc_state *crtc_state;
identifier crtc_atomic_func.func;
identifier crtc, state;
@@

  func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
  ...
- crtc_state->state
+ state
  ...
 }

Suggested-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201102133834.1176740-3-maxime@cerno.tech
parent 3fd98868

drivers/gpu/drm/drm_simple_kms_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int drm_simple_kms_crtc_check(struct drm_crtc *crtc, 
	if (has_primary != crtc_state->enable)

		return -EINVAL;



	return drm_atomic_add_affected_planes(crtc_state->state, crtc);

	return drm_atomic_add_affected_planes(state, crtc);

}



static void drm_simple_kms_crtc_enable(struct drm_crtc *crtc,

drivers/gpu/drm/mxsfb/mxsfb_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int mxsfb_crtc_atomic_check(struct drm_crtc *crtc, 
		return -EINVAL;



	/* TODO: Is this needed ? */

	return drm_atomic_add_affected_planes(crtc_state->state, crtc);

	return drm_atomic_add_affected_planes(state, crtc);

}



static void mxsfb_crtc_atomic_flush(struct drm_crtc *crtc,

drivers/gpu/drm/omapdrm/omap_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static int omap_crtc_atomic_check(struct drm_crtc *crtc, 
			return -EINVAL;

	}



	pri_state = drm_atomic_get_new_plane_state(crtc_state->state,

	pri_state = drm_atomic_get_new_plane_state(state,

						   crtc->primary);

	if (pri_state) {

		struct omap_crtc_state *omap_crtc_state =

drivers/gpu/drm/tilcdc/tilcdc_crtc.c

+3 −3
Original line number Diff line number Diff line
@@ -665,9 +665,9 @@ static int tilcdc_crtc_atomic_check(struct drm_crtc *crtc, 
	if (!crtc_state->active)

		return 0;



	if (crtc_state->state->planes[0].ptr != crtc->primary ||

	    crtc_state->state->planes[0].state == NULL ||

	    crtc_state->state->planes[0].state->crtc != crtc) {

	if (state->planes[0].ptr != crtc->primary ||

	    state->planes[0].state == NULL ||

	    state->planes[0].state->crtc != crtc) {

		dev_dbg(crtc->dev->dev, "CRTC primary plane must be present");

		return -EINVAL;

	}

drivers/gpu/drm/vc4/vc4_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc, 
	if (ret)

		return ret;



	for_each_new_connector_in_state(crtc_state->state, conn, conn_state,

	for_each_new_connector_in_state(state, conn, conn_state,

					i) {

		if (conn_state->crtc != crtc)

			continue;

CRA Git | Maintained and supported by SUSTech CRA and CCSE