tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

msm: mdp: Add support for RGBX 8888 image format.

Signed-off-by: Dima Zavin <dima@android.com>
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>

authored by

Dima Zavin and committed by
David Brown a8d380f3 b0a67932

+10 -1
+8 -1
drivers/video/msm/mdp_hw.h
··· 449 449 #define PPP_CFG_MDP_XRGB_8888(dir) PPP_CFG_MDP_ARGB_8888(dir) 450 450 #define PPP_CFG_MDP_RGBA_8888(dir) PPP_CFG_MDP_ARGB_8888(dir) 451 451 #define PPP_CFG_MDP_BGRA_8888(dir) PPP_CFG_MDP_ARGB_8888(dir) 452 + #define PPP_CFG_MDP_RGBX_8888(dir) PPP_CFG_MDP_ARGB_8888(dir) 452 453 453 454 #define PPP_CFG_MDP_Y_CBCR_H2V2(dir) (PPP_##dir##_C2R_8BIT | \ 454 455 PPP_##dir##_C0G_8BIT | \ ··· 495 494 MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_B, CLR_G, CLR_R, 8) 496 495 #define PPP_PACK_PATTERN_MDP_BGRA_8888 \ 497 496 MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_R, CLR_G, CLR_B, 8) 497 + #define PPP_PACK_PATTERN_MDP_RGBX_8888 \ 498 + MDP_GET_PACK_PATTERN(CLR_ALPHA, CLR_B, CLR_G, CLR_R, 8) 498 499 #define PPP_PACK_PATTERN_MDP_Y_CBCR_H2V1 \ 499 500 MDP_GET_PACK_PATTERN(0, 0, CLR_CB, CLR_CR, 8) 500 501 #define PPP_PACK_PATTERN_MDP_Y_CBCR_H2V2 PPP_PACK_PATTERN_MDP_Y_CBCR_H2V1 ··· 512 509 #define PPP_CHROMA_SAMP_MDP_ARGB_8888(dir) PPP_OP_##dir##_CHROMA_RGB 513 510 #define PPP_CHROMA_SAMP_MDP_RGBA_8888(dir) PPP_OP_##dir##_CHROMA_RGB 514 511 #define PPP_CHROMA_SAMP_MDP_BGRA_8888(dir) PPP_OP_##dir##_CHROMA_RGB 512 + #define PPP_CHROMA_SAMP_MDP_RGBX_8888(dir) PPP_OP_##dir##_CHROMA_RGB 515 513 #define PPP_CHROMA_SAMP_MDP_Y_CBCR_H2V1(dir) PPP_OP_##dir##_CHROMA_H2V1 516 514 #define PPP_CHROMA_SAMP_MDP_Y_CBCR_H2V2(dir) PPP_OP_##dir##_CHROMA_420 517 515 #define PPP_CHROMA_SAMP_MDP_Y_CRCB_H2V1(dir) PPP_OP_##dir##_CHROMA_H2V1 ··· 527 523 [MDP_ARGB_8888] = PPP_##name##_MDP_ARGB_8888,\ 528 524 [MDP_RGBA_8888] = PPP_##name##_MDP_RGBA_8888,\ 529 525 [MDP_BGRA_8888] = PPP_##name##_MDP_BGRA_8888,\ 526 + [MDP_RGBX_8888] = PPP_##name##_MDP_RGBX_8888,\ 530 527 [MDP_Y_CBCR_H2V1] = PPP_##name##_MDP_Y_CBCR_H2V1,\ 531 528 [MDP_Y_CBCR_H2V2] = PPP_##name##_MDP_Y_CBCR_H2V2,\ 532 529 [MDP_Y_CRCB_H2V1] = PPP_##name##_MDP_Y_CRCB_H2V1,\ ··· 541 536 [MDP_ARGB_8888] = PPP_##name##_MDP_ARGB_8888(dir),\ 542 537 [MDP_RGBA_8888] = PPP_##name##_MDP_RGBA_8888(dir),\ 543 538 [MDP_BGRA_8888] = PPP_##name##_MDP_BGRA_8888(dir),\ 539 + [MDP_RGBX_8888] = PPP_##name##_MDP_RGBX_8888(dir),\ 544 540 [MDP_Y_CBCR_H2V1] = PPP_##name##_MDP_Y_CBCR_H2V1(dir),\ 545 541 [MDP_Y_CBCR_H2V2] = PPP_##name##_MDP_Y_CBCR_H2V2(dir),\ 546 542 [MDP_Y_CRCB_H2V1] = PPP_##name##_MDP_Y_CRCB_H2V1(dir),\ ··· 553 547 (img == MDP_YCRYCB_H2V1)) 554 548 #define IS_RGB(img) ((img == MDP_RGB_565) | (img == MDP_RGB_888) | \ 555 549 (img == MDP_ARGB_8888) | (img == MDP_RGBA_8888) | \ 556 - (img == MDP_XRGB_8888) | (img == MDP_BGRA_8888)) 550 + (img == MDP_XRGB_8888) | (img == MDP_BGRA_8888) | \ 551 + (img == MDP_RGBX_8888)) 557 552 #define HAS_ALPHA(img) ((img == MDP_ARGB_8888) | (img == MDP_RGBA_8888) | \ 558 553 (img == MDP_BGRA_8888)) 559 554
+1
drivers/video/msm/mdp_ppp.c
··· 69 69 [MDP_ARGB_8888] = 4, 70 70 [MDP_RGBA_8888] = 4, 71 71 [MDP_BGRA_8888] = 4, 72 + [MDP_RGBX_8888] = 4, 72 73 [MDP_Y_CBCR_H2V1] = 1, 73 74 [MDP_Y_CBCR_H2V2] = 1, 74 75 [MDP_Y_CRCB_H2V1] = 1,
+1
include/linux/msm_mdp.h
··· 32 32 MDP_Y_CBCR_H2V1, /* Y and CrCb, pseduo planar w/ Cr is in MSB */ 33 33 MDP_RGBA_8888, /* ARGB 888 */ 34 34 MDP_BGRA_8888, /* ABGR 888 */ 35 + MDP_RGBX_8888, /* RGBX 888 */ 35 36 MDP_IMGTYPE_LIMIT /* Non valid image type after this enum */ 36 37 }; 37 38