| Message ID | 20230727215141.53910-1-avolmat@me.com |
|---|---|
| Headers | show |
| Series | drm/sti: add display support on stih418 family | expand |
On 27/07/2023 23:51, Alain Volmat wrote: > Add a new compatible in st,stih4xx.txt in order to support sti vtg on > stih418 platforms. > > Signed-off-by: Alain Volmat <avolmat@me.com> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On 27/07/2023 23:51, Alain Volmat wrote: > Addition of a first set of nodes (compositor/tvout/hdmi/dvo) in order > to allow graphic plane usage via HDMI or DVO on the stih418 based boards. > > Signed-off-by: Alain Volmat <avolmat@me.com> > --- > arch/arm/boot/dts/st/stih418-clock.dtsi | 2 +- > arch/arm/boot/dts/st/stih418.dtsi | 154 ++++++++++++++++++++++++ > 2 files changed, 155 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/st/stih418-clock.dtsi b/arch/arm/boot/dts/st/stih418-clock.dtsi > index e1749e92a2e7..93641df58bf2 100644 > --- a/arch/arm/boot/dts/st/stih418-clock.dtsi > +++ b/arch/arm/boot/dts/st/stih418-clock.dtsi > @@ -17,7 +17,7 @@ clk_sysin: clk-sysin { > clk_tmdsout_hdmi: clk-tmdsout-hdmi { > #clock-cells = <0>; > compatible = "fixed-clock"; > - clock-frequency = <0>; > + clock-frequency = <594000000>; > }; > > clocks { > diff --git a/arch/arm/boot/dts/st/stih418.dtsi b/arch/arm/boot/dts/st/stih418.dtsi > index b35b9b7a7ccc..b41de235fffa 100644 > --- a/arch/arm/boot/dts/st/stih418.dtsi > +++ b/arch/arm/boot/dts/st/stih418.dtsi > @@ -6,6 +6,7 @@ > #include "stih418-clock.dtsi" > #include "stih407-family.dtsi" > #include "stih410-pinctrl.dtsi" > +#include <dt-bindings/gpio/gpio.h> > / { > cpus { > #address-cells = <1>; > @@ -114,5 +115,158 @@ thermal@91a0000 { > clocks = <&clk_sysin>; > interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>; > }; > + > + sti-display-subsystem@0 { display-subsystem@ or display-controller@ Although 0 is a bit weird address... are you sure this is correct? > + compatible = "st,sti-display-subsystem"; > + #address-cells = <1>; > + #size-cells = <1>; > + > + reg = <0 0>; > + assigned-clocks = <&clk_s_d2_quadfs 0>, > + <&clk_s_d2_quadfs 1>, > + <&clk_s_d2_flexgen CLK_TMDS_HDMI_DIV2>, > + <&clk_s_d2_flexgen CLK_TMDS_HDMI>, > + <&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>, > + <&clk_s_d2_flexgen CLK_PIX_AUX_DISP>, > + <&clk_s_c0_flexgen CLK_MAIN_DISP>, > + <&clk_s_c0_flexgen CLK_AUX_DISP>, > + <&clk_s_c0_flexgen CLK_COMPO_DVP>, > + <&clk_s_c0_flexgen CLK_PROC_MIXER>; > + > + assigned-clock-parents = <0>, > + <0>, > + <&clk_tmdsout_hdmi>, > + <&clk_tmdsout_hdmi>, > + <&clk_s_d2_quadfs 0>, > + <&clk_s_d2_quadfs 1>, > + <&clk_s_c0_pll1 0>, > + <&clk_s_c0_pll1 0>, > + <&clk_s_c0_pll0 0>, > + <&clk_s_c0_pll0 0>; > + > + assigned-clock-rates = <297000000>, > + <108000000>, > + <297000000>, > + <0>, > + <74250000>, > + <13500000>, > + <400000000>, > + <400000000>, > + <355000000>, > + <355000000>; > + > + ranges; > + > + sti_compo: sti-compositor@a600000 { compositor@ > + compatible = "st,stih418-compositor"; > + reg = <0xa600000 0x200000>; > + > + clock-names = "compo_main", > + "compo_aux", > + "pix_main", > + "pix_aux", > + "proc_mixer"; > + > + clocks = <&clk_s_c0_flexgen CLK_COMPO_DVP>, > + <&clk_s_c0_flexgen CLK_COMPO_DVP>, > + <&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>, > + <&clk_s_d2_flexgen CLK_PIX_AUX_DISP>, > + <&clk_s_c0_flexgen CLK_PROC_MIXER>; > + > + reset-names = "compo-main", "compo-aux"; > + resets = <&softreset STIH407_COMPO_SOFTRESET>, > + <&softreset STIH407_COMPO_SOFTRESET>; > + st,vtg = <&vtg_main>, <&vtg_aux>; > + > + status = "disabled"; > + }; > + > + sti_tvout: sti-tvout@a900000 { hdmi@ or something else > + compatible = "st,stih418-tvout"; > + reg = <0xa900000 0x1000>; > + reg-names = "tvout-reg"; > + reset-names = "tvout"; > + resets = <&softreset STIH407_HDTVOUT_SOFTRESET>; > + #address-cells = <1>; > + #size-cells = <1>; > + assigned-clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>, > + <&clk_s_d2_flexgen CLK_TMDS_HDMI>, > + <&clk_s_d2_flexgen CLK_REF_HDMIPHY>, > + <&clk_s_d0_flexgen CLK_PCM_0>, > + <&clk_s_d2_flexgen CLK_PIX_HDDAC>, > + <&clk_s_d2_flexgen CLK_HDDAC>; > + > + assigned-clock-parents = <&clk_s_d2_quadfs 0>, > + <&clk_tmdsout_hdmi>, > + <&clk_s_d2_quadfs 0>, > + <&clk_s_d0_quadfs 0>, > + <&clk_s_d2_quadfs 0>, > + <&clk_s_d2_quadfs 0>; > + assigned-clock-rates = <74250000>, > + <0>, > + <74250000>, > + <0>, > + <74250000>, > + <148500000>; > + > + status = "disabled"; > + }; > + > + sti_dvo: sti-dvo@a800400 { I don't know, but definitely sti is not a generic name. > + compatible = "st,stih407-dvo"; > + reg = <0xa800400 0x200>; > + reg-names = "dvo-reg"; > + clock-names = "dvo_pix", "dvo", > + "main_parent", "aux_parent"; > + clocks = <&clk_s_d2_flexgen CLK_PIX_DVO>, > + <&clk_s_d2_flexgen CLK_DVO>, > + <&clk_s_d2_quadfs 0>, <&clk_s_d2_quadfs 1>; > + status = "disabled"; > + }; > + > + sti_hdmi: sti-hdmi@a804000 { hdmi@ > + compatible = "st,stih418-hdmi"; > + reg = <0xa804000 0x1000>; > + reg-names = "hdmi-reg"; > + #sound-dai-cells = <0>; > + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "irq"; > + clock-names = "pix", > + "tmds", > + "phy", > + "audio", > + "main_parent", > + "aux_parent"; > + > + clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>, > + <&clk_s_d2_flexgen CLK_TMDS_HDMI>, > + <&clk_s_d2_flexgen CLK_REF_HDMIPHY>, > + <&clk_s_d0_flexgen CLK_PCM_0>, > + <&clk_s_d2_quadfs 0>, > + <&clk_s_d2_quadfs 1>; > + > + hdmi,hpd-gpio = <&pio5 3 GPIO_ACTIVE_LOW>; > + reset-names = "hdmi"; > + resets = <&softreset STIH407_HDMI_TX_PHY_SOFTRESET>; > + > + status = "disabled"; > + }; > + }; Best regards, Krzysztof
On 27/07/2023 23:51, Alain Volmat wrote: > Enable the compositor, tvout, hdmi and gpu on the B2264 board. > > Signed-off-by: Alain Volmat <avolmat@me.com> > --- > arch/arm/boot/dts/st/stih418-b2264.dts | 34 ++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/arch/arm/boot/dts/st/stih418-b2264.dts b/arch/arm/boot/dts/st/stih418-b2264.dts > index fc32a03073b6..35bf618e0783 100644 > --- a/arch/arm/boot/dts/st/stih418-b2264.dts > +++ b/arch/arm/boot/dts/st/stih418-b2264.dts > @@ -96,6 +96,14 @@ st,pins { > }; > }; > > + hdmiddc: i2c@9541000 { You should really override by labels/phandles... Best regards, Krzysztof
This serie adds support for graphic display features on the stih418 soc. Major differences compare to the already supported stih407 are - a new HDMI PHY to support 4K resolutions - updated mixer to support the higher number of planes available on the stih418 - updated GDP (graphic planes), called here gdpplus Alain Volmat (14): drm/sti: add hdmi tx6g0c28 phy for STi platform dt-bindings: display: add st,stih418-vtg compatible for sti vtg drm/sti: add support for VTG on the stih418 platform drm/sti: add STih418 platform support in sti mixer drm/sti: add support for stih418 in tvout drm/sti: remove VTG_SYNC_ID_HDMI from sti_vtg.h drm/sti: add more possible GDP / VID planes entries in sti_plane drm/sti: add more planes supports in sti_mixer drm/sti: add support for GDPPLUS / stih418 GDPs drm/sti: add compositor support for stih418 platform ARM: dts: sti: move vtg_main / vtg_aux into stih407/stih410 dtsi ARM: dts: sti: addition of display nodes for stih418 platform ARM: dts: sti: add the gpu node for the MALI-400 on stih418.dtsi ARM: dts: sti: enable basic display on stih418-b2264 board .../bindings/display/st,stih4xx.txt | 2 +- arch/arm/boot/dts/st/stih407-family.dtsi | 13 - arch/arm/boot/dts/st/stih407.dtsi | 12 + arch/arm/boot/dts/st/stih410.dtsi | 12 + arch/arm/boot/dts/st/stih418-b2264.dts | 34 ++ arch/arm/boot/dts/st/stih418-clock.dtsi | 2 +- arch/arm/boot/dts/st/stih418.dtsi | 188 +++++++++++ drivers/gpu/drm/sti/Makefile | 1 + drivers/gpu/drm/sti/sti_compositor.c | 30 ++ drivers/gpu/drm/sti/sti_compositor.h | 3 + drivers/gpu/drm/sti/sti_crtc.c | 11 + drivers/gpu/drm/sti/sti_gdp.c | 250 +++++++++------ drivers/gpu/drm/sti/sti_gdp.h | 8 +- drivers/gpu/drm/sti/sti_hdmi.c | 4 + drivers/gpu/drm/sti/sti_hdmi_tx6g0c28phy.c | 292 ++++++++++++++++++ drivers/gpu/drm/sti/sti_hdmi_tx6g0c28phy.h | 13 + drivers/gpu/drm/sti/sti_mixer.c | 133 ++++++-- drivers/gpu/drm/sti/sti_mixer.h | 3 +- drivers/gpu/drm/sti/sti_plane.c | 8 + drivers/gpu/drm/sti/sti_plane.h | 8 +- drivers/gpu/drm/sti/sti_tvout.c | 35 ++- drivers/gpu/drm/sti/sti_vtg.c | 62 +++- drivers/gpu/drm/sti/sti_vtg.h | 1 - 23 files changed, 967 insertions(+), 158 deletions(-) create mode 100644 drivers/gpu/drm/sti/sti_hdmi_tx6g0c28phy.c create mode 100644 drivers/gpu/drm/sti/sti_hdmi_tx6g0c28phy.h