Unverified Commit 351f950d authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/atomic: Pass the full state to CRTC atomic enable/disable 



If the CRTC driver ever needs to access the full DRM state, it can't do so
at atomic_enable / atomic_disable time since drm_atomic_helper_swap_state
will have cleared the pointer from the struct drm_crtc_state to the struct
drm_atomic_state before calling those hooks.

In order to allow that, let's pass the full DRM state to atomic_enable and
atomic_disable. 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;
identifier dev, state;
identifier crtc, crtc_state;
@@

 disable_outputs(struct drm_device *dev, struct drm_atomic_state *state)
 {
 	<...
-	FUNCS->atomic_disable(crtc, crtc_state);
+	FUNCS->atomic_disable(crtc, state);
 	...>
 }

@@
struct drm_crtc_helper_funcs *FUNCS;
identifier dev, state;
identifier crtc, crtc_state;
@@

 drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, struct drm_atomic_state *state)
 {
 	<...
-	FUNCS->atomic_enable(crtc, crtc_state);
+	FUNCS->atomic_enable(crtc, state);
 	...>
 }

@@
identifier crtc, old_state;
@@

 struct drm_crtc_helper_funcs {
	...
-	void (*atomic_enable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+	void (*atomic_enable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
	...
-	void (*atomic_disable)(struct drm_crtc *crtc, struct drm_crtc_state *old_state);
+	void (*atomic_disable)(struct drm_crtc *crtc, struct drm_atomic_state *state);
	...
}

@ crtc_atomic_func @
identifier helpers;
identifier func;
@@

(
static struct drm_crtc_helper_funcs helpers = {
	...,
	.atomic_enable = func,
	...,
};
|
static struct drm_crtc_helper_funcs helpers = {
	...,
	.atomic_disable = func,
	...,
};
)

@ ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@

void func(struct drm_crtc *crtc,
		struct drm_crtc_state *old_state)
{
	... when != old_state
}

@ adds_old_state depends on crtc_atomic_func && !ignores_old_state @
identifier crtc_atomic_func.func;
identifier crtc, old_state;
@@

void func(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{
+	struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc);
	...
}

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

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

}

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

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

}

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

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

@ include depends on adds_old_state @
@@

 #include <drm/drm_atomic.h>

@ no_include depends on !include && adds_old_state @
@@

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

Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef142a0c13f7870.1602161031.git-series.maxime@cerno.tech
parent c76eb355

drivers/gpu/drm/arc/arcpgu_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void arc_pgu_crtc_mode_set_nofb(struct drm_crtc *crtc) 
}



static void arc_pgu_crtc_atomic_enable(struct drm_crtc *crtc,

				       struct drm_crtc_state *old_state)

				       struct drm_atomic_state *state)

{

	struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
@@ -127,7 +127,7 @@ static void arc_pgu_crtc_atomic_enable(struct drm_crtc *crtc, 
}



static void arc_pgu_crtc_atomic_disable(struct drm_crtc *crtc,

					struct drm_crtc_state *old_state)

					struct drm_atomic_state *state)

{

	struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);

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

+6 −2
Original line number Diff line number Diff line
@@ -273,8 +273,10 @@ komeda_crtc_do_flush(struct drm_crtc *crtc, 


static void

komeda_crtc_atomic_enable(struct drm_crtc *crtc,

			  struct drm_crtc_state *old)

			  struct drm_atomic_state *state)

{

	struct drm_crtc_state *old = drm_atomic_get_old_crtc_state(state,

								   crtc);

	pm_runtime_get_sync(crtc->dev->dev);

	komeda_crtc_prepare(to_kcrtc(crtc));

	drm_crtc_vblank_on(crtc);
@@ -319,8 +321,10 @@ komeda_crtc_flush_and_wait_for_flip_done(struct komeda_crtc *kcrtc, 


static void

komeda_crtc_atomic_disable(struct drm_crtc *crtc,

			   struct drm_crtc_state *old)

			   struct drm_atomic_state *state)

{

	struct drm_crtc_state *old = drm_atomic_get_old_crtc_state(state,

								   crtc);

	struct komeda_crtc *kcrtc = to_kcrtc(crtc);

	struct komeda_crtc_state *old_st = to_kcrtc_st(old);

	struct komeda_pipeline *master = kcrtc->master;

drivers/gpu/drm/arm/hdlcd_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) 
}



static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,

				     struct drm_crtc_state *old_state)

				     struct drm_atomic_state *state)

{

	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
@@ -179,7 +179,7 @@ static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc, 
}



static void hdlcd_crtc_atomic_disable(struct drm_crtc *crtc,

				      struct drm_crtc_state *old_state)

				      struct drm_atomic_state *state)

{

	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);

drivers/gpu/drm/arm/malidp_crtc.c

+4 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static enum drm_mode_status malidp_crtc_mode_valid(struct drm_crtc *crtc, 
}



static void malidp_crtc_atomic_enable(struct drm_crtc *crtc,

				      struct drm_crtc_state *old_state)

				      struct drm_atomic_state *state)

{

	struct malidp_drm *malidp = crtc_to_malidp_device(crtc);

	struct malidp_hw_device *hwdev = malidp->dev;
@@ -70,8 +70,10 @@ static void malidp_crtc_atomic_enable(struct drm_crtc *crtc, 
}



static void malidp_crtc_atomic_disable(struct drm_crtc *crtc,

				       struct drm_crtc_state *old_state)

				       struct drm_atomic_state *state)

{

	struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,

									 crtc);

	struct malidp_drm *malidp = crtc_to_malidp_device(crtc);

	struct malidp_hw_device *hwdev = malidp->dev;

	int err;

drivers/gpu/drm/armada/armada_crtc.c

+6 −2
Original line number Diff line number Diff line
@@ -467,8 +467,10 @@ static void armada_drm_crtc_atomic_flush(struct drm_crtc *crtc, 
}



static void armada_drm_crtc_atomic_disable(struct drm_crtc *crtc,

					   struct drm_crtc_state *old_state)

					   struct drm_atomic_state *state)

{

	struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,

									 crtc);

	struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);

	struct drm_pending_vblank_event *event;
@@ -503,8 +505,10 @@ static void armada_drm_crtc_atomic_disable(struct drm_crtc *crtc, 
}



static void armada_drm_crtc_atomic_enable(struct drm_crtc *crtc,

					  struct drm_crtc_state *old_state)

					  struct drm_atomic_state *state)

{

	struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state,

									 crtc);

	struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);



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