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

Commit a5606515 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: sde: add rotator pixel format to v4l2 enum ioctl" into msm-4.8

parents 86665194 b4364fab

drivers/media/v4l2-core/v4l2-ioctl.c

+78 −4
Original line number Diff line number Diff line
@@ -1244,10 +1244,84 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) 
	case V4L2_SDR_FMT_CS8:		descr = "Complex S8"; break;

	case V4L2_SDR_FMT_CS14LE:	descr = "Complex S14LE"; break;

	case V4L2_SDR_FMT_RU12LE:	descr = "Real U12LE"; break;

	case V4L2_TCH_FMT_DELTA_TD16:	descr = "16-bit signed deltas"; break;

	case V4L2_TCH_FMT_DELTA_TD08:	descr = "8-bit signed deltas"; break;

	case V4L2_TCH_FMT_TU16:		descr = "16-bit unsigned touch data"; break;

	case V4L2_TCH_FMT_TU08:		descr = "8-bit unsigned touch data"; break;

	case V4L2_PIX_FMT_NV12_UBWC:

		descr = "NV12 UBWC"; break;

	case V4L2_PIX_FMT_RGBA8888_UBWC:

		descr = "RGBA8888 UBWC"; break;

	case V4L2_PIX_FMT_SDE_ABGR_8888:

					descr = "32-bit ABGR 8-8-8-8"; break;

	case V4L2_PIX_FMT_SDE_RGBA_8888:

					descr = "32-bit RGBA 8-8-8-8"; break;

	case V4L2_PIX_FMT_SDE_RGBX_8888:

					descr = "32-bit RGBX 8-8-8-8"; break;

	case V4L2_PIX_FMT_SDE_XBGR_8888:

					descr = "32-bit XBGR 8-8-8-8"; break;

	case V4L2_PIX_FMT_SDE_RGBA_5551:

					descr = "16-bit RGBA 5-5-5-1"; break;

	case V4L2_PIX_FMT_SDE_ABGR_1555:

					descr = "16-bit ABGR 1-5-5-5"; break;

	case V4L2_PIX_FMT_SDE_BGRA_5551:

					descr = "16-bit BGRA 5-5-5-1"; break;

	case V4L2_PIX_FMT_SDE_BGRX_5551:

					descr = "16-bit BGRX 5-5-5-1"; break;

	case V4L2_PIX_FMT_SDE_RGBX_5551:

					descr = "16-bit RGBX 5-5-5-1"; break;

	case V4L2_PIX_FMT_SDE_XBGR_1555:

					descr = "16-bit XBGR 1-5-5-5"; break;

	case V4L2_PIX_FMT_SDE_RGBA_4444:

					descr = "16-bit RGBA 4-4-4-4"; break;

	case V4L2_PIX_FMT_SDE_BGRA_4444:

					descr = "16-bit BGRA 4-4-4-4"; break;

	case V4L2_PIX_FMT_SDE_ABGR_4444:

					descr = "16-bit ABGR 4-4-4-4"; break;

	case V4L2_PIX_FMT_SDE_RGBX_4444:

					descr = "16-bit RGBX 4-4-4-4"; break;

	case V4L2_PIX_FMT_SDE_BGRX_4444:

					descr = "16-bit BGRX 4-4-4-4"; break;

	case V4L2_PIX_FMT_SDE_XBGR_4444:

					descr = "16-bit XBGR 4-4-4-4"; break;

	case V4L2_PIX_FMT_SDE_BGR_565:

					descr = "16-bit BGR 5-6-5"; break;

	case V4L2_PIX_FMT_SDE_Y_CR_CB_GH2V2:

					descr = "Planar YVU 4:2:0 A16"; break;

	case V4L2_PIX_FMT_SDE_Y_CBCR_H1V2:

					descr = "Y/CbCr 4:2:2"; break;

	case V4L2_PIX_FMT_SDE_Y_CRCB_H1V2:

					descr = "Y/CrCb 4:2:2"; break;

	case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_VENUS:

					descr = "Y/CbCr 4:2:0 Venus"; break;

	case V4L2_PIX_FMT_SDE_Y_CRCB_H2V2_VENUS:

					descr = "Y/CrCb 4:2:0 Venus"; break;

	case V4L2_PIX_FMT_SDE_RGBX_8888_UBWC:

					descr = "RGBX 8:8:8:8 UBWC"; break;

	case V4L2_PIX_FMT_SDE_RGB_565_UBWC:

					descr = "RGB 5:6:5 UBWC"; break;

	case V4L2_PIX_FMT_SDE_RGBA_1010102:

					descr = "RGBA 10:10:10:2"; break;

	case V4L2_PIX_FMT_SDE_RGBX_1010102:

					descr = "RGBX 10:10:10:2"; break;

	case V4L2_PIX_FMT_SDE_ARGB_2101010:

					descr = "ARGB 2:10:10:10"; break;

	case V4L2_PIX_FMT_SDE_XRGB_2101010:

					descr = "XRGB 2:10:10:10"; break;

	case V4L2_PIX_FMT_SDE_BGRA_1010102:

					descr = "BGRA 10:10:10:2"; break;

	case V4L2_PIX_FMT_SDE_BGRX_1010102:

					descr = "BGRX 10:10:10:2"; break;

	case V4L2_PIX_FMT_SDE_ABGR_2101010:

					descr = "ABGR 2:10:10:10"; break;

	case V4L2_PIX_FMT_SDE_XBGR_2101010:

					descr = "XBGR 2:10:10:10"; break;

	case V4L2_PIX_FMT_SDE_RGBA_1010102_UBWC:

					descr = "RGBA 10:10:10:2 UBWC"; break;

	case V4L2_PIX_FMT_SDE_RGBX_1010102_UBWC:

					descr = "RGBX 10:10:10:2 UBWC"; break;

	case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_TP10:

					descr = "Y/CbCr 4:2:0 TP10"; break;

	case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010:

					descr = "Y/CbCr 4:2:0 P10"; break;

	case V4L2_PIX_FMT_NV12_TP10_UBWC:

					descr = "Y/CbCr 4:2:0 TP10 UBWC"; break;



	default:

		/* Compressed formats */

