From: Liu Ying <victor.liu@nxp.com>
Date: Thu, 12 Sep 2019 06:30:28 +0000 (+0800)
Subject: MLK-22600-4 drm/imx: dpu: plane: Support alpha in pixel for overlay planes
X-Git-Tag: rel_imx_4.19.35_1.1.0~43
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=dd5e9416dc69f1a47fd4dae7aa8ab4327cc0bbda;p=linux.git

MLK-22600-4 drm/imx: dpu: plane: Support alpha in pixel for overlay planes

Now that we've already got proper default blend mode support,
we may introduce alpha in pixel feature for overlay planes.

Signed-off-by: Liu Ying <victor.liu@nxp.com>
(cherry picked from commit 4881b188f809d1e3de8662dff94b1b2dfc00a62a)
---

diff --git a/drivers/gpu/drm/imx/dpu/dpu-plane.c b/drivers/gpu/drm/imx/dpu/dpu-plane.c
index f000838049b6..0292f25bf802 100644
--- a/drivers/gpu/drm/imx/dpu/dpu-plane.c
+++ b/drivers/gpu/drm/imx/dpu/dpu-plane.c
@@ -24,11 +24,7 @@
 #include "dpu-plane.h"
 #include "imx-drm.h"
 
-/*
- * RGB and packed/2planar YUV formats
- * are widely supported by many fetch units.
- */
-static const uint32_t dpu_primary_formats[] = {
+static const uint32_t dpu_formats[] = {
 	DRM_FORMAT_ARGB8888,
 	DRM_FORMAT_XRGB8888,
 	DRM_FORMAT_ABGR8888,
@@ -45,19 +41,6 @@ static const uint32_t dpu_primary_formats[] = {
 	DRM_FORMAT_NV21,
 };
 
-static const uint32_t dpu_overlay_formats[] = {
-	DRM_FORMAT_XRGB8888,
-	DRM_FORMAT_XBGR8888,
-	DRM_FORMAT_RGBX8888,
-	DRM_FORMAT_BGRX8888,
-	DRM_FORMAT_RGB565,
-
-	DRM_FORMAT_YUYV,
-	DRM_FORMAT_UYVY,
-	DRM_FORMAT_NV12,
-	DRM_FORMAT_NV21,
-};
-
 static const uint64_t dpu_format_modifiers[] = {
 	DRM_FORMAT_MOD_VIVANTE_TILED,
 	DRM_FORMAT_MOD_VIVANTE_SUPER_TILED,
@@ -875,20 +858,11 @@ struct dpu_plane *dpu_plane_init(struct drm_device *drm,
 
 	plane = &dpu_plane->base;
 
-	if (type == DRM_PLANE_TYPE_PRIMARY)
-		ret = drm_universal_plane_init(drm, plane, possible_crtcs,
-					       &dpu_plane_funcs,
-					       dpu_primary_formats,
-					       ARRAY_SIZE(dpu_primary_formats),
-					       dpu_format_modifiers,
-					       type, NULL);
-	else
-		ret = drm_universal_plane_init(drm, plane, possible_crtcs,
-					       &dpu_plane_funcs,
-					       dpu_overlay_formats,
-					       ARRAY_SIZE(dpu_overlay_formats),
-					       dpu_format_modifiers,
-					       type, NULL);
+	ret = drm_universal_plane_init(drm, plane, possible_crtcs,
+				       &dpu_plane_funcs,
+				       dpu_formats, ARRAY_SIZE(dpu_formats),
+				       dpu_format_modifiers,
+				       type, NULL);
 	if (ret)
 		goto err;