| Message ID | 20180424142459.3339-1-jakob.unterwurzacher@theobroma-systems.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello Jakob, On 2018-04-24 16:24, Jakob Unterwurzacher wrote: >Earlier kernels showed a corrupt image on hdmi, on v4.16 things >work fine at resolutions up to 1920x1080. > >On v4.17-rc2 two fixes are pending for hdmi to work: > >1) "iommu/rockchip: make clock handling optional" > https://patchwork.kernel.org/patch/10344875/ > >2) Add missing enable_irq in rockchip_drm_vop.c > http://lists.infradead.org/pipermail/linux-rockchip/2018-April/020427.html > >These should get merged soon, so I think it's time to enable >the hdmi output in our dts. > >Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher at theobroma-systems.com> >Cc: linux-rockchip at lists.infradead.org >Cc: Heiko Stuebner <heiko at sntech.de> >Cc: Klaus Goger <klaus.goger at theobroma-systems.com> >--- > arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > >diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts >index 7d3e8bfd51dd..23c59c8f0775 100644 >--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts >+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts >@@ -143,6 +143,11 @@ > }; > }; > >+&hdmi { >+ ddc-i2c-bus = <&i2c3>; >+ status = "okay"; >+}; >+ > &i2c1 { > status = "okay"; > clock-frequency = <400000>; >@@ -281,3 +286,19 @@ > &usb_host0_ohci { > status = "okay"; > }; >+ >+&vopb { >+ status = "okay"; >+}; >+ >+&vopb_mmu { >+ status = "okay"; >+}; >+ >+&vopl { >+ status = "okay"; >+}; >+ >+&vopl_mmu { >+ status = "okay"; >+}; >-- >2.11.0 Does HDMI audio work on rk3399-puma-haikou? Regards, Vicente.
On 30.04.18 20:51, Vicente Bergas wrote:
> Does HDMI audio work on rk3399-puma-haikou?
Hi Vicente, works on v4.4 vendor kernel, but does not seem to work on
mainline.
Best regards,
Jakob
Am Dienstag, 24. April 2018, 16:24:59 CEST schrieb Jakob Unterwurzacher: > Earlier kernels showed a corrupt image on hdmi, on v4.16 things > work fine at resolutions up to 1920x1080. > > On v4.17-rc2 two fixes are pending for hdmi to work: > > 1) "iommu/rockchip: make clock handling optional" > https://patchwork.kernel.org/patch/10344875/ > > 2) Add missing enable_irq in rockchip_drm_vop.c > http://lists.infradead.org/pipermail/linux-rockchip/2018-April/020427.html > > These should get merged soon, so I think it's time to enable > the hdmi output in our dts. > > Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com> > Cc: linux-rockchip@lists.infradead.org > Cc: Heiko Stuebner <heiko@sntech.de> > Cc: Klaus Goger <klaus.goger@theobroma-systems.com> > --- Devicetree support should be independent of actual kernel features, so it's not really necessary to list kernel-specific changes. Instead I just shortened the message to "The Puma-haikou combo supports hdmi output, so enable the hdmi controller and vop controllers on it." and applied it for 4.18 Thanks Heiko
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index 7d3e8bfd51dd..23c59c8f0775 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts @@ -143,6 +143,11 @@ }; }; +&hdmi { + ddc-i2c-bus = <&i2c3>; + status = "okay"; +}; + &i2c1 { status = "okay"; clock-frequency = <400000>; @@ -281,3 +286,19 @@ &usb_host0_ohci { status = "okay"; }; + +&vopb { + status = "okay"; +}; + +&vopb_mmu { + status = "okay"; +}; + +&vopl { + status = "okay"; +}; + +&vopl_mmu { + status = "okay"; +};
Earlier kernels showed a corrupt image on hdmi, on v4.16 things work fine at resolutions up to 1920x1080. On v4.17-rc2 two fixes are pending for hdmi to work: 1) "iommu/rockchip: make clock handling optional" https://patchwork.kernel.org/patch/10344875/ 2) Add missing enable_irq in rockchip_drm_vop.c http://lists.infradead.org/pipermail/linux-rockchip/2018-April/020427.html These should get merged soon, so I think it's time to enable the hdmi output in our dts. Signed-off-by: Jakob Unterwurzacher <jakob.unterwurzacher@theobroma-systems.com> Cc: linux-rockchip@lists.infradead.org Cc: Heiko Stuebner <heiko@sntech.de> Cc: Klaus Goger <klaus.goger@theobroma-systems.com> --- arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)