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

Commit 5ffff441 authored by Neil Armstrong's avatar Neil Armstrong
Browse files

drm/meson: Add support for XBGR8888 & ABGR8888 formats 



Add missing XBGR8888 & ABGR8888 formats variants from the primary plane.

Fixes: bbbe775e ("drm: Add support for Amlogic Meson Graphic Controller")
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Reviewed-by: default avatarKevin Hilman <khilman@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190429075238.7884-1-narmstrong@baylibre.com
parent fd311d88

drivers/gpu/drm/meson/meson_plane.c

+16 −0
Original line number Diff line number Diff line
@@ -153,6 +153,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,
@@ -160,6 +167,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;
@@ -344,7 +358,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,

};