include/uapi/linux/videodev2.h

+73 −0
Original line number Diff line number Diff line
@@ -645,6 +645,79 @@ struct v4l2_pix_format { 
#define V4L2_PIX_FMT_Y12I     v4l2_fourcc('Y', '1', '2', 'I') /* Greyscale 12-bit L/R interleaved */

#define V4L2_PIX_FMT_Z16      v4l2_fourcc('Z', '1', '6', ' ') /* Depth data 16-bit */



#define V4L2_PIX_FMT_SDE_ABGR_8888 \

	v4l2_fourcc('R', 'A', '2', '4') /* 32-bit ABGR 8:8:8:8 */

#define V4L2_PIX_FMT_SDE_RGBA_8888 \

	v4l2_fourcc('A', 'B', '2', '4') /* 32-bit RGBA 8:8:8:8 */

#define V4L2_PIX_FMT_SDE_RGBX_8888 \

	v4l2_fourcc('X', 'B', '2', '4') /* 32-bit RGBX 8:8:8:8 */

#define V4L2_PIX_FMT_SDE_XBGR_8888 \

	v4l2_fourcc('R', 'X', '2', '4') /* 32-bit XBGR 8:8:8:8 */

#define V4L2_PIX_FMT_SDE_RGBA_5551 \

	v4l2_fourcc('R', 'A', '1', '5') /* 16-bit RGBA 5:5:5:1 */

#define V4L2_PIX_FMT_SDE_ABGR_1555 \

	v4l2_fourcc('A', 'B', '1', '5') /* 16-bit ABGR 1:5:5:5 */

#define V4L2_PIX_FMT_SDE_BGRA_5551 \

	v4l2_fourcc('B', 'A', '1', '5') /* 16-bit BGRA 5:5:5:1 */

#define V4L2_PIX_FMT_SDE_BGRX_5551 \

	v4l2_fourcc('B', 'X', '1', '5') /* 16-bit BGRX 5:5:5:1 */

#define V4L2_PIX_FMT_SDE_RGBX_5551 \

	v4l2_fourcc('R', 'X', '1', '5') /* 16-bit RGBX 5:5:5:1 */

#define V4L2_PIX_FMT_SDE_XBGR_1555 \

	v4l2_fourcc('X', 'B', '1', '5') /* 16-bit XBGR 1:5:5:5 */

#define V4L2_PIX_FMT_SDE_RGBA_4444 \

	v4l2_fourcc('R', 'A', '1', '2') /* 16-bit RGBA 4:4:4:4 */

#define V4L2_PIX_FMT_SDE_BGRA_4444 \

	v4l2_fourcc('b', 'A', '1', '2') /* 16-bit BGRA 4:4:4:4 */

#define V4L2_PIX_FMT_SDE_ABGR_4444 \

	v4l2_fourcc('A', 'B', '1', '2') /* 16-bit ABGR 4:4:4:4 */

#define V4L2_PIX_FMT_SDE_RGBX_4444 \

	v4l2_fourcc('R', 'X', '1', '2') /* 16-bit RGBX 4:4:4:4 */

#define V4L2_PIX_FMT_SDE_BGRX_4444 \

	v4l2_fourcc('B', 'X', '1', '2') /* 16-bit BGRX 4:4:4:4 */

#define V4L2_PIX_FMT_SDE_XBGR_4444 \

	v4l2_fourcc('X', 'B', '1', '2') /* 16-bit XBGR 4:4:4:4 */

#define V4L2_PIX_FMT_SDE_BGR_565 \

	v4l2_fourcc('B', 'G', '1', '6') /* 16-bit BGR 5:6:5 */

#define V4L2_PIX_FMT_SDE_Y_CR_CB_GH2V2 \

	v4l2_fourcc('Y', 'U', '4', '2') /* Planar YVU 4:2:0 A16 */

#define V4L2_PIX_FMT_SDE_Y_CBCR_H1V2 \

	v4l2_fourcc('N', 'H', '1', '6') /* Y/CbCr 4:2:2 */

#define V4L2_PIX_FMT_SDE_Y_CRCB_H1V2 \

	v4l2_fourcc('N', 'H', '6', '1') /* Y/CrCb 4:2:2 */

#define V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_VENUS \

	v4l2_fourcc('Q', 'N', 'V', '2') /* Y/CbCr 4:2:0 Venus */

#define V4L2_PIX_FMT_SDE_Y_CRCB_H2V2_VENUS \

	v4l2_fourcc('Q', 'N', 'V', '1') /* Y/CrCb 4:2:0 Venus */

#define V4L2_PIX_FMT_SDE_RGBX_8888_UBWC \

	v4l2_fourcc('Q', 'X', 'B', '4') /* RGBX 8:8:8:8 UBWC */

#define V4L2_PIX_FMT_SDE_RGB_565_UBWC \

	v4l2_fourcc('Q', 'R', 'G', '6') /* RGB 5:6:5 UBWC */

#define V4L2_PIX_FMT_SDE_RGBA_1010102 \

	v4l2_fourcc('A', 'B', '3', '0') /* RGBA 10:10:10:2 */

#define V4L2_PIX_FMT_SDE_RGBX_1010102 \

	v4l2_fourcc('X', 'B', '3', '0') /* RGBX 10:10:10:2 */

#define V4L2_PIX_FMT_SDE_ARGB_2101010 \

	v4l2_fourcc('A', 'R', '3', '0') /* ARGB 2:10:10:10 */

#define V4L2_PIX_FMT_SDE_XRGB_2101010 \

	v4l2_fourcc('X', 'R', '3', '0') /* XRGB 2:10:10:10 */

#define V4L2_PIX_FMT_SDE_BGRA_1010102 \

	v4l2_fourcc('B', 'A', '3', '0') /* BGRA 10:10:10:2 */

#define V4L2_PIX_FMT_SDE_BGRX_1010102 \

	v4l2_fourcc('B', 'X', '3', '0') /* BGRX 10:10:10:2 */

#define V4L2_PIX_FMT_SDE_ABGR_2101010 \

	v4l2_fourcc('R', 'A', '3', '0') /* ABGR 2:10:10:10 */

#define V4L2_PIX_FMT_SDE_XBGR_2101010 \

	v4l2_fourcc('R', 'X', '3', '0') /* XBGR 2:10:10:10 */

#define V4L2_PIX_FMT_SDE_RGBA_1010102_UBWC \

	v4l2_fourcc('Q', 'R', 'B', 'A') /* RGBA 10:10:10:2 UBWC */

#define V4L2_PIX_FMT_SDE_RGBX_1010102_UBWC \

	v4l2_fourcc('Q', 'X', 'B', 'A') /* RGBX 10:10:10:2 UBWC */

#define V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_TP10 \

	v4l2_fourcc('T', 'P', '1', '0') /* Y/CbCr 4:2:0 TP10 */

#define V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010 \

	v4l2_fourcc('P', '0', '1', '0') /* Y/CbCr 4:2:0 P10 */



/* SDR formats - used only for Software Defined Radio devices */

#define V4L2_SDR_FMT_CU8          v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */

#define V4L2_SDR_FMT_CU16LE       v4l2_fourcc('C', 'U', '1', '6') /* IQ u16le */

include/uapi/media/msm_sde_rotator.h

+36 −36
Original line number Diff line number Diff line
@@ -8,60 +8,60 @@ 
/* SDE Rotator pixel format definitions */

#define SDE_PIX_FMT_XRGB_8888		V4L2_PIX_FMT_XBGR32

#define SDE_PIX_FMT_ARGB_8888		V4L2_PIX_FMT_ABGR32

#define SDE_PIX_FMT_ABGR_8888		v4l2_fourcc('R', 'A', '2', '4')

#define SDE_PIX_FMT_RGBA_8888		v4l2_fourcc('A', 'B', '2', '4')

#define SDE_PIX_FMT_ABGR_8888		V4L2_PIX_FMT_SDE_ABGR_8888

#define SDE_PIX_FMT_RGBA_8888		V4L2_PIX_FMT_SDE_RGBA_8888

#define SDE_PIX_FMT_BGRA_8888		V4L2_PIX_FMT_ARGB32

#define SDE_PIX_FMT_RGBX_8888		v4l2_fourcc('X', 'B', '2', '4')

#define SDE_PIX_FMT_RGBX_8888		V4L2_PIX_FMT_SDE_RGBX_8888

#define SDE_PIX_FMT_BGRX_8888		V4L2_PIX_FMT_XRGB32

#define SDE_PIX_FMT_XBGR_8888		v4l2_fourcc('R', 'X', '2', '4')

#define SDE_PIX_FMT_RGBA_5551		v4l2_fourcc('R', 'A', '1', '5')

#define SDE_PIX_FMT_XBGR_8888		V4L2_PIX_FMT_SDE_XBGR_8888

#define SDE_PIX_FMT_RGBA_5551		V4L2_PIX_FMT_SDE_RGBA_5551

#define SDE_PIX_FMT_ARGB_1555		V4L2_PIX_FMT_ARGB555

#define SDE_PIX_FMT_ABGR_1555		v4l2_fourcc('A', 'B', '1', '5')

#define SDE_PIX_FMT_BGRA_5551		v4l2_fourcc('B', 'A', '1', '5')

#define SDE_PIX_FMT_BGRX_5551		v4l2_fourcc('B', 'X', '1', '5')

#define SDE_PIX_FMT_RGBX_5551		v4l2_fourcc('R', 'X', '1', '5')

#define SDE_PIX_FMT_XBGR_1555		v4l2_fourcc('X', 'B', '1', '5')

#define SDE_PIX_FMT_ABGR_1555		V4L2_PIX_FMT_SDE_ABGR_1555

#define SDE_PIX_FMT_BGRA_5551		V4L2_PIX_FMT_SDE_BGRA_5551

#define SDE_PIX_FMT_BGRX_5551		V4L2_PIX_FMT_SDE_BGRX_5551

#define SDE_PIX_FMT_RGBX_5551		V4L2_PIX_FMT_SDE_RGBX_5551

#define SDE_PIX_FMT_XBGR_1555		V4L2_PIX_FMT_SDE_XBGR_1555

#define SDE_PIX_FMT_XRGB_1555		V4L2_PIX_FMT_XRGB555

#define SDE_PIX_FMT_ARGB_4444		V4L2_PIX_FMT_ARGB444

#define SDE_PIX_FMT_RGBA_4444		v4l2_fourcc('R', 'A', '1', '2')

#define SDE_PIX_FMT_BGRA_4444		v4l2_fourcc('b', 'A', '1', '2')

#define SDE_PIX_FMT_ABGR_4444		v4l2_fourcc('A', 'B', '1', '2')

#define SDE_PIX_FMT_RGBX_4444		v4l2_fourcc('R', 'X', '1', '2')

#define SDE_PIX_FMT_RGBA_4444		V4L2_PIX_FMT_SDE_RGBA_4444

#define SDE_PIX_FMT_BGRA_4444		V4L2_PIX_FMT_SDE_BGRA_4444

#define SDE_PIX_FMT_ABGR_4444		V4L2_PIX_FMT_SDE_ABGR_4444

#define SDE_PIX_FMT_RGBX_4444		V4L2_PIX_FMT_SDE_RGBX_4444

#define SDE_PIX_FMT_XRGB_4444		V4L2_PIX_FMT_XRGB444

#define SDE_PIX_FMT_BGRX_4444		v4l2_fourcc('B', 'X', '1', '2')

#define SDE_PIX_FMT_XBGR_4444		v4l2_fourcc('X', 'B', '1', '2')

#define SDE_PIX_FMT_BGRX_4444		V4L2_PIX_FMT_SDE_BGRX_4444

#define SDE_PIX_FMT_XBGR_4444		V4L2_PIX_FMT_SDE_XBGR_4444

#define SDE_PIX_FMT_RGB_888		V4L2_PIX_FMT_RGB24

#define SDE_PIX_FMT_BGR_888		V4L2_PIX_FMT_BGR24

#define SDE_PIX_FMT_RGB_565		V4L2_PIX_FMT_RGB565

#define SDE_PIX_FMT_BGR_565		v4l2_fourcc('B', 'G', '1', '6')

#define SDE_PIX_FMT_BGR_565		V4L2_PIX_FMT_SDE_BGR_565

#define SDE_PIX_FMT_Y_CB_CR_H2V2	V4L2_PIX_FMT_YUV420

#define SDE_PIX_FMT_Y_CR_CB_H2V2	V4L2_PIX_FMT_YVU420

#define SDE_PIX_FMT_Y_CR_CB_GH2V2	v4l2_fourcc('Y', 'U', '4', '2')

#define SDE_PIX_FMT_Y_CR_CB_GH2V2	V4L2_PIX_FMT_SDE_Y_CR_CB_GH2V2

#define SDE_PIX_FMT_Y_CBCR_H2V2		V4L2_PIX_FMT_NV12

#define SDE_PIX_FMT_Y_CRCB_H2V2		V4L2_PIX_FMT_NV21

#define SDE_PIX_FMT_Y_CBCR_H1V2		v4l2_fourcc('N', 'H', '1', '6')

#define SDE_PIX_FMT_Y_CRCB_H1V2		v4l2_fourcc('N', 'H', '6', '1')

#define SDE_PIX_FMT_Y_CBCR_H1V2		V4L2_PIX_FMT_SDE_Y_CBCR_H1V2

#define SDE_PIX_FMT_Y_CRCB_H1V2		V4L2_PIX_FMT_SDE_Y_CRCB_H1V2

#define SDE_PIX_FMT_Y_CBCR_H2V1		V4L2_PIX_FMT_NV16

#define SDE_PIX_FMT_Y_CRCB_H2V1		V4L2_PIX_FMT_NV61

#define SDE_PIX_FMT_YCBYCR_H2V1		V4L2_PIX_FMT_YUYV

#define SDE_PIX_FMT_Y_CBCR_H2V2_VENUS	v4l2_fourcc('Q', 'N', 'V', '2')

#define SDE_PIX_FMT_Y_CRCB_H2V2_VENUS	v4l2_fourcc('Q', 'N', 'V', '1')

#define SDE_PIX_FMT_Y_CBCR_H2V2_VENUS	V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_VENUS

#define SDE_PIX_FMT_Y_CRCB_H2V2_VENUS	V4L2_PIX_FMT_SDE_Y_CRCB_H2V2_VENUS

#define SDE_PIX_FMT_RGBA_8888_UBWC	V4L2_PIX_FMT_RGBA8888_UBWC

#define SDE_PIX_FMT_RGBX_8888_UBWC	v4l2_fourcc('Q', 'X', 'B', '4')

#define SDE_PIX_FMT_RGB_565_UBWC	v4l2_fourcc('Q', 'R', 'G', '6')

#define SDE_PIX_FMT_RGBX_8888_UBWC	V4L2_PIX_FMT_SDE_RGBX_8888_UBWC

#define SDE_PIX_FMT_RGB_565_UBWC	V4L2_PIX_FMT_SDE_RGB_565_UBWC

#define SDE_PIX_FMT_Y_CBCR_H2V2_UBWC	V4L2_PIX_FMT_NV12_UBWC

#define SDE_PIX_FMT_RGBA_1010102	v4l2_fourcc('A', 'B', '3', '0')

#define SDE_PIX_FMT_RGBX_1010102	v4l2_fourcc('X', 'B', '3', '0')

#define SDE_PIX_FMT_ARGB_2101010	v4l2_fourcc('A', 'R', '3', '0')

#define SDE_PIX_FMT_XRGB_2101010	v4l2_fourcc('X', 'R', '3', '0')

#define SDE_PIX_FMT_BGRA_1010102	v4l2_fourcc('B', 'A', '3', '0')

#define SDE_PIX_FMT_BGRX_1010102	v4l2_fourcc('B', 'X', '3', '0')

#define SDE_PIX_FMT_ABGR_2101010	v4l2_fourcc('R', 'A', '3', '0')

#define SDE_PIX_FMT_XBGR_2101010	v4l2_fourcc('R', 'X', '3', '0')

#define SDE_PIX_FMT_RGBA_1010102_UBWC	v4l2_fourcc('Q', 'R', 'B', 'A')

#define SDE_PIX_FMT_RGBX_1010102_UBWC	v4l2_fourcc('Q', 'X', 'B', 'A')

#define SDE_PIX_FMT_Y_CBCR_H2V2_P010	v4l2_fourcc('P', '0', '1', '0')

#define SDE_PIX_FMT_Y_CBCR_H2V2_TP10	v4l2_fourcc('T', 'P', '1', '0')

#define SDE_PIX_FMT_RGBA_1010102	V4L2_PIX_FMT_SDE_RGBA_1010102

#define SDE_PIX_FMT_RGBX_1010102	V4L2_PIX_FMT_SDE_RGBX_1010102

#define SDE_PIX_FMT_ARGB_2101010	V4L2_PIX_FMT_SDE_ARGB_2101010

#define SDE_PIX_FMT_XRGB_2101010	V4L2_PIX_FMT_SDE_XRGB_2101010

#define SDE_PIX_FMT_BGRA_1010102	V4L2_PIX_FMT_SDE_BGRA_1010102

#define SDE_PIX_FMT_BGRX_1010102	V4L2_PIX_FMT_SDE_BGRX_1010102

#define SDE_PIX_FMT_ABGR_2101010	V4L2_PIX_FMT_SDE_ABGR_2101010

#define SDE_PIX_FMT_XBGR_2101010	V4L2_PIX_FMT_SDE_XBGR_2101010

#define SDE_PIX_FMT_RGBA_1010102_UBWC	V4L2_PIX_FMT_SDE_RGBA_1010102_UBWC

#define SDE_PIX_FMT_RGBX_1010102_UBWC	V4L2_PIX_FMT_SDE_RGBX_1010102_UBWC

#define SDE_PIX_FMT_Y_CBCR_H2V2_P010	V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010

#define SDE_PIX_FMT_Y_CBCR_H2V2_TP10	V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_TP10

#define SDE_PIX_FMT_Y_CBCR_H2V2_TP10_UBWC	V4L2_PIX_FMT_NV12_TP10_UBWC



/*