drm/meson: Add support for XBGR8888 & ABGR8888 formats
PATCH 1/1 drm/meson: Add support for XBGR8888 & ABGR8888 formats
Add missing XBGR8888 & ABGR8888 formats variants from the primary plane.
Fixes bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller")
Signed-off-by Neil Armstrong <[email protected]>
--- drivers/gpu/drm/meson/meson_plane.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/meson/meson_plane.c +16 -0
@@ -165,6 +165,13 @@ static void meson_plane_atomic_update(struct drm_plane *plane, priv->viu.osd1_blk0_cfg[0 ] |=OSD_BLK_MODE_32 |OSD_COLOR_MATRIX_32_ARGB ;break ; +case DRM_FORMAT_XBGR8888 : +/* For XRGB, replace the pixel's alpha by 0xFF */ +writel_bits_relaxed (OSD_REPLACE_EN ,OSD_REPLACE_EN , + priv->io_base +_REG (VIU_OSD1_CTRL_STAT2 )); + priv->viu.osd1_blk0_cfg[0 ] |=OSD_BLK_MODE_32 | +OSD_COLOR_MATRIX_32_ABGR ; +break ;case DRM_FORMAT_ARGB8888 :/* For ARGB, use the pixel's alpha */ writel_bits_relaxed(OSD_REPLACE_EN, 0,
@@ -172,6 +179,13 @@ static void meson_plane_atomic_update(struct drm_plane *plane, priv->viu.osd1_blk0_cfg[0 ] |=OSD_BLK_MODE_32 |OSD_COLOR_MATRIX_32_ARGB ;break ; +case DRM_FORMAT_ABGR8888 : +/* For ARGB, use the pixel's alpha */ +writel_bits_relaxed (OSD_REPLACE_EN ,0 , + priv->io_base +_REG (VIU_OSD1_CTRL_STAT2 )); + priv->viu.osd1_blk0_cfg[0 ] |=OSD_BLK_MODE_32 | +OSD_COLOR_MATRIX_32_ABGR ; +break ;case DRM_FORMAT_RGB888 : priv->viu.osd1_blk0_cfg[0 ] |=OSD_BLK_MODE_24 |OSD_COLOR_MATRIX_24_RGB ;
@@ -356,7 +370,9 @@ static const struct drm_plane_funcs meson_plane_funcs = {static const uint32_t supported_drm_formats[] = {DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 ,DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 ,DRM_FORMAT_RGB888 ,DRM_FORMAT_RGB565 , };
Signature · 1 line
2.21.0
Quoted 4 lines · Neil Armstrong
Add missing XBGR8888 & ABGR8888 formats variants from the primary plane.
Fixes bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller")Signed-off-by Neil Armstrong <[email protected]>
Reviewed-by Kevin Hilman <[email protected]>
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel