mirror_ubuntu-kernels/drivers/gpu/drm/mediatek
Maxime Ripard 351f950db4
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: Maxime Ripard <maxime@cerno.tech>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef142a0c13f7870.1602161031.git-series.maxime@cerno.tech
2020-10-09 09:55:59 +02:00
..
Kconfig drm/mediatek: Fix Kconfig warning 2020-06-27 08:58:21 +08:00
Makefile Mediatek DRM Next for Linux 5.6 2020-01-15 16:40:19 +10:00
mtk_cec.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 2019-05-30 11:26:41 -07:00
mtk_cec.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 2019-05-30 11:26:41 -07:00
mtk_disp_color.c drm/mediatek: Omit warning on probe defers 2020-04-13 13:01:16 +02:00
mtk_disp_ovl.c drm/mediatek: Omit warning on probe defers 2020-04-13 13:01:16 +02:00
mtk_disp_rdma.c drm/mediatek: Omit warning on probe defers 2020-04-13 13:01:16 +02:00
mtk_dpi_regs.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 2019-05-30 11:26:41 -07:00
mtk_dpi.c ARM/SoC: drivers for v5.7 2020-06-04 19:56:20 -07:00
mtk_drm_crtc.c drm/atomic: Pass the full state to CRTC atomic enable/disable 2020-10-09 09:55:59 +02:00
mtk_drm_crtc.h drm/mediatek: update cursors by using async atomic update 2019-12-20 16:19:11 +08:00
mtk_drm_ddp_comp.c drm/mediatek: Handle component type MTK_DISP_OVL_2L correctly 2020-02-25 13:02:22 +08:00
mtk_drm_ddp_comp.h drm/mediatek: Add ctm property support 2020-01-10 14:10:30 +08:00
mtk_drm_ddp.c soc / drm: mediatek: Move routing control to mmsys device 2020-04-13 13:01:16 +02:00
mtk_drm_ddp.h soc / drm: mediatek: Move routing control to mmsys device 2020-04-13 13:01:16 +02:00
mtk_drm_drv.c drm/mediatek: Introduce GEM object functions 2020-09-25 09:21:00 +02:00
mtk_drm_drv.h soc / drm: mediatek: Move routing control to mmsys device 2020-04-13 13:01:16 +02:00
mtk_drm_gem.c drm/mediatek: Introduce GEM object functions 2020-09-25 09:21:00 +02:00
mtk_drm_gem.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 2019-05-30 11:26:41 -07:00
mtk_drm_plane.c drm/mediatek: Check plane visibility in atomic_update 2020-06-27 10:08:03 +08:00
mtk_drm_plane.h drm/mediatek: update cursors by using async atomic update 2019-12-20 16:19:11 +08:00
mtk_dsi.c drm/mediatek: mtk_dsi: Create connector for bridges 2020-07-05 08:06:28 +08:00
mtk_hdmi_ddc.c treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 2019-05-30 11:26:41 -07:00
mtk_hdmi_phy.c drm/mediatek: no change parent rate in round_rate() for MT2701 hdmi phy 2019-04-09 17:47:01 +08:00
mtk_hdmi_phy.h drm/mediatek: no change parent rate in round_rate() for MT2701 hdmi phy 2019-04-09 17:47:01 +08:00
mtk_hdmi_regs.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 2019-05-30 11:26:41 -07:00
mtk_hdmi.c sound updates for 5.9 2020-08-06 14:27:31 -07:00
mtk_hdmi.h treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 174 2019-05-30 11:26:41 -07:00
mtk_mipi_tx.c drm/mediatek: config mipitx impedance with calibration data 2020-04-22 07:10:36 +08:00
mtk_mipi_tx.h drm/mediatek: config mipitx impedance with calibration data 2020-04-22 07:10:36 +08:00
mtk_mt2701_hdmi_phy.c drm/mediatek: no change parent rate in round_rate() for MT2701 hdmi phy 2019-04-09 17:47:01 +08:00
mtk_mt8173_hdmi_phy.c drm/mediatek: mtk_hdmi: Remove debug messages for function calls 2020-07-05 06:39:21 +08:00
mtk_mt8173_mipi_tx.c drm/mediatek: separate mipi_tx to different file 2019-10-07 12:29:37 +08:00
mtk_mt8183_mipi_tx.c drm/mediatek: config mipitx impedance with calibration data 2020-04-22 07:10:36 +08:00