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

drm: Pass the full state to connectors atomic functions 



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.

Now that the CRTCs have been converted, let's move forward with the
connectors to provide a consistent interface.

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

@@
identifier connector, connector_state;
@@

 struct drm_connector_helper_funcs {
	...
	struct drm_encoder* (*atomic_best_encoder)(struct drm_connector *connector,
-						   struct drm_connector_state *connector_state);
+						   struct drm_atomic_state *state);
	...
}

@@
identifier connector, connector_state;
@@

 struct drm_connector_helper_funcs {
	...
	void (*atomic_commit)(struct drm_connector *connector,
-			      struct drm_connector_state *connector_state);
+			      struct drm_atomic_state *state);
	...
}

@@
struct drm_connector_helper_funcs *FUNCS;
identifier state;
identifier connector, connector_state;
identifier f;
@@

 f(..., struct drm_atomic_state *state, ...)
 {
	<+...
-	FUNCS->atomic_commit(connector, connector_state);
+	FUNCS->atomic_commit(connector, state);
	...+>
 }

@@
struct drm_connector_helper_funcs *FUNCS;
identifier state;
identifier connector, connector_state;
identifier var, f;
@@

 f(struct drm_atomic_state *state, ...)
 {
	<+...
-	var = FUNCS->atomic_best_encoder(connector, connector_state);
+	var = FUNCS->atomic_best_encoder(connector, state);
	...+>
 }

@ connector_atomic_func @
identifier helpers;
identifier func;
@@

(
static struct drm_connector_helper_funcs helpers = {
	...,
	.atomic_best_encoder = func,
	...,
};
|
static struct drm_connector_helper_funcs helpers = {
	...,
	.atomic_commit = func,
	...,
};
)

@@
identifier connector_atomic_func.func;
identifier connector;
symbol state;
@@

 func(struct drm_connector *connector,
-      struct drm_connector_state *state
+      struct drm_connector_state *connector_state
      )
 {
	...
-	state
+	connector_state
 	...
 }

@ ignores_state @
identifier connector_atomic_func.func;
identifier connector, connector_state;
@@

 func(struct drm_connector *connector,
      struct drm_connector_state *connector_state)
{
	... when != connector_state
}

@ adds_state depends on connector_atomic_func && !ignores_state @
identifier connector_atomic_func.func;
identifier connector, connector_state;
@@

 func(struct drm_connector *connector, struct drm_connector_state *connector_state)
 {
+	struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state, connector);
	...
 }

@ depends on connector_atomic_func @
identifier connector_atomic_func.func;
identifier connector_state;
identifier connector;
@@

 func(struct drm_connector *connector,
-     struct drm_connector_state *connector_state
+     struct drm_atomic_state *state
	   )
 { ... }

@ include depends on adds_state @
@@

 #include <drm/drm_atomic.h>

@ no_include depends on !include && adds_state @
@@

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

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Reviewed-by: default avatarRodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarHarry Wentland <harry.wentland@amd.com>
Cc: Leo Li <sunpeng.li@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Cc: Melissa Wen <melissa.srw@gmail.com>
Cc: Haneen Mohammed <hamohammed.sa@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201118094758.506730-1-maxime@cerno.tech
parent 22f0d898

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

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
 */



#include <linux/version.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_dp_mst_helper.h>

#include <drm/drm_dp_helper.h>
@@ -252,8 +253,10 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector) 


static struct drm_encoder *

dm_mst_atomic_best_encoder(struct drm_connector *connector,

			   struct drm_connector_state *connector_state)

			   struct drm_atomic_state *state)

{

	struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state,

											 connector);

	struct drm_device *dev = connector->dev;

	struct amdgpu_device *adev = drm_to_adev(dev);

	struct amdgpu_crtc *acrtc = to_amdgpu_crtc(connector_state->crtc);

drivers/gpu/drm/drm_atomic_helper.c

+4 −4
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, 
			continue;



		if (funcs->atomic_best_encoder)

			new_encoder = funcs->atomic_best_encoder(connector, new_conn_state);

			new_encoder = funcs->atomic_best_encoder(connector,

								 state);

		else if (funcs->best_encoder)

			new_encoder = funcs->best_encoder(connector);

		else
@@ -345,8 +346,7 @@ update_connector_routing(struct drm_atomic_state *state, 
	funcs = connector->helper_private;



	if (funcs->atomic_best_encoder)

		new_encoder = funcs->atomic_best_encoder(connector,

							 new_connector_state);

		new_encoder = funcs->atomic_best_encoder(connector, state);

	else if (funcs->best_encoder)

		new_encoder = funcs->best_encoder(connector);

	else
@@ -1313,7 +1313,7 @@ static void drm_atomic_helper_commit_writebacks(struct drm_device *dev, 


		if (new_conn_state->writeback_job && new_conn_state->writeback_job->fb) {

			WARN_ON(connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK);

			funcs->atomic_commit(connector, new_conn_state);

			funcs->atomic_commit(connector, old_state);

		}

	}

}

drivers/gpu/drm/i915/display/intel_dp_mst.c

+5 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
 *

 */



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_probe_helper.h>
@@ -719,11 +720,13 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, 
}



static struct drm_encoder *intel_mst_atomic_best_encoder(struct drm_connector *connector,

							 struct drm_connector_state *state)

							 struct drm_atomic_state *state)

{

	struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state,

											 connector);

	struct intel_connector *intel_connector = to_intel_connector(connector);

	struct intel_dp *intel_dp = intel_connector->mst_port;

	struct intel_crtc *crtc = to_intel_crtc(state->crtc);

	struct intel_crtc *crtc = to_intel_crtc(connector_state->crtc);



	return &intel_dp->mst_encoders[crtc->pipe]->base.base;

}

drivers/gpu/drm/nouveau/dispnv50/disp.c

+4 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/hdmi.h>

#include <linux/component.h>



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_dp_helper.h>

#include <drm/drm_edid.h>
@@ -1161,8 +1162,10 @@ nv50_msto_new(struct drm_device *dev, struct nv50_head *head, int id) 


static struct drm_encoder *

nv50_mstc_atomic_best_encoder(struct drm_connector *connector,

			      struct drm_connector_state *connector_state)

			      struct drm_atomic_state *state)

{

	struct drm_connector_state *connector_state = drm_atomic_get_new_connector_state(state,

											 connector);

	struct nv50_mstc *mstc = nv50_mstc(connector);

	struct drm_crtc *crtc = connector_state->crtc;

drivers/gpu/drm/vc4/vc4_txp.c

+3 −1
Original line number Diff line number Diff line
@@ -273,8 +273,10 @@ static int vc4_txp_connector_atomic_check(struct drm_connector *conn, 
}



static void vc4_txp_connector_atomic_commit(struct drm_connector *conn,

					struct drm_connector_state *conn_state)

					struct drm_atomic_state *state)

{

	struct drm_connector_state *conn_state = drm_atomic_get_new_connector_state(state,

										    conn);

	struct vc4_txp *txp = connector_to_vc4_txp(conn);

	struct drm_gem_cma_object *gem;

	struct drm_display_mode *mode;

CRA Git | Maintained and supported by SUSTech CRA and CCSE