drm/meson: Correct OSD1 global alpha value
PATCH 1/1 drm/meson: Correct OSD1 global alpha value
VIU_OSD1_CTRL_STAT.GLOBAL_ALPHA is a 9 bit field, so the maximum value is 0x100 not 0xff.
This matches the vendor kernel.
--- drivers/gpu/drm/meson/meson_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/meson/meson_plane.c +1 -1
@@ -163,7 +163,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 ; priv->viu.osd1_ctrl_stat2 = readl(priv->io_base +
Signature · 7 lines
2.7.4 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Hi,
Thanks for submitting this patch !
Quoted 2 lines · Stuart Menefy
VIU_OSD1_CTRL_STAT.GLOBAL_ALPHA is a 9 bit field, so the maximum value is
0x100not0xff.
Indeed it's 9bit, but all bits to 1 would be 0x1ff then, but indeed vendor uses :
#define OSD_GLOBAL_ALPHA_DEF 0x100
Quoted 3 lines
This matches the vendor kernel.
Quoted 10 lines
Signed-off-by Stuart Menefy <[email protected]>--- drivers/gpu/drm/meson/meson_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/meson/meson_plane.c +0
-0
drivers/gpu/drm/meson/meson_plane.c static void meson_plane_atomic_update(struct drm_plane *plane, · line 169
Quoted 8 lines
drivers/gpu/drm/meson/meson_plane.c +1
-1@@ -163,7 +163,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 ; priv->viu.osd1_ctrl_stat2 = readl(priv->io_base +
Neil Armstrong
AppliedHi,
Quoted 6 lines · Stuart Menefy
VIU_OSD1_CTRL_STAT.GLOBAL_ALPHA is a 9 bit field, so the maximum value is
0x100not0xff.This matches the vendor kernel.
Thanks, Applied to https://anongit.freedesktop.org/git/drm/drm-misc.git (drm-misc-fixes)
[1/1] drm/meson: Correct OSD1 global alpha value
https://cgit.freedesktop.org/drm/drm-misc/commit/?id=6836829c8ea453c9e3e518e61539e35881c8ed5f
Signature · 1 line
Neil