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

Commit 08f56940 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mdss: ppp: Add support for MDP_BGRX_8888 in mdp3 ppp"

parents 32bb8330 f8400384

drivers/video/msm/mdss/mdp3_ppp.c

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ static const bool valid_fmt[MDP_IMGTYPE_LIMIT] = { 
	[MDP_YCRYCB_H2V1] = true,

	[MDP_Y_CBCR_H2V1] = true,

	[MDP_Y_CRCB_H2V1] = true,

	[MDP_BGRX_8888] = true,

};



#define MAX_LIST_WINDOW 16

drivers/video/msm/mdss/mdp3_ppp_data.c

+7 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ const uint32_t src_cfg_lut[MDP_IMGTYPE_LIMIT] = { 
	[MDP_YCRYCB_H2V1] = MDP_YCRYCB_H2V1_SRC_REG,

	[MDP_Y_CBCR_H2V1] = MDP_Y_CRCB_H2V1_SRC_REG,

	[MDP_Y_CRCB_H2V1] = MDP_Y_CRCB_H2V1_SRC_REG,

	[MDP_BGRX_8888] = MDP_RGBX_8888_SRC_REG,

};



const uint32_t out_cfg_lut[MDP_IMGTYPE_LIMIT] = {
@@ -55,6 +56,7 @@ const uint32_t out_cfg_lut[MDP_IMGTYPE_LIMIT] = { 
	[MDP_YCRYCB_H2V1] = MDP_YCRYCB_H2V1_DST_REG,

	[MDP_Y_CBCR_H2V1] = MDP_Y_CRCB_H2V1_DST_REG,

	[MDP_Y_CRCB_H2V1] = MDP_Y_CRCB_H2V1_DST_REG,

	[MDP_BGRX_8888] = MDP_RGBX_8888_DST_REG,

};



const uint32_t pack_patt_lut[MDP_IMGTYPE_LIMIT] = {
@@ -62,8 +64,8 @@ const uint32_t pack_patt_lut[MDP_IMGTYPE_LIMIT] = { 
	[MDP_BGR_565] = PPP_GET_PACK_PATTERN(0, CLR_B, CLR_G, CLR_R, 8),

	[MDP_RGB_888] = PPP_GET_PACK_PATTERN(0, CLR_R, CLR_G, CLR_B, 8),

	[MDP_BGR_888] = PPP_GET_PACK_PATTERN(0, CLR_B, CLR_G, CLR_R, 8),

	[MDP_BGRA_8888] = PPP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R,

		CLR_G, CLR_B, 8),

	[MDP_BGRA_8888] = PPP_GET_PACK_PATTERN(CLR_ALPHA, CLR_B,

		CLR_G, CLR_R, 8),

	[MDP_RGBA_8888] = PPP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R,

		CLR_G, CLR_B, 8),

	[MDP_ARGB_8888] = PPP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R,
@@ -82,6 +84,8 @@ const uint32_t pack_patt_lut[MDP_IMGTYPE_LIMIT] = { 
		CLR_CR, CLR_Y, CLR_CB, 8),

	[MDP_Y_CBCR_H2V1] = PPP_GET_PACK_PATTERN(0, 0, CLR_CB, CLR_CR, 8),

	[MDP_Y_CRCB_H2V1] = PPP_GET_PACK_PATTERN(0, 0, CLR_CR, CLR_CB, 8),

	[MDP_BGRX_8888] = PPP_GET_PACK_PATTERN(CLR_ALPHA, CLR_B,

		CLR_G, CLR_R, 8),

};



const uint32_t dst_op_reg[MDP_IMGTYPE_LIMIT] = {
@@ -121,6 +125,7 @@ const uint32_t bytes_per_pixel[MDP_IMGTYPE_LIMIT] = { 
	[MDP_Y_CRCB_H2V1] = 1,

	[MDP_Y_CRCB_H2V2] = 1,

	[MDP_YCRYCB_H2V1] = 2,

	[MDP_BGRX_8888] = 4,

};



const bool per_pixel_alpha[MDP_IMGTYPE_LIMIT] = {

drivers/video/msm/mdss/mdp3_ppp_hwio.c

+1 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ bool check_if_rgb(int color) 
	case MDP_ARGB_8888:

	case MDP_XRGB_8888:

	case MDP_RGBX_8888:

	case MDP_BGRX_8888:

		rgb = true;

	default:

		break;