Unverified Commit 29b77ad7 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/atomic: Pass the full state to CRTC 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 start convert all the remaining helpers to provide a consistent
interface, starting with the CRTC's atomic_check.

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

virtual report

@@
struct drm_crtc_helper_funcs *FUNCS;
struct drm_crtc *crtc;
struct drm_crtc_state *crtc_state;
identifier dev, state;
identifier ret, f;
@@

 f(struct drm_device *dev, struct drm_atomic_state *state)
 {
	<...
-	ret = FUNCS->atomic_check(crtc, crtc_state);
+	ret = FUNCS->atomic_check(crtc, state);
	...>
 }

@@
identifier crtc, new_state;
@@

 struct drm_crtc_helper_funcs {
 	...
-	int (*atomic_check)(struct drm_crtc *crtc, struct drm_crtc_state *new_state);
+	int (*atomic_check)(struct drm_crtc *crtc, struct drm_atomic_state *state);
 	...
}

@ crtc_atomic_func @
identifier helpers;
identifier func;
@@

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

@ ignores_new_state @
identifier crtc_atomic_func.func;
identifier crtc, new_state;
@@

 int func(struct drm_crtc *crtc,
		struct drm_crtc_state *new_state)
 {
	... when != new_state
 }

@ adds_new_state depends on crtc_atomic_func && !ignores_new_state @
identifier crtc_atomic_func.func;
identifier crtc, new_state;
@@

 int func(struct drm_crtc *crtc, struct drm_crtc_state *new_state)
 {
+	struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc);
 	...
 }

@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
expression E;
type T;
@@

 int func(...)
 {
	...
-	T state = E;
+	T crtc_state = E;
 	<+...
-	state
+	crtc_state
 	...+>
 }

@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
type T;
@@

 int func(...)
 {
 	...
-	T state;
+	T crtc_state;
 	<+...
-	state
+	crtc_state
 	...+>
 }

@ depends on crtc_atomic_func @
identifier crtc_atomic_func.func;
identifier new_state;
identifier crtc;
@@

 int func(struct drm_crtc *crtc,
-	       struct drm_crtc_state *new_state
+	       struct drm_atomic_state *state
	       )
 { ... }

@@
identifier new_state;
identifier crtc;
@@

 int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
-                             struct drm_crtc_state *new_state
+                             struct drm_atomic_state *state
               )
 {
+       struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc);
	...
 }

@@
identifier new_state;
identifier crtc;
@@

 int vmw_du_crtc_atomic_check(struct drm_crtc *crtc,
-                             struct drm_crtc_state *new_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/...>

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-maxime@cerno.tech
parent 95f4f40a

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

+8 −6
Original line number Diff line number Diff line
@@ -5514,17 +5514,19 @@ static void dm_update_crtc_active_planes(struct drm_crtc *crtc, 
}



static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,

				       struct drm_crtc_state *state)

				       struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct amdgpu_device *adev = drm_to_adev(crtc->dev);

	struct dc *dc = adev->dm.dc;

	struct dm_crtc_state *dm_crtc_state = to_dm_crtc_state(state);

	struct dm_crtc_state *dm_crtc_state = to_dm_crtc_state(crtc_state);

	int ret = -EINVAL;



	dm_update_crtc_active_planes(crtc, state);

	dm_update_crtc_active_planes(crtc, crtc_state);



	if (unlikely(!dm_crtc_state->stream &&

		     modeset_required(state, NULL, dm_crtc_state->stream))) {

		     modeset_required(crtc_state, NULL, dm_crtc_state->stream))) {

		WARN_ON(1);

		return ret;

	}
@@ -5535,8 +5537,8 @@ static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc, 
	 * planes are disabled, which is not supported by the hardware. And there is legacy

	 * userspace which stops using the HW cursor altogether in response to the resulting EINVAL.

	 */

	if (state->enable &&

	    !(state->plane_mask & drm_plane_mask(crtc->primary)))

	if (crtc_state->enable &&

	    !(crtc_state->plane_mask & drm_plane_mask(crtc->primary)))

		return -EINVAL;



	/* In some use cases, like reset, no stream is attached */

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

+6 −4
Original line number Diff line number Diff line
@@ -74,16 +74,18 @@ static void komeda_crtc_update_clock_ratio(struct komeda_crtc_state *kcrtc_st) 
 */

static int

