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

Commit 08f3267e authored by Lajos Molnar's avatar Lajos Molnar Committed by Tomi Valkeinen
Browse files

OMAPDSS: DISPC: Fix OMAP4 supported color formats 



Add missing but supported color formats for GFX pipeline in dss features:
RGBX16-4444, RGBA16-4444 and XRGB16-1555.

In dispc_ovl_set_color_mode():

- Remove unsupported modes on GFX pipeline: YUV2 and UYVY. Replace these by
  missing modes supported by GFX pipelines: RGBX16-4444 and RGBA16-4444.

- Fix swapped modes on VID pipelines: RGBX16-4444 and XRGB16-4444.

Signed-off-by: default avatarLajos Molnar <lajos@ti.com>
Signed-off-by: default avatarArchit Taneja <archit@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent dd2116a3

drivers/video/omap2/dss/dispc.c

+4 −4
Original line number Diff line number Diff line
@@ -735,11 +735,11 @@ static void dispc_ovl_set_color_mode(enum omap_plane plane, 
		switch (color_mode) {

		case OMAP_DSS_COLOR_NV12:

			m = 0x0; break;

		case OMAP_DSS_COLOR_RGB12U:

		case OMAP_DSS_COLOR_RGBX16:

			m = 0x1; break;

		case OMAP_DSS_COLOR_RGBA16:

			m = 0x2; break;

		case OMAP_DSS_COLOR_RGBX16:

		case OMAP_DSS_COLOR_RGB12U:

			m = 0x4; break;

		case OMAP_DSS_COLOR_ARGB16:

			m = 0x5; break;
@@ -788,9 +788,9 @@ static void dispc_ovl_set_color_mode(enum omap_plane plane, 
			m = 0x8; break;

		case OMAP_DSS_COLOR_RGB24P:

			m = 0x9; break;

		case OMAP_DSS_COLOR_YUV2:

		case OMAP_DSS_COLOR_RGBX16:

			m = 0xa; break;

		case OMAP_DSS_COLOR_UYVY:

		case OMAP_DSS_COLOR_RGBA16:

			m = 0xb; break;

		case OMAP_DSS_COLOR_ARGB32:

			m = 0xc; break;

drivers/video/omap2/dss/dss_features.c

+2 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ static const enum omap_color_mode omap4_dss_supported_color_modes[] = { 
	OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB24U |

	OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_ARGB32 |

	OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32 |

	OMAP_DSS_COLOR_ARGB16_1555,

	OMAP_DSS_COLOR_ARGB16_1555 | OMAP_DSS_COLOR_RGBX16 |

	OMAP_DSS_COLOR_RGBA16 | OMAP_DSS_COLOR_XRGB16_1555,



	/* OMAP_DSS_VIDEO1 */

	OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB12U |