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

Commit f20e4220 authored by Amber Jain's avatar Amber Jain Committed by Tomi Valkeinen
Browse files

OMAP: DSS2: Add new color formats for OMAP4 



Add new color formats supported by OMAP4: NV12, RGBA16, RGBX16,
ARGB16_1555, XRGB16_1555.
NV12 color format is defined here, its support in DSS will be added separately.

Signed-off-by: default avatarAmber Jain <amber@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent ad44cc32

drivers/video/omap2/dss/dispc.c

+77 −32
Original line number Diff line number Diff line
@@ -796,7 +796,42 @@ static void _dispc_set_color_mode(enum omap_plane plane, 
		enum omap_color_mode color_mode)

{

	u32 m = 0;



	if (plane != OMAP_DSS_GFX) {

		switch (color_mode) {

		case OMAP_DSS_COLOR_NV12:

			m = 0x0; break;

		case OMAP_DSS_COLOR_RGB12U:

			m = 0x1; break;

		case OMAP_DSS_COLOR_RGBA16:

			m = 0x2; break;

		case OMAP_DSS_COLOR_RGBX16:

			m = 0x4; break;

		case OMAP_DSS_COLOR_ARGB16:

			m = 0x5; break;

		case OMAP_DSS_COLOR_RGB16:

			m = 0x6; break;

		case OMAP_DSS_COLOR_ARGB16_1555:

			m = 0x7; break;

		case OMAP_DSS_COLOR_RGB24U:

			m = 0x8; break;

		case OMAP_DSS_COLOR_RGB24P:

			m = 0x9; break;

		case OMAP_DSS_COLOR_YUV2:

			m = 0xa; break;

		case OMAP_DSS_COLOR_UYVY:

			m = 0xb; break;

		case OMAP_DSS_COLOR_ARGB32:

			m = 0xc; break;

		case OMAP_DSS_COLOR_RGBA32:

			m = 0xd; break;

		case OMAP_DSS_COLOR_RGBX32:

			m = 0xe; break;

		case OMAP_DSS_COLOR_XRGB16_1555:

			m = 0xf; break;

		default:

			BUG(); break;

		}

	} else {

		switch (color_mode) {

		case OMAP_DSS_COLOR_CLUT1:

			m = 0x0; break;
@@ -812,6 +847,8 @@ static void _dispc_set_color_mode(enum omap_plane plane, 
			m = 0x5; break;

		case OMAP_DSS_COLOR_RGB16:

			m = 0x6; break;

		case OMAP_DSS_COLOR_ARGB16_1555:

			m = 0x7; break;

		case OMAP_DSS_COLOR_RGB24U:

			m = 0x8; break;

		case OMAP_DSS_COLOR_RGB24P:
@@ -826,9 +863,12 @@ static void _dispc_set_color_mode(enum omap_plane plane, 
			m = 0xd; break;

		case OMAP_DSS_COLOR_RGBX32:

			m = 0xe; break;

		case OMAP_DSS_COLOR_XRGB16_1555:

			m = 0xf; break;

		default:

			BUG(); break;

		}

	}



	REG_FLD_MOD(DISPC_OVL_ATTRIBUTES(plane), m, 4, 1);

}
@@ -1203,12 +1243,17 @@ static int color_mode_to_bpp(enum omap_color_mode color_mode) 
	case OMAP_DSS_COLOR_CLUT4:

		return 4;

	case OMAP_DSS_COLOR_CLUT8:

	case OMAP_DSS_COLOR_NV12:

		return 8;

	case OMAP_DSS_COLOR_RGB12U:

	case OMAP_DSS_COLOR_RGB16:

	case OMAP_DSS_COLOR_ARGB16:

	case OMAP_DSS_COLOR_YUV2:

	case OMAP_DSS_COLOR_UYVY:

	case OMAP_DSS_COLOR_RGBA16:

	case OMAP_DSS_COLOR_RGBX16:

	case OMAP_DSS_COLOR_ARGB16_1555:

	case OMAP_DSS_COLOR_XRGB16_1555:

		return 16;

	case OMAP_DSS_COLOR_RGB24P:

		return 24;

drivers/video/omap2/dss/dss_features.c

+33 −2
Original line number Diff line number Diff line
@@ -177,6 +177,37 @@ static const enum omap_color_mode omap3_dss_supported_color_modes[] = { 
	OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32,

};



static const enum omap_color_mode omap4_dss_supported_color_modes[] = {

	/* OMAP_DSS_GFX */

	OMAP_DSS_COLOR_CLUT1 | OMAP_DSS_COLOR_CLUT2 |

	OMAP_DSS_COLOR_CLUT4 | OMAP_DSS_COLOR_CLUT8 |

	OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_ARGB16 |

	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_VIDEO1 */

	OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB12U |

	OMAP_DSS_COLOR_YUV2 | OMAP_DSS_COLOR_ARGB16_1555 |

	OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_NV12 |

	OMAP_DSS_COLOR_RGBA16 | OMAP_DSS_COLOR_RGB24U |

	OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_UYVY |

	OMAP_DSS_COLOR_ARGB16 | OMAP_DSS_COLOR_XRGB16_1555 |

	OMAP_DSS_COLOR_ARGB32 | OMAP_DSS_COLOR_RGBX16 |

	OMAP_DSS_COLOR_RGBX32,



       /* OMAP_DSS_VIDEO2 */

	OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB12U |

	OMAP_DSS_COLOR_YUV2 | OMAP_DSS_COLOR_ARGB16_1555 |

	OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_NV12 |

	OMAP_DSS_COLOR_RGBA16 | OMAP_DSS_COLOR_RGB24U |

	OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_UYVY |

	OMAP_DSS_COLOR_ARGB16 | OMAP_DSS_COLOR_XRGB16_1555 |

	OMAP_DSS_COLOR_ARGB32 | OMAP_DSS_COLOR_RGBX16 |

	OMAP_DSS_COLOR_RGBX32,

};



static const char * const omap2_dss_clk_source_names[] = {

	[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC]	= "N/A",

	[OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI]	= "N/A",
@@ -301,7 +332,7 @@ static const struct omap_dss_features omap4430_es1_0_dss_features = { 
	.num_mgrs = 3,

	.num_ovls = 3,

	.supported_displays = omap4_dss_supported_displays,

	.supported_color_modes = omap3_dss_supported_color_modes,

	.supported_color_modes = omap4_dss_supported_color_modes,

	.clksrc_names = omap4_dss_clk_source_names,

	.dss_params = omap4_dss_param_range,

};
@@ -321,7 +352,7 @@ static const struct omap_dss_features omap4_dss_features = { 
	.num_mgrs = 3,

	.num_ovls = 3,

	.supported_displays = omap4_dss_supported_displays,

	.supported_color_modes = omap3_dss_supported_color_modes,

	.supported_color_modes = omap4_dss_supported_color_modes,

	.clksrc_names = omap4_dss_clk_source_names,

	.dss_params = omap4_dss_param_range,

};

drivers/video/omap2/dss/manager.c

+7 −0
Original line number Diff line number Diff line
@@ -775,10 +775,17 @@ static int configure_overlay(enum omap_plane plane) 
		}



		switch (c->color_mode) {

		case OMAP_DSS_COLOR_NV12:

			bpp = 8;

			break;

		case OMAP_DSS_COLOR_RGB16:

		case OMAP_DSS_COLOR_ARGB16:

		case OMAP_DSS_COLOR_YUV2:

		case OMAP_DSS_COLOR_UYVY:

		case OMAP_DSS_COLOR_RGBA16:

		case OMAP_DSS_COLOR_RGBX16:

		case OMAP_DSS_COLOR_ARGB16_1555:

		case OMAP_DSS_COLOR_XRGB16_1555:

			bpp = 16;

			break;

include/video/omapdss.h

+5 −0
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ enum omap_color_mode { 
	OMAP_DSS_COLOR_ARGB32	= 1 << 11, /* ARGB32 */

	OMAP_DSS_COLOR_RGBA32	= 1 << 12, /* RGBA32 */

	OMAP_DSS_COLOR_RGBX32	= 1 << 13, /* RGBx32 */

	OMAP_DSS_COLOR_NV12		= 1 << 14, /* NV12 format: YUV 4:2:0 */

	OMAP_DSS_COLOR_RGBA16		= 1 << 15, /* RGBA16 - 4444 */

	OMAP_DSS_COLOR_RGBX16		= 1 << 16, /* RGBx16 - 4444 */

	OMAP_DSS_COLOR_ARGB16_1555	= 1 << 17, /* ARGB16 - 1555 */

	OMAP_DSS_COLOR_XRGB16_1555	= 1 << 18, /* xRGB16 - 1555 */

};



enum omap_lcd_display_type {