komeda_crtc_atomic_check(struct drm_crtc *crtc,

			 struct drm_crtc_state *state)

			 struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct komeda_crtc *kcrtc = to_kcrtc(crtc);

	struct komeda_crtc_state *kcrtc_st = to_kcrtc_st(state);

	struct komeda_crtc_state *kcrtc_st = to_kcrtc_st(crtc_state);

	int err;



	if (drm_atomic_crtc_needs_modeset(state))

	if (drm_atomic_crtc_needs_modeset(crtc_state))

		komeda_crtc_update_clock_ratio(kcrtc_st);



	if (state->active) {

	if (crtc_state->active) {

		err = komeda_build_display_data_flow(kcrtc, kcrtc_st);

		if (err)

			return err;

drivers/gpu/drm/arm/malidp_crtc.c

+11 −9
Original line number Diff line number Diff line
@@ -337,8 +337,10 @@ mclk_calc: 
}



static int malidp_crtc_atomic_check(struct drm_crtc *crtc,

				    struct drm_crtc_state *state)

				    struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct malidp_drm *malidp = crtc_to_malidp_device(crtc);

	struct malidp_hw_device *hwdev = malidp->dev;

	struct drm_plane *plane;
@@ -373,7 +375,7 @@ static int malidp_crtc_atomic_check(struct drm_crtc *crtc, 
	 */



	/* first count the number of rotated planes */

	drm_atomic_crtc_state_for_each_plane_state(plane, pstate, state) {

	drm_atomic_crtc_state_for_each_plane_state(plane, pstate, crtc_state) {

		struct drm_framebuffer *fb = pstate->fb;



		if ((pstate->rotation & MALIDP_ROTATED_MASK) || fb->modifier)
@@ -389,7 +391,7 @@ static int malidp_crtc_atomic_check(struct drm_crtc *crtc, 
		rot_mem_free += hwdev->rotation_memory[1];



	/* now validate the rotation memory requirements */

	drm_atomic_crtc_state_for_each_plane_state(plane, pstate, state) {

	drm_atomic_crtc_state_for_each_plane_state(plane, pstate, crtc_state) {

		struct malidp_plane *mp = to_malidp_plane(plane);

		struct malidp_plane_state *ms = to_malidp_plane_state(pstate);

		struct drm_framebuffer *fb = pstate->fb;
@@ -417,18 +419,18 @@ static int malidp_crtc_atomic_check(struct drm_crtc *crtc, 
	}



	/* If only the writeback routing has changed, we don't need a modeset */

	if (state->connectors_changed) {

	if (crtc_state->connectors_changed) {

		u32 old_mask = crtc->state->connector_mask;

		u32 new_mask = state->connector_mask;

		u32 new_mask = crtc_state->connector_mask;



		if ((old_mask ^ new_mask) ==

		    (1 << drm_connector_index(&malidp->mw_connector.base)))

			state->connectors_changed = false;

			crtc_state->connectors_changed = false;

	}



	ret = malidp_crtc_atomic_check_gamma(crtc, state);

	ret = ret ? ret : malidp_crtc_atomic_check_ctm(crtc, state);

	ret = ret ? ret : malidp_crtc_atomic_check_scaling(crtc, state);

	ret = malidp_crtc_atomic_check_gamma(crtc, crtc_state);

	ret = ret ? ret : malidp_crtc_atomic_check_ctm(crtc, crtc_state);

	ret = ret ? ret : malidp_crtc_atomic_check_scaling(crtc, crtc_state);



	return ret;

}

drivers/gpu/drm/armada/armada_crtc.c

+6 −4
Original line number Diff line number Diff line
@@ -413,15 +413,17 @@ static void armada_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) 
}



static int armada_drm_crtc_atomic_check(struct drm_crtc *crtc,

					struct drm_crtc_state *state)

					struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);



	if (state->gamma_lut && drm_color_lut_size(state->gamma_lut) != 256)

	if (crtc_state->gamma_lut && drm_color_lut_size(crtc_state->gamma_lut) != 256)

		return -EINVAL;



	if (state->color_mgmt_changed)

		state->planes_changed = true;

	if (crtc_state->color_mgmt_changed)

		crtc_state->planes_changed = true;



	return 0;

}

drivers/gpu/drm/ast/ast_mode.c

+7 −5
Original line number Diff line number Diff line
@@ -751,24 +751,26 @@ static void ast_crtc_dpms(struct drm_crtc *crtc, int mode) 
}



static int ast_crtc_helper_atomic_check(struct drm_crtc *crtc,

					struct drm_crtc_state *state)

					struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct drm_device *dev = crtc->dev;

	struct ast_crtc_state *ast_state;

	const struct drm_format_info *format;

	bool succ;



	if (!state->enable)

	if (!crtc_state->enable)

		return 0; /* no mode checks if CRTC is being disabled */



	ast_state = to_ast_crtc_state(state);

	ast_state = to_ast_crtc_state(crtc_state);



	format = ast_state->format;

	if (drm_WARN_ON_ONCE(dev, !format))

		return -EINVAL; /* BUG: We didn't set format in primary check(). */



	succ = ast_get_vbios_mode_info(format, &state->mode,

				       &state->adjusted_mode,

	succ = ast_get_vbios_mode_info(format, &crtc_state->mode,

				       &crtc_state->adjusted_mode,

				       &ast_state->vbios_mode_info);

	if (!succ)

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE