aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-12-12 07:40:38 -0500
committerPhilipp Zabel <p.zabel@pengutronix.de>2015-10-30 12:13:47 -0400
commitc639a1cfc4930684300860abdac5ebcb619523ea (patch)
tree8539f252d078e70fba602e523cfcddf6a7fc8a69 /drivers/gpu
parent0cb8b75792d6b752df945993cc5d455c75bf6884 (diff)
drm/imx: enable 15-bit RGB with 1-bit alpha formats
This patch enables the ARGB1555, ABGR1555, RGBA5551, and BGRA5551 formats to be used on planes. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/imx/ipuv3-plane.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index 878a643d72e4..d13dbb687f64 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -23,8 +23,12 @@
23#define to_ipu_plane(x) container_of(x, struct ipu_plane, base) 23#define to_ipu_plane(x) container_of(x, struct ipu_plane, base)
24 24
25static const uint32_t ipu_plane_formats[] = { 25static const uint32_t ipu_plane_formats[] = {
26 DRM_FORMAT_ARGB1555,
26 DRM_FORMAT_XRGB1555, 27 DRM_FORMAT_XRGB1555,
28 DRM_FORMAT_ABGR1555,
27 DRM_FORMAT_XBGR1555, 29 DRM_FORMAT_XBGR1555,
30 DRM_FORMAT_RGBA5551,
31 DRM_FORMAT_BGRA5551,
28 DRM_FORMAT_ARGB8888, 32 DRM_FORMAT_ARGB8888,
29 DRM_FORMAT_XRGB8888, 33 DRM_FORMAT_XRGB8888,
30 DRM_FORMAT_ABGR8888, 34 DRM_FORMAT_ABGR8888,
@@ -175,6 +179,10 @@ int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc,
175 ipu_dp_set_window_pos(ipu_plane->dp, crtc_x, crtc_y); 179 ipu_dp_set_window_pos(ipu_plane->dp, crtc_x, crtc_y);
176 /* Enable local alpha on partial plane */ 180 /* Enable local alpha on partial plane */
177 switch (fb->pixel_format) { 181 switch (fb->pixel_format) {
182 case DRM_FORMAT_ARGB1555:
183 case DRM_FORMAT_ABGR1555:
184 case DRM_FORMAT_RGBA5551:
185 case DRM_FORMAT_BGRA5551:
178 case DRM_FORMAT_ARGB8888: 186 case DRM_FORMAT_ARGB8888:
179 case DRM_FORMAT_ABGR8888: 187 case DRM_FORMAT_ABGR8888:
180 ipu_dp_set_global_alpha(ipu_plane->dp, false, 0, false); 188 ipu_dp_set_global_alpha(ipu_plane->dp, false, 0, false);