drm/meson: add YUV422 output support
PATCH 1/1 drm/meson: add YUV422 output support
From: Dongjin Kim <[email protected]>
Support YUV422 output from the Amlogic Meson SoC VPU to the HDMI controller. Without this YUV422 format out of the HDMI encoder leads to using the dw-hdmi YUV444 to YUV422 color conversion which gives wrong colors and a green line on the left edge of the screen.
---
I've had this patch in my sources for some time now; originally picked from Dongjin's mainline branches for Hardkernel boards and tweaked for some minor renaming after DRM bridge changes were merged. Furkhan has reminded me this is still needed a couple of days ago and now the same issue is reported on the mailing list [0] so best to submit it. If a fixes tag is required? please advise the commit and i'll resend.
drivers/gpu/drm/meson/meson_encoder_hdmi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
drivers/gpu/drm/meson/meson_encoder_hdmi.c +7 -1
@@ -218,7 +218,8 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge,if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 ) { ycrcb_map =VPU_HDMI_OUTPUT_CRYCB ; yuv420_mode = true; - } + }else if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYVY8_1X16 ) + ycrcb_map =VPU_HDMI_OUTPUT_CRYCB ;/* VENC + VENC-DVI Mode setup */ meson_venc_hdmi_mode_set (priv, vic, ycrcb_map, yuv420_mode, mode);
@@ -230,6 +231,10 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge,/* Setup YUV420 to HDMI-TX, no 10bit diphering */ writel_relaxed (2 | (2 <<2 ), priv->io_base +_REG (VPU_HDMI_FMT_CTRL )); + else if (encoder_hdmi->output_bus_fmt == MEDIA_BUS_FMT_UYVY8_1X16) + /* Setup YUV422 to HDMI-TX, no 10bit diphering */ + writel_relaxed(1 | (2 << 2), + priv->io_base + _REG(VPU_HDMI_FMT_CTRL)); else/* Setup YUV444 to HDMI-TX, no 10bit diphering */ writel_relaxed(0, priv->io_base + _REG(VPU_HDMI_FMT_CTRL));
@@ -257,6 +262,7 @@ static void meson_encoder_hdmi_atomic_disable(struct drm_bridge *bridge,static const u32 meson_encoder_hdmi_out_bus_fmts[] = {MEDIA_BUS_FMT_YUV8_1X24 , +MEDIA_BUS_FMT_UYVY8_1X16 ,MEDIA_BUS_FMT_UYYVYY8_0_5X24 , };
Signature · 1 line
2.17.1
Den 16.05.2022 kl. 09.22 skrev Christian Hewitt:
Quoted 54 lines
From: Dongjin Kim <[email protected]>
Support YUV422 output from the Amlogic Meson SoC VPU to the HDMI controller. Without this YUV422 format out of the HDMI encoder leads to using the dw-hdmi YUV444 to YUV422 color conversion which gives wrong colors and a green line on the left edge of the screen.
Signed-off-by Dongjin Kim <[email protected]>Signed-off-by Christian Hewitt <[email protected]>Tested-by Furkan Kardame <[email protected]>---
I've had this patch in my sources for some time now; originally picked from Dongjin's mainline branches for Hardkernel boards and tweaked for some minor renaming after DRM bridge changes were merged. Furkhan has reminded me this is still needed a couple of days ago and now the same issue is reported on the mailing list [0] so best to submit it. If a fixes tag is required? please advise the commit and i'll resend.drivers/gpu/drm/meson/meson_encoder_hdmi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/gpu/drm/meson/meson_encoder_hdmi.c +7
-1@@ -218,7 +218,8 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge,if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 ) { ycrcb_map =VPU_HDMI_OUTPUT_CRYCB ; yuv420_mode = true; - } + }else if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYVY8_1X16 ) + ycrcb_map =VPU_HDMI_OUTPUT_CRYCB ;/* VENC + VENC-DVI Mode setup */ meson_venc_hdmi_mode_set (priv, vic, ycrcb_map, yuv420_mode, mode);@@ -230,6 +231,10 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge,/* Setup YUV420 to HDMI-TX, no 10bit diphering */ writel_relaxed (2 | (2 <<2 ), priv->io_base +_REG (VPU_HDMI_FMT_CTRL )); + else if (encoder_hdmi->output_bus_fmt == MEDIA_BUS_FMT_UYVY8_1X16) + /* Setup YUV422 to HDMI-TX, no 10bit diphering */ + writel_relaxed(1 | (2 << 2), + priv->io_base + _REG(VPU_HDMI_FMT_CTRL)); else/* Setup YUV444 to HDMI-TX, no 10bit diphering */ writel_relaxed(0, priv->io_base + _REG(VPU_HDMI_FMT_CTRL));@@ -257,6 +262,7 @@ static void meson_encoder_hdmi_atomic_disable(struct drm_bridge *bridge,static const u32 meson_encoder_hdmi_out_bus_fmts[] = {MEDIA_BUS_FMT_YUV8_1X24 , +MEDIA_BUS_FMT_UYVY8_1X16 ,MEDIA_BUS_FMT_UYYVYY8_0_5X24 , };
Signature · 9 lines
Kind regards *Dan Johansen* Project lead of the *Manjaro ARM* project Manjaro-ARM <https://manjaro.org> _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Quoted 47 lines · Christian Hewitt
From: Dongjin Kim <[email protected]>
Support YUV422 output from the Amlogic Meson SoC VPU to the HDMI controller. Without this YUV422 format out of the HDMI encoder leads to using the dw-hdmi YUV444 to YUV422 color conversion which gives wrong colors and a green line on the left edge of the screen.
Signed-off-by Dongjin Kim <[email protected]>Signed-off-by Christian Hewitt <[email protected]>Tested-by Furkan Kardame <[email protected]>---
I've had this patch in my sources for some time now; originally picked from Dongjin's mainline branches for Hardkernel boards and tweaked for some minor renaming after DRM bridge changes were merged. Furkhan has reminded me this is still needed a couple of days ago and now the same issue is reported on the mailing list [0] so best to submit it. If a fixes tag is required? please advise the commit and i'll resend.drivers/gpu/drm/meson/meson_encoder_hdmi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)drivers/gpu/drm/meson/meson_encoder_hdmi.c +6
-1@@ -218,7 +218,8 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge,if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYYVYY8_0_5X24 ) { ycrcb_map =VPU_HDMI_OUTPUT_CRYCB ; yuv420_mode = true; - } + }else if (encoder_hdmi->output_bus_fmt ==MEDIA_BUS_FMT_UYVY8_1X16 ) + ycrcb_map =VPU_HDMI_OUTPUT_CRYCB ;/* VENC + VENC-DVI Mode setup */ meson_venc_hdmi_mode_set (priv, vic, ycrcb_map, yuv420_mode, mode);@@ -230,6 +231,10 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge,/* Setup YUV420 to HDMI-TX, no 10bit diphering */ writel_relaxed (2 | (2 <<2 ), priv->io_base +_REG (VPU_HDMI_FMT_CTRL )); + else if (encoder_hdmi->output_bus_fmt == MEDIA_BUS_FMT_UYVY8_1X16) + /* Setup YUV422 to HDMI-TX, no 10bit diphering */ + writel_relaxed(1 | (2 << 2), + priv->io_base + _REG(VPU_HDMI_FMT_CTRL)); else/* Setup YUV444 to HDMI-TX, no 10bit diphering */ writel_relaxed(0, priv->io_base + _REG(VPU_HDMI_FMT_CTRL));
drivers/gpu/drm/meson/meson_encoder_hdmi.c static void meson_encoder_hdmi_atomic_disable(struct drm_bridge *bridge, · line 268
Quoted 7 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +1
-0@@ -257,6 +262,7 @@ static void meson_encoder_hdmi_atomic_disable(struct drm_bridge *bridge,static const u32 meson_encoder_hdmi_out_bus_fmts[] = {MEDIA_BUS_FMT_YUV8_1X24 , +MEDIA_BUS_FMT_UYVY8_1X16 ,MEDIA_BUS_FMT_UYYVYY8_0_5X24 , };
Neil Armstrong
AppliedHi,
Quoted 8 lines · Christian Hewitt
From: Dongjin Kim <[email protected]>
Support YUV422 output from the Amlogic Meson SoC VPU to the HDMI controller. Without this YUV422 format out of the HDMI encoder leads to using the dw-hdmi YUV444 to YUV422 color conversion which gives wrong colors and a green line on the left edge of the screen.
[...]
Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-next)
[1/1] drm/meson: add YUV422 output support
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=c193a003dc46ae601f46908b41d6f485b87db1ad
Signature · 1 line
Neil