Merge "msm: mdss: add support for 565 macro tile formats" (e28a5dac) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_formats.h

+22 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -46,6 +46,25 @@ enum {
		}, \
		}

		#define FMT_RGB_565_TILE(fmt, e0, e1, e2) \
		{ \
		.format = (fmt), \
		.fetch_planes = MDSS_MDP_PLANE_INTERLEAVED, \
		.unpack_tight = 1, \
		.unpack_align_msb = 0, \
		.alpha_enable = 0, \
		.unpack_count = 3, \
		.bpp = 2, \
		.tile = 1, \
		.element = { (e0), (e1), (e2) }, \
		.bits = { \
		[C2_R_Cr] = COLOR_5BIT, \
		[C0_G_Y] = COLOR_6BIT, \
		[C1_B_Cb] = COLOR_5BIT, \
		}, \
		}


		#define FMT_RGB_888(fmt, e0, e1, e2) \
		{ \
		.format = (fmt), \
		@@ -135,6 +154,8 @@ enum {
		static struct mdss_mdp_format_params mdss_mdp_format_map[] = {
		FMT_RGB_565(MDP_RGB_565, C1_B_Cb, C0_G_Y, C2_R_Cr),
		FMT_RGB_565(MDP_BGR_565, C2_R_Cr, C0_G_Y, C1_B_Cb),
		FMT_RGB_565_TILE(MDP_RGB_565_TILE, C1_B_Cb, C0_G_Y, C2_R_Cr),
		FMT_RGB_565_TILE(MDP_BGR_565_TILE, C2_R_Cr, C0_G_Y, C1_B_Cb),
		FMT_RGB_888(MDP_RGB_888, C2_R_Cr, C0_G_Y, C1_B_Cb),
		FMT_RGB_888(MDP_BGR_888, C1_B_Cb, C0_G_Y, C2_R_Cr),

+2 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,8 @@ enum {
		MDP_XBGR_8888_TILE, /* XBGR 8888 in tile format */
		MDP_BGRX_8888_TILE, /* BGRX 8888 in tile format */
		MDP_YCBYCR_H2V1, /* YCbYCr interleave */
		MDP_RGB_565_TILE, /* RGB 565 in tile format */
		MDP_BGR_565_TILE, /* BGR 565 in tile format */
		MDP_IMGTYPE_LIMIT,
		MDP_RGB_BORDERFILL, /* border fill pipe */
		MDP_FB_FORMAT = MDP_IMGTYPE2_START, /* framebuffer format */