Commit 5dd9cb66 authored Sep 08, 2022 by Stuart Menefy Committed by Greg Kroah-Hartman Sep 28, 2022

drm/meson: Correct OSD1 global alpha value



[ Upstream commit 6836829c8ea453c9e3e518e61539e35881c8ed5f ]

VIU_OSD1_CTRL_STAT.GLOBAL_ALPHA is a 9 bit field, so the maximum
value is 0x100 not 0xff.

This matches the vendor kernel.

Signed-off-by: Stuart Menefy <stuart.menefy@mathembedded.com>
Fixes: bbbe775e ("drm: Add support for Amlogic Meson Graphic Controller")
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220908155103.686904-1-stuart.menefy@mathembedded.com


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent f1de50e1

drivers/gpu/drm/meson/meson_plane.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ static void meson_plane_atomic_update(struct drm_plane *plane,

		/* Enable OSD and BLK0, set max global alpha */
		priv->viu.osd1_ctrl_stat = OSD_ENABLE \|
		(0xFF << OSD_GLOBAL_ALPHA_SHIFT) \|
		(0x100 << OSD_GLOBAL_ALPHA_SHIFT) \|
		OSD_BLK0_ENABLE;

		canvas_id_osd1 = priv->canvas_id_osd1;