Re: [Freedreno] [PATCH] drm: Explicitly include correct DT includes
On Fri, Jul 14, 2023 at 11:45:34AM -0600, Rob Herring wrote: > The DT of_device.h and of_platform.h date back to the separate > of_platform_bus_type before it as merged into the regular platform bus. > As part of that merge prepping Arm DT support 13 years ago, they > "temporarily" include each other. They also include platform_device.h > and of.h. As a result, there's a pretty much random mix of those include > files used throughout the tree. In order to detangle these headers and > replace the implicit includes with struct declarations, users need to > explicitly include the correct includes. > > Signed-off-by: Rob Herring [Trimming the recipient list so that Google will let me send this] Test builds were fine, so I've pushed this to drm-misc now. Thierry signature.asc Description: PGP signature
Re: [Freedreno] [PATCH] drm: Explicitly include correct DT includes
On Mon, Jul 17, 2023 at 4:27 PM Rob Herring wrote: > > On Sun, Jul 16, 2023 at 3:26 AM Heiko Stuebner wrote: > > > > Am Freitag, 14. Juli 2023, 19:45:34 CEST schrieb Rob Herring: > > > The DT of_device.h and of_platform.h date back to the separate > > > of_platform_bus_type before it as merged into the regular platform bus. > > > As part of that merge prepping Arm DT support 13 years ago, they > > > "temporarily" include each other. They also include platform_device.h > > > and of.h. As a result, there's a pretty much random mix of those include > > > files used throughout the tree. In order to detangle these headers and > > > replace the implicit includes with struct declarations, users need to > > > explicitly include the correct includes. > > > > > > Signed-off-by: Rob Herring > > > --- > > > > [...] > > > > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > > b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > > index 917e79951aac..2744d8f4a6fa 100644 > > > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > > @@ -12,7 +12,9 @@ > > > #include > > > #include > > > #include > > > +#include > > > #include > > > +#include > > > #include > > > #include > > > > I'm not sure if I'm just misreading something, but in all other places > > of_device.h gets removed while here is stays as an include. Is this > > correct this way? > > Yes, because of_match_device() is used. > > Rob > For drivers/gpu/drm/bridge/ Acked-by: Robert Foss
Re: [Freedreno] [PATCH] drm: Explicitly include correct DT includes
On Sun, Jul 16, 2023 at 3:26 AM Heiko Stuebner wrote: > > Am Freitag, 14. Juli 2023, 19:45:34 CEST schrieb Rob Herring: > > The DT of_device.h and of_platform.h date back to the separate > > of_platform_bus_type before it as merged into the regular platform bus. > > As part of that merge prepping Arm DT support 13 years ago, they > > "temporarily" include each other. They also include platform_device.h > > and of.h. As a result, there's a pretty much random mix of those include > > files used throughout the tree. In order to detangle these headers and > > replace the implicit includes with struct declarations, users need to > > explicitly include the correct includes. > > > > Signed-off-by: Rob Herring > > --- > > [...] > > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > index 917e79951aac..2744d8f4a6fa 100644 > > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > > @@ -12,7 +12,9 @@ > > #include > > #include > > #include > > +#include > > #include > > +#include > > #include > > #include > > I'm not sure if I'm just misreading something, but in all other places > of_device.h gets removed while here is stays as an include. Is this > correct this way? Yes, because of_match_device() is used. Rob
Re: [Freedreno] [PATCH] drm: Explicitly include correct DT includes
Quoting Rob Herring (2023-07-14 18:45:34) > The DT of_device.h and of_platform.h date back to the separate > of_platform_bus_type before it as merged into the regular platform bus. > As part of that merge prepping Arm DT support 13 years ago, they > "temporarily" include each other. They also include platform_device.h > and of.h. As a result, there's a pretty much random mix of those include > files used throughout the tree. In order to detangle these headers and > replace the implicit includes with struct declarations, users need to > explicitly include the correct includes. > > Signed-off-by: Rob Herring > drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 2 +- > drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 2 ++ > drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c | 1 + > drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 1 - > drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c | 1 - For drivers/gpu/drm/renesas/rcar-du/ > diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c > b/drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c > index 1ffde19cb87f..3904b0cca814 100644 > --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c > +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c > @@ -12,7 +12,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c > b/drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c > index adfb36b0e815..9ff4537c26c8 100644 > --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c > +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c > @@ -20,8 +20,10 @@ > > #include > #include > +#include > #include > #include > +#include > #include > > #include "rcar_du_crtc.h" > diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c > b/drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c > index 45c05d0ffc70..9cbb5e6e2cba 100644 > --- a/drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c > +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c > b/drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c > index e10e4d4b89a2..db2e6f16f954 100644 > --- a/drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c > +++ b/drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c > @@ -12,7 +12,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c > b/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c > index aa95b85a2964..8048bdca2d6c 100644 > --- a/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c > +++ b/drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c > @@ -10,7 +10,6 @@ > #include > #include > #include > -#include > #include > #include > #include Reviewed-by: Kieran Bingham
Re: [Freedreno] [PATCH] drm: Explicitly include correct DT includes
On Fri, Jul 14, 2023 at 11:45:34AM -0600, Rob Herring wrote: > The DT of_device.h and of_platform.h date back to the separate > of_platform_bus_type before it as merged into the regular platform bus. > As part of that merge prepping Arm DT support 13 years ago, they > "temporarily" include each other. They also include platform_device.h > and of.h. As a result, there's a pretty much random mix of those include > files used throughout the tree. In order to detangle these headers and > replace the implicit includes with struct declarations, users need to > explicitly include the correct includes. > > Signed-off-by: Rob Herring > --- > > diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > index cc7664c95a54..14ee79becacb 100644 > --- a/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > +++ b/drivers/gpu/drm/arm/display/komeda/komeda_dev.c > @@ -6,7 +6,7 @@ > */ > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/drivers/gpu/drm/arm/malidp_drv.c > b/drivers/gpu/drm/arm/malidp_drv.c > index c03cfd57b752..a5a9534d4353 100644 > --- a/drivers/gpu/drm/arm/malidp_drv.c > +++ b/drivers/gpu/drm/arm/malidp_drv.c > @@ -12,6 +12,7 @@ > #include > #include > #include > +#include > #include > #include > For the komeda and malidp drivers: Acked-by: Liviu Dudau Best regards, Liviu > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c > b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c > index 99964f5a5457..2a6b91f752cb 100644 > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c > @@ -7,7 +7,6 @@ > > #include > #include > -#include > #include > #include > > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > index 2254457ab5d0..b9957da0f55a 100644 > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > @@ -9,7 +9,7 @@ > #include > #include > #include > -#include > +#include > #include > > #include > diff --git a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c > b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c > index f50d65f54314..7457d38622b0 100644 > --- a/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c > +++ b/drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c > @@ -14,8 +14,7 @@ > #include > #include > #include > -#include > -#include > +#include > #include > #include > #include > diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c > b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c > index f6822dfa3805..4aff817f82ce 100644 > --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c > +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c > @@ -29,7 +29,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpu/drm/bridge/chipone-icn6211.c > b/drivers/gpu/drm/bridge/chipone-icn6211.c > index 8bfce21d6b90..d205e755e524 100644 > --- a/drivers/gpu/drm/bridge/chipone-icn6211.c > +++ b/drivers/gpu/drm/bridge/chipone-icn6211.c > @@ -17,7 +17,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > diff --git a/drivers/gpu/drm/bridge/display-connector.c > b/drivers/gpu/drm/bridge/display-connector.c > index f7f436cf96e0..08bd5695ddae 100644 > --- a/drivers/gpu/drm/bridge/display-connector.c > +++ b/drivers/gpu/drm/bridge/display-connector.c > @@ -10,7 +10,6 @@ > #include > #include > #include > -#include > #include > #include > > diff --git a/drivers/gpu/drm/bridge/fsl-ldb.c > b/drivers/gpu/drm/bridge/fsl-ldb.c > index b8e52156b07a..0e4bac7dd04f 100644 > --- a/drivers/gpu/drm/bridge/fsl-ldb.c > +++ b/drivers/gpu/drm/bridge/fsl-ldb.c > @@ -8,7 +8,6 @@ > #include > #include > #include > -#include > #include > #include > #include > diff --git a/drivers/gpu/drm/bridge/imx/imx8qm-ldb.c > b/drivers/gpu/drm/bridge/imx/imx8qm-ldb.c > index 386032a02599..21471a9a28b2 100644 > --- a/drivers/gpu/drm/bridge/imx/imx8qm-ldb.c > +++ b/drivers/gpu/drm/bridge/imx/imx8qm-ldb.c > @@ -9,9 +9,9 @@ > #include > #include > #include > -#include > #include > #include > +#include > #include > #include > > diff --git a/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c > b/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c > index c806576b1e22..7984da9c0a35 100644 > --- a/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c > +++ b/drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c > @@ -12,6 +12,7 @@ > #include > #include > #include > +#include > #include > #include > > diff --git a/drivers/gpu/drm/bridge/lontium-lt9211.c > b/drivers/gpu/drm/bridge/lontium-lt9211.c > index aa8d47e7f40d..4d404f5ef87e 100644 > --- a/drivers/gpu/drm/bridge/lontium-lt9211.c > +++ b/drivers/gpu/drm/bridge/lontium-lt9211.c > @@ -16,7 +16,6 @@ > #include > #include > #include >
Re: [Freedreno] [PATCH] drm: Explicitly include correct DT includes
Am Freitag, 14. Juli 2023, 19:45:34 CEST schrieb Rob Herring: > The DT of_device.h and of_platform.h date back to the separate > of_platform_bus_type before it as merged into the regular platform bus. > As part of that merge prepping Arm DT support 13 years ago, they > "temporarily" include each other. They also include platform_device.h > and of.h. As a result, there's a pretty much random mix of those include > files used throughout the tree. In order to detangle these headers and > replace the implicit includes with struct declarations, users need to > explicitly include the correct includes. > > Signed-off-by: Rob Herring > --- [...] > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > index 917e79951aac..2744d8f4a6fa 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c > @@ -12,7 +12,9 @@ > #include > #include > #include > +#include > #include > +#include > #include > #include I'm not sure if I'm just misreading something, but in all other places of_device.h gets removed while here is stays as an include. Is this correct this way? Thanks Heiko
Re: [Freedreno] [PATCH] drm: Explicitly include correct DT includes
Hi Rob, On Fri, Jul 14, 2023 at 11:45:34AM -0600, Rob Herring wrote: > The DT of_device.h and of_platform.h date back to the separate > of_platform_bus_type before it as merged into the regular platform bus. > As part of that merge prepping Arm DT support 13 years ago, they > "temporarily" include each other. They also include platform_device.h > and of.h. As a result, there's a pretty much random mix of those include > files used throughout the tree. In order to detangle these headers and > replace the implicit includes with struct declarations, users need to > explicitly include the correct includes. > > Signed-off-by: Rob Herring Acked-by: Sam Ravnborg
[Freedreno] [PATCH] drm: Explicitly include correct DT includes
The DT of_device.h and of_platform.h date back to the separate of_platform_bus_type before it as merged into the regular platform bus. As part of that merge prepping Arm DT support 13 years ago, they "temporarily" include each other. They also include platform_device.h and of.h. As a result, there's a pretty much random mix of those include files used throughout the tree. In order to detangle these headers and replace the implicit includes with struct declarations, users need to explicitly include the correct includes. Signed-off-by: Rob Herring --- drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 1 + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 1 - drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +- drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c| 3 +-- drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 1 - drivers/gpu/drm/bridge/chipone-icn6211.c | 2 +- drivers/gpu/drm/bridge/display-connector.c| 1 - drivers/gpu/drm/bridge/fsl-ldb.c | 1 - drivers/gpu/drm/bridge/imx/imx8qm-ldb.c | 2 +- drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c | 1 + drivers/gpu/drm/bridge/lontium-lt9211.c | 1 - drivers/gpu/drm/bridge/lvds-codec.c | 1 - drivers/gpu/drm/bridge/nwl-dsi.c | 2 +- drivers/gpu/drm/bridge/parade-ps8622.c| 1 - drivers/gpu/drm/bridge/samsung-dsim.c | 3 ++- drivers/gpu/drm/bridge/simple-bridge.c| 3 ++- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 +- drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +- drivers/gpu/drm/drm_mipi_dsi.c| 1 + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 +- drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 +- drivers/gpu/drm/exynos/exynos7_drm_decon.c| 1 - drivers/gpu/drm/exynos/exynos_drm_dsi.c | 3 ++- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 - drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_scaler.c| 2 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- drivers/gpu/drm/exynos/exynos_mixer.c | 1 - drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- drivers/gpu/drm/imx/dcss/dcss-dev.c | 5 +++-- drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 2 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- drivers/gpu/drm/ingenic/ingenic-ipu.c | 2 +- drivers/gpu/drm/lima/lima_drv.c | 3 ++- drivers/gpu/drm/logicvc/logicvc_drm.c | 2 +- drivers/gpu/drm/mcde/mcde_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_aal.c | 3 +-- drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 3 +-- drivers/gpu/drm/mediatek/mtk_disp_color.c | 3 +-- drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 3 +-- drivers/gpu/drm/mediatek/mtk_disp_merge.c | 3 +-- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 3 +-- drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 3 ++- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 3 +-- drivers/gpu/drm/mediatek/mtk_dpi.c| 1 - drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_drv.c| 3 ++- drivers/gpu/drm/mediatek/mtk_ethdr.c | 2 +- drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 3 +-- drivers/gpu/drm/meson/meson_drv.h | 1 - drivers/gpu/drm/meson/meson_dw_hdmi.c | 3 ++- drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 3 ++- drivers/gpu/drm/meson/meson_encoder_dsi.c | 1 - drivers/gpu/drm/meson/meson_encoder_hdmi.c| 4 +++- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 ++ drivers/gpu/drm/msm/dp/dp_audio.c | 2 +- drivers/gpu/drm/msm/dsi/dsi_host.c| 2 +- drivers/gpu/drm/msm/hdmi/hdmi.c | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 3 ++- drivers/gpu/drm/msm/msm_mdss.c| 2 ++ drivers/gpu/drm/mxsfb/lcdif_drv.c | 1 - drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 3 ++- drivers/gpu/drm/panel/panel-auo-a030jtn01.c | 2 +- drivers/gpu/drm/panel/panel-boe-himax8279d.c | 1 - drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c| 1 - drivers/gpu/drm/panel/panel-dsi-cm.c | 2 +- drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 1 - drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 2 +- drivers/gpu/drm/panel/panel-himax-hx8394.c| 2 +-
