Skip to contentSkip to conversation

drm/meson: Correct OSD1 global alpha value

PATCH Applied Stuart Menefy 2 participants 3 messages Sep 8, 2022 – Sep 9, 2022

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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
index d5cbc47..45088f0 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw

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 0x100 not 0xff.

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.

Fixes bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller")
Quoted 10 lines
---
  drivers/gpu/drm/meson/meson_plane.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/meson/meson_plane.c +0 -0
index d5cbc47..45088f0 100644

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 +