Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dac08e46 authored by Christian Hewitt's avatar Christian Hewitt Committed by Greg Kroah-Hartman
Browse files

drm/meson: fix 1px pink line on GXM when scaling video overlay 

[ Upstream commit 5c8cf1664f288098a971a1d1e65716a2b6a279e1 ]

Playing media with a resolution smaller than the crtc size requires the
video overlay to be scaled for output and GXM boards display a 1px pink
line on the bottom of the scaled overlay. Comparing with the downstream
vendor driver revealed VPP_DUMMY_DATA not being set [0].

Setting VPP_DUMMY_DATA prevents the 1px pink line from being seen.

[0] https://github.com/endlessm/linux-s905x/blob/master/drivers/amlogic/amports/video.c#L7869



Fixes: bbbe775e ("drm: Add support for Amlogic Meson Graphic Controller")
Suggested-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarChristian Hewitt <christianshewitt@gmail.com>
Acked-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230303123312.155164-1-christianshewitt@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d7e48aa1

drivers/gpu/drm/meson/meson_vpp.c

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ void meson_vpp_init(struct meson_drm *priv) 
			       priv->io_base + _REG(VPP_DOLBY_CTRL));

		writel_relaxed(0x1020080,

				priv->io_base + _REG(VPP_DUMMY_DATA1));

		writel_relaxed(0x42020,

				priv->io_base + _REG(VPP_DUMMY_DATA));

	} else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A))

		writel_relaxed(0xf, priv->io_base + _REG(DOLBY_PATH_CTRL));