On Mon, 26 Aug 2019 17:26:29 +0200 Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx> wrote: > We are about to add a drm_bridge_state that inherits from > drm_private_state which is defined in drm_atomic.h. Problem is, > drm_atomic.h includes drm_crtc.h which in turn includes drm_bridge.h, > leading to "drm_private_state has incomplete type" error. > > Let's force all users of the drm_bridge API to explicitly include > drm_bridge.h. > > Signed-off-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx> > Reviewed-by: Sam Ravnborg <sam@xxxxxxxxxxxx> Queued to drm-misc-next. > --- > Changes in v2: > * Fix inclusion order (Sam Ravnog) > * Add Sam's R-b > --- > drivers/gpu/drm/arc/arcpgu_hdmi.c | 1 + > drivers/gpu/drm/bridge/analogix-anx78xx.c | 1 + > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 + > drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 + > drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 + > drivers/gpu/drm/bridge/nxp-ptn3460.c | 1 + > drivers/gpu/drm/bridge/panel.c | 1 + > drivers/gpu/drm/bridge/parade-ps8622.c | 1 + > drivers/gpu/drm/bridge/sii902x.c | 1 + > drivers/gpu/drm/bridge/sii9234.c | 1 + > drivers/gpu/drm/bridge/sil-sii8620.c | 1 + > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 1 + > drivers/gpu/drm/bridge/tc358764.c | 1 + > drivers/gpu/drm/bridge/tc358767.c | 1 + > drivers/gpu/drm/bridge/ti-sn65dsi86.c | 1 + > drivers/gpu/drm/bridge/ti-tfp410.c | 1 + > drivers/gpu/drm/drm_atomic_helper.c | 1 + > drivers/gpu/drm/drm_crtc_helper.c | 1 + > drivers/gpu/drm/drm_encoder.c | 1 + > drivers/gpu/drm/drm_probe_helper.c | 1 + > drivers/gpu/drm/drm_simple_kms_helper.c | 1 + > drivers/gpu/drm/exynos/exynos_dp.c | 1 + > drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 + > drivers/gpu/drm/exynos/exynos_drm_mic.c | 1 + > drivers/gpu/drm/exynos/exynos_hdmi.c | 1 + > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 + > drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 1 + > drivers/gpu/drm/i2c/tda998x_drv.c | 1 + > drivers/gpu/drm/imx/imx-ldb.c | 1 + > drivers/gpu/drm/imx/parallel-display.c | 1 + > drivers/gpu/drm/ingenic/ingenic-drm.c | 1 + > drivers/gpu/drm/mediatek/mtk_dpi.c | 1 + > drivers/gpu/drm/mediatek/mtk_dsi.c | 1 + > drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 + > drivers/gpu/drm/msm/dsi/dsi.h | 1 + > drivers/gpu/drm/msm/edp/edp.h | 1 + > drivers/gpu/drm/msm/hdmi/hdmi.h | 2 ++ > drivers/gpu/drm/omapdrm/dss/output.c | 1 + > drivers/gpu/drm/omapdrm/omap_drv.c | 1 + > drivers/gpu/drm/omapdrm/omap_encoder.c | 1 + > drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 1 + > drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 + > drivers/gpu/drm/rockchip/rockchip_rgb.c | 1 + > drivers/gpu/drm/sti/sti_dvo.c | 1 + > drivers/gpu/drm/sti/sti_hda.c | 1 + > drivers/gpu/drm/sti/sti_hdmi.c | 1 + > drivers/gpu/drm/sun4i/sun4i_lvds.c | 1 + > drivers/gpu/drm/sun4i/sun4i_rgb.c | 1 + > drivers/gpu/drm/sun4i/sun4i_tcon.c | 1 + > drivers/gpu/drm/tilcdc/tilcdc_external.c | 1 + > drivers/gpu/drm/vc4/vc4_dsi.c | 1 + > include/drm/drm_crtc.h | 1 - > 52 files changed, 52 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/arc/arcpgu_hdmi.c b/drivers/gpu/drm/arc/arcpgu_hdmi.c > index 98aac743cc26..8fd7094beece 100644 > --- a/drivers/gpu/drm/arc/arcpgu_hdmi.c > +++ b/drivers/gpu/drm/arc/arcpgu_hdmi.c > @@ -5,6 +5,7 @@ > * Copyright (C) 2016 Synopsys, Inc. (www.synopsys.com) > */ > > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_encoder.h> > #include <drm/drm_device.h> > diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c > index 3c7cc5af735c..e3f4fd2a5ad4 100644 > --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c > +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c > @@ -19,6 +19,7 @@ > #include <linux/types.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_dp_helper.h> > #include <drm/drm_edid.h> > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > index 22885dceaa17..bb411fe52ae8 100644 > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c > @@ -21,6 +21,7 @@ > #include <drm/bridge/analogix_dp.h> > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_device.h> > #include <drm/drm_panel.h> > diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c > index 7aa789c35882..cc33dc411b9e 100644 > --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c > +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c > @@ -12,6 +12,7 @@ > #include <linux/regulator/consumer.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_print.h> > #include <drm/drm_probe_helper.h> > diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c > index 6e81e5db57f2..e8a49f6146c6 100644 > --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c > +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c > @@ -25,6 +25,7 @@ > > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_edid.h> > #include <drm/drm_print.h> > #include <drm/drm_probe_helper.h> > diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c > index d4a1cc5052c3..57ff01339559 100644 > --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c > +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c > @@ -11,6 +11,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_edid.h> > #include <drm/drm_of.h> > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c > index b12ae3a4c5f1..6cffeb4a42f2 100644 > --- a/drivers/gpu/drm/bridge/panel.c > +++ b/drivers/gpu/drm/bridge/panel.c > @@ -5,6 +5,7 @@ > */ > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_connector.h> > #include <drm/drm_encoder.h> > #include <drm/drm_modeset_helper_vtables.h> > diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c > index 93c68e2e9484..b7a72dfdcac3 100644 > --- a/drivers/gpu/drm/bridge/parade-ps8622.c > +++ b/drivers/gpu/drm/bridge/parade-ps8622.c > @@ -17,6 +17,7 @@ > #include <linux/regulator/consumer.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_of.h> > #include <drm/drm_panel.h> > diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c > index 38f75ac580df..b70e8c5cf2e1 100644 > --- a/drivers/gpu/drm/bridge/sii902x.c > +++ b/drivers/gpu/drm/bridge/sii902x.c > @@ -20,6 +20,7 @@ > #include <linux/clk.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_drv.h> > #include <drm/drm_edid.h> > #include <drm/drm_print.h> > diff --git a/drivers/gpu/drm/bridge/sii9234.c b/drivers/gpu/drm/bridge/sii9234.c > index 25d4ad8c7ad6..ad00d841ed9e 100644 > --- a/drivers/gpu/drm/bridge/sii9234.c > +++ b/drivers/gpu/drm/bridge/sii9234.c > @@ -13,6 +13,7 @@ > * Dharam Kumar <dharam.kr@xxxxxxxxxxx> > */ > #include <drm/bridge/mhl.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_edid.h> > > diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c > index bd3165ee5354..14643923a721 100644 > --- a/drivers/gpu/drm/bridge/sil-sii8620.c > +++ b/drivers/gpu/drm/bridge/sil-sii8620.c > @@ -9,6 +9,7 @@ > #include <asm/unaligned.h> > > #include <drm/bridge/mhl.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_edid.h> > #include <drm/drm_encoder.h> > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > index 355877f0ad7a..bd65d0479683 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > @@ -26,6 +26,7 @@ > > #include <drm/bridge/dw_hdmi.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_edid.h> > #include <drm/drm_encoder_slave.h> > #include <drm/drm_of.h> > diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc358764.c > index 170f162ffa55..db298f550a5a 100644 > --- a/drivers/gpu/drm/bridge/tc358764.c > +++ b/drivers/gpu/drm/bridge/tc358764.c > @@ -16,6 +16,7 @@ > #include <video/mipi_display.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_fb_helper.h> > #include <drm/drm_mipi_dsi.h> > diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c > index cebc8e620820..51664a2df731 100644 > --- a/drivers/gpu/drm/bridge/tc358767.c > +++ b/drivers/gpu/drm/bridge/tc358767.c > @@ -26,6 +26,7 @@ > #include <linux/slab.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_dp_helper.h> > #include <drm/drm_edid.h> > #include <drm/drm_of.h> > diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c > index 0a580957c8cf..43abf01ebd4c 100644 > --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c > +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c > @@ -17,6 +17,7 @@ > > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_dp_helper.h> > #include <drm/drm_mipi_dsi.h> > #include <drm/drm_of.h> > diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c > index 61cc2354ef1b..aa3198dc9903 100644 > --- a/drivers/gpu/drm/bridge/ti-tfp410.c > +++ b/drivers/gpu/drm/bridge/ti-tfp410.c > @@ -14,6 +14,7 @@ > #include <linux/platform_device.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_print.h> > #include <drm/drm_probe_helper.h> > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index aa16ea17ff9b..4706439fb490 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -30,6 +30,7 @@ > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_atomic_uapi.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_damage_helper.h> > #include <drm/drm_device.h> > #include <drm/drm_plane_helper.h> > diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c > index 6dd49a60deac..fa3694836c22 100644 > --- a/drivers/gpu/drm/drm_crtc_helper.c > +++ b/drivers/gpu/drm/drm_crtc_helper.c > @@ -36,6 +36,7 @@ > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_atomic_uapi.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_drv.h> > diff --git a/drivers/gpu/drm/drm_encoder.c b/drivers/gpu/drm/drm_encoder.c > index 7fb47b7b8b44..80d88a55302e 100644 > --- a/drivers/gpu/drm/drm_encoder.c > +++ b/drivers/gpu/drm/drm_encoder.c > @@ -22,6 +22,7 @@ > > #include <linux/export.h> > > +#include <drm/drm_bridge.h> > #include <drm/drm_device.h> > #include <drm/drm_drv.h> > #include <drm/drm_encoder.h> > diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c > index ef2c468205a2..351cbc40f0f8 100644 > --- a/drivers/gpu/drm/drm_probe_helper.c > +++ b/drivers/gpu/drm/drm_probe_helper.c > @@ -32,6 +32,7 @@ > #include <linux/export.h> > #include <linux/moduleparam.h> > > +#include <drm/drm_bridge.h> > #include <drm/drm_client.h> > #include <drm/drm_crtc.h> > #include <drm/drm_edid.h> > diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c > index b11910f14c46..046055719245 100644 > --- a/drivers/gpu/drm/drm_simple_kms_helper.c > +++ b/drivers/gpu/drm/drm_simple_kms_helper.c > @@ -8,6 +8,7 @@ > > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_plane_helper.h> > #include <drm/drm_probe_helper.h> > #include <drm/drm_simple_kms_helper.h> > diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c > index 3a0f0ba8c63a..1e6aa24bf45e 100644 > --- a/drivers/gpu/drm/exynos/exynos_dp.c > +++ b/drivers/gpu/drm/exynos/exynos_dp.c > @@ -19,6 +19,7 @@ > > #include <drm/bridge/analogix_dp.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_of.h> > #include <drm/drm_panel.h> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c > index 6926cee91b36..72726f2c7a9f 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c > @@ -24,6 +24,7 @@ > #include <video/videomode.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_fb_helper.h> > #include <drm/drm_mipi_dsi.h> > #include <drm/drm_panel.h> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_mic.c b/drivers/gpu/drm/exynos/exynos_drm_mic.c > index b78e8c5ba553..f41d75923557 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_mic.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_mic.c > @@ -21,6 +21,7 @@ > #include <video/of_videomode.h> > #include <video/videomode.h> > > +#include <drm/drm_bridge.h> > #include <drm/drm_encoder.h> > #include <drm/drm_print.h> > > diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c > index bc1565f1822a..2e3795c2c794 100644 > --- a/drivers/gpu/drm/exynos/exynos_hdmi.c > +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c > @@ -34,6 +34,7 @@ > #include <media/cec-notifier.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_edid.h> > #include <drm/drm_print.h> > #include <drm/drm_probe_helper.h> > diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c > index a92fd6c70b09..82c972e9c024 100644 > --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c > +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c > @@ -9,6 +9,7 @@ > #include <linux/of_graph.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_of.h> > #include <drm/drm_panel.h> > #include <drm/drm_probe_helper.h> > diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c > index 5bf8138941de..bdcf9c6ae9e9 100644 > --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c > +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c > @@ -18,6 +18,7 @@ > #include <linux/platform_device.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_device.h> > #include <drm/drm_encoder_slave.h> > #include <drm/drm_mipi_dsi.h> > diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c > index 84c6d4c91c65..6c218bace2ce 100644 > --- a/drivers/gpu/drm/i2c/tda998x_drv.c > +++ b/drivers/gpu/drm/i2c/tda998x_drv.c > @@ -14,6 +14,7 @@ > #include <sound/hdmi-codec.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_edid.h> > #include <drm/drm_of.h> > #include <drm/drm_print.h> > diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c > index 695f307f36b2..208069faf183 100644 > --- a/drivers/gpu/drm/imx/imx-ldb.c > +++ b/drivers/gpu/drm/imx/imx-ldb.c > @@ -20,6 +20,7 @@ > > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_fb_helper.h> > #include <drm/drm_of.h> > #include <drm/drm_panel.h> > diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c > index e7ce17503ae1..35518e5de356 100644 > --- a/drivers/gpu/drm/imx/parallel-display.c > +++ b/drivers/gpu/drm/imx/parallel-display.c > @@ -13,6 +13,7 @@ > #include <video/of_display_timing.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_fb_helper.h> > #include <drm/drm_of.h> > #include <drm/drm_panel.h> > diff --git a/drivers/gpu/drm/ingenic/ingenic-drm.c b/drivers/gpu/drm/ingenic/ingenic-drm.c > index ce1fae3a78a9..1daa1378fc36 100644 > --- a/drivers/gpu/drm/ingenic/ingenic-drm.c > +++ b/drivers/gpu/drm/ingenic/ingenic-drm.c > @@ -13,6 +13,7 @@ > > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_drv.h> > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c > index be6d95c5ff25..01fa8b8d763d 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c > @@ -17,6 +17,7 @@ > #include <video/videomode.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_of.h> > > diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c > index 224afb666881..a413f5ff442d 100644 > --- a/drivers/gpu/drm/mediatek/mtk_dsi.c > +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c > @@ -16,6 +16,7 @@ > #include <video/videomode.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_mipi_dsi.h> > #include <drm/drm_of.h> > #include <drm/drm_panel.h> > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c > index ce91b61364eb..c79b1f855d89 100644 > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c > @@ -23,6 +23,7 @@ > #include <sound/hdmi-codec.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_edid.h> > #include <drm/drm_print.h> > diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h > index 0da8a4e428ad..eff1a4c61258 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi.h > +++ b/drivers/gpu/drm/msm/dsi/dsi.h > @@ -9,6 +9,7 @@ > #include <linux/of_platform.h> > #include <linux/platform_device.h> > > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_mipi_dsi.h> > #include <drm/drm_panel.h> > diff --git a/drivers/gpu/drm/msm/edp/edp.h b/drivers/gpu/drm/msm/edp/edp.h > index f2c17858a703..eb34243dad53 100644 > --- a/drivers/gpu/drm/msm/edp/edp.h > +++ b/drivers/gpu/drm/msm/edp/edp.h > @@ -10,6 +10,7 @@ > #include <linux/interrupt.h> > #include <linux/kernel.h> > #include <linux/platform_device.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_dp_helper.h> > > diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h > index 982865866a29..4aba397a889b 100644 > --- a/drivers/gpu/drm/msm/hdmi/hdmi.h > +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h > @@ -13,6 +13,8 @@ > #include <linux/regulator/consumer.h> > #include <linux/hdmi.h> > > +#include <drm/drm_bridge.h> > + > #include "msm_drv.h" > #include "hdmi.xml.h" > > diff --git a/drivers/gpu/drm/omapdrm/dss/output.c b/drivers/gpu/drm/omapdrm/dss/output.c > index de0f882f0f7b..de500bb05bdc 100644 > --- a/drivers/gpu/drm/omapdrm/dss/output.c > +++ b/drivers/gpu/drm/omapdrm/dss/output.c > @@ -11,6 +11,7 @@ > #include <linux/of.h> > #include <linux/of_graph.h> > > +#include <drm/drm_bridge.h> > #include <drm/drm_panel.h> > > #include "dss.h" > diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c > index 9f652d2e7af1..224ec6fdc800 100644 > --- a/drivers/gpu/drm/omapdrm/omap_drv.c > +++ b/drivers/gpu/drm/omapdrm/omap_drv.c > @@ -11,6 +11,7 @@ > > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_drv.h> > #include <drm/drm_fb_helper.h> > #include <drm/drm_file.h> > diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c > index 6fe14111cd95..24bbe9f2a32e 100644 > --- a/drivers/gpu/drm/omapdrm/omap_encoder.c > +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c > @@ -6,6 +6,7 @@ > > #include <linux/list.h> > > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_modeset_helper_vtables.h> > #include <drm/drm_edid.h> > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c > index 0f00bdfe2366..3a1139b725c0 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c > @@ -9,6 +9,7 @@ > > #include <linux/export.h> > > +#include <drm/drm_bridge.h> > #include <drm/drm_crtc.h> > #include <drm/drm_modeset_helper_vtables.h> > #include <drm/drm_panel.h> > diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c > index 64aefa856896..8a4c9af0ba73 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c > +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c > @@ -16,6 +16,7 @@ > #include <linux/regmap.h> > #include <linux/reset.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > > #include <drm/drm_dp_helper.h> > #include <drm/drm_of.h> > diff --git a/drivers/gpu/drm/rockchip/rockchip_rgb.c b/drivers/gpu/drm/rockchip/rockchip_rgb.c > index 89e0bb0fe0ab..db1be1f3925c 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_rgb.c > +++ b/drivers/gpu/drm/rockchip/rockchip_rgb.c > @@ -9,6 +9,7 @@ > #include <linux/of_graph.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_dp_helper.h> > #include <drm/drm_of.h> > #include <drm/drm_panel.h> > diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c > index e55870190bf5..0a4f00253f39 100644 > --- a/drivers/gpu/drm/sti/sti_dvo.c > +++ b/drivers/gpu/drm/sti/sti_dvo.c > @@ -12,6 +12,7 @@ > #include <linux/platform_device.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_device.h> > #include <drm/drm_panel.h> > #include <drm/drm_print.h> > diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c > index 94e404f13234..9d3fd6370a29 100644 > --- a/drivers/gpu/drm/sti/sti_hda.c > +++ b/drivers/gpu/drm/sti/sti_hda.c > @@ -12,6 +12,7 @@ > #include <linux/seq_file.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_debugfs.h> > #include <drm/drm_device.h> > #include <drm/drm_file.h> > diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c > index 9862c322f0c4..84318d0832a0 100644 > --- a/drivers/gpu/drm/sti/sti_hdmi.c > +++ b/drivers/gpu/drm/sti/sti_hdmi.c > @@ -14,6 +14,7 @@ > #include <linux/reset.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_debugfs.h> > #include <drm/drm_drv.h> > #include <drm/drm_edid.h> > diff --git a/drivers/gpu/drm/sun4i/sun4i_lvds.c b/drivers/gpu/drm/sun4i/sun4i_lvds.c > index 7fbf425acb55..25ab2ef6d545 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_lvds.c > +++ b/drivers/gpu/drm/sun4i/sun4i_lvds.c > @@ -7,6 +7,7 @@ > #include <linux/clk.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_of.h> > #include <drm/drm_panel.h> > #include <drm/drm_print.h> > diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c > index aac56983f208..e74b9eddca01 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c > +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c > @@ -9,6 +9,7 @@ > #include <linux/clk.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_of.h> > #include <drm/drm_panel.h> > #include <drm/drm_print.h> > diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c > index 690aeb822704..eb187da56aba 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c > +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c > @@ -16,6 +16,7 @@ > #include <linux/reset.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_connector.h> > #include <drm/drm_crtc.h> > #include <drm/drm_encoder.h> > diff --git a/drivers/gpu/drm/tilcdc/tilcdc_external.c b/drivers/gpu/drm/tilcdc/tilcdc_external.c > index 43d756b7810e..4fc10838de80 100644 > --- a/drivers/gpu/drm/tilcdc/tilcdc_external.c > +++ b/drivers/gpu/drm/tilcdc/tilcdc_external.c > @@ -8,6 +8,7 @@ > #include <linux/of_graph.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_of.h> > > #include "tilcdc_drv.h" > diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c > index c78fa8144776..3f63943e5472 100644 > --- a/drivers/gpu/drm/vc4/vc4_dsi.c > +++ b/drivers/gpu/drm/vc4/vc4_dsi.c > @@ -31,6 +31,7 @@ > #include <linux/pm_runtime.h> > > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > #include <drm/drm_edid.h> > #include <drm/drm_mipi_dsi.h> > #include <drm/drm_of.h> > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 7d14c11bdc0a..7e2963cad543 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -41,7 +41,6 @@ > #include <drm/drm_connector.h> > #include <drm/drm_device.h> > #include <drm/drm_property.h> > -#include <drm/drm_bridge.h> > #include <drm/drm_edid.h> > #include <drm/drm_plane.h> > #include <drm/drm_blend.h> _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
