Commit 3336f07a authored by Boris BREZILLON's avatar Boris BREZILLON Committed by Mauro Carvalho Chehab
Browse files

[media] staging: media: Make use of MEDIA_BUS_FMT_ definitions 



In order to have subsytem agnostic media bus format definitions we've
moved media bus definition to include/uapi/linux/media-bus-format.h and
prefixed values with MEDIA_BUS_FMT instead of V4L2_MBUS_FMT.

Reference new definitions in all media drivers residing in staging.

Signed-off-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 18cb5ec3

drivers/staging/media/davinci_vpfe/dm365_ipipe.c

+9 −9
Original line number Diff line number Diff line
@@ -37,15 +37,15 @@ 


/* ipipe input format's */

static const unsigned int ipipe_input_fmts[] = {

	V4L2_MBUS_FMT_UYVY8_2X8,

	V4L2_MBUS_FMT_SGRBG12_1X12,

	V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,

	V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8,

	MEDIA_BUS_FMT_UYVY8_2X8,

	MEDIA_BUS_FMT_SGRBG12_1X12,

	MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,

	MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8,

};



/* ipipe output format's */

static const unsigned int ipipe_output_fmts[] = {

	V4L2_MBUS_FMT_UYVY8_2X8,

	MEDIA_BUS_FMT_UYVY8_2X8,

};



static int ipipe_validate_lutdpc_params(struct vpfe_ipipe_lutdpc *lutdpc)
@@ -1457,7 +1457,7 @@ ipipe_try_format(struct vpfe_ipipe_device *ipipe, 


		/* If not found, use SBGGR10 as default */

		if (i >= ARRAY_SIZE(ipipe_input_fmts))

			fmt->code = V4L2_MBUS_FMT_SGRBG12_1X12;

			fmt->code = MEDIA_BUS_FMT_SGRBG12_1X12;

	} else if (pad == IPIPE_PAD_SOURCE) {

		for (i = 0; i < ARRAY_SIZE(ipipe_output_fmts); i++)

			if (fmt->code == ipipe_output_fmts[i])
@@ -1465,7 +1465,7 @@ ipipe_try_format(struct vpfe_ipipe_device *ipipe, 


		/* If not found, use UYVY as default */

		if (i >= ARRAY_SIZE(ipipe_output_fmts))

			fmt->code = V4L2_MBUS_FMT_UYVY8_2X8;

			fmt->code = MEDIA_BUS_FMT_UYVY8_2X8;

	}



	fmt->width = clamp_t(u32, fmt->width, MIN_OUT_HEIGHT, max_out_width);
@@ -1642,7 +1642,7 @@ ipipe_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
	memset(&format, 0, sizeof(format));

	format.pad = IPIPE_PAD_SINK;

	format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;

	format.format.code = V4L2_MBUS_FMT_SGRBG12_1X12;

	format.format.code = MEDIA_BUS_FMT_SGRBG12_1X12;

	format.format.width = IPIPE_MAX_OUTPUT_WIDTH_A;

	format.format.height = IPIPE_MAX_OUTPUT_HEIGHT_A;

	ipipe_set_format(sd, fh, &format);
@@ -1650,7 +1650,7 @@ ipipe_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
	memset(&format, 0, sizeof(format));

	format.pad = IPIPE_PAD_SOURCE;

	format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;

	format.format.code = V4L2_MBUS_FMT_UYVY8_2X8;

	format.format.code = MEDIA_BUS_FMT_UYVY8_2X8;

	format.format.width = IPIPE_MAX_OUTPUT_WIDTH_A;

	format.format.height = IPIPE_MAX_OUTPUT_HEIGHT_A;

	ipipe_set_format(sd, fh, &format);

drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c

+13 −13
Original line number Diff line number Diff line
@@ -196,12 +196,12 @@ ipipe_setup_resizer(void *__iomem rsz_base, struct resizer_params *params) 
		rsz_set_rsz_regs(rsz_base, RSZ_B, params);

}



static u32 ipipe_get_color_pat(enum v4l2_mbus_pixelcode pix)

static u32 ipipe_get_color_pat(u32 pix)

{

	switch (pix) {

	case V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8:

	case V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8:

	case V4L2_MBUS_FMT_SGRBG12_1X12:

	case MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8:

	case MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8:

	case MEDIA_BUS_FMT_SGRBG12_1X12:

		return ipipe_sgrbg_pattern;



	default:
@@ -211,23 +211,23 @@ static u32 ipipe_get_color_pat(enum v4l2_mbus_pixelcode pix) 


static int ipipe_get_data_path(struct vpfe_ipipe_device *ipipe)

{

	enum v4l2_mbus_pixelcode temp_pix_fmt;

	u32 temp_pix_fmt;



	switch (ipipe->formats[IPIPE_PAD_SINK].code) {

	case V4L2_MBUS_FMT_SBGGR8_1X8:

	case V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8:

	case V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8:

	case V4L2_MBUS_FMT_SGRBG12_1X12:

		temp_pix_fmt = V4L2_MBUS_FMT_SGRBG12_1X12;

	case MEDIA_BUS_FMT_SBGGR8_1X8:

	case MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8:

	case MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8:

	case MEDIA_BUS_FMT_SGRBG12_1X12:

		temp_pix_fmt = MEDIA_BUS_FMT_SGRBG12_1X12;

		break;



	default:

		temp_pix_fmt = V4L2_MBUS_FMT_UYVY8_2X8;

		temp_pix_fmt = MEDIA_BUS_FMT_UYVY8_2X8;

	}



	if (temp_pix_fmt == V4L2_MBUS_FMT_SGRBG12_1X12) {

	if (temp_pix_fmt == MEDIA_BUS_FMT_SGRBG12_1X12) {

		if (ipipe->formats[IPIPE_PAD_SOURCE].code ==

			V4L2_MBUS_FMT_SGRBG12_1X12)

			MEDIA_BUS_FMT_SGRBG12_1X12)

			return IPIPE_RAW2RAW;

		return IPIPE_RAW2YUV;

	}

drivers/staging/media/davinci_vpfe/dm365_ipipeif.c

+50 −50
Original line number Diff line number Diff line
@@ -23,42 +23,42 @@ 
#include "vpfe_mc_capture.h"



static const unsigned int ipipeif_input_fmts[] = {

	V4L2_MBUS_FMT_UYVY8_2X8,

	V4L2_MBUS_FMT_SGRBG12_1X12,

	V4L2_MBUS_FMT_Y8_1X8,

	V4L2_MBUS_FMT_UV8_1X8,

	V4L2_MBUS_FMT_YDYUYDYV8_1X16,

	V4L2_MBUS_FMT_SBGGR8_1X8,

	MEDIA_BUS_FMT_UYVY8_2X8,

	MEDIA_BUS_FMT_SGRBG12_1X12,

	MEDIA_BUS_FMT_Y8_1X8,

	MEDIA_BUS_FMT_UV8_1X8,

	MEDIA_BUS_FMT_YDYUYDYV8_1X16,

	MEDIA_BUS_FMT_SBGGR8_1X8,

};



static const unsigned int ipipeif_output_fmts[] = {

	V4L2_MBUS_FMT_UYVY8_2X8,

	V4L2_MBUS_FMT_SGRBG12_1X12,

	V4L2_MBUS_FMT_Y8_1X8,

	V4L2_MBUS_FMT_UV8_1X8,

	V4L2_MBUS_FMT_YDYUYDYV8_1X16,

	V4L2_MBUS_FMT_SBGGR8_1X8,

	V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,

	V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8,

	MEDIA_BUS_FMT_UYVY8_2X8,

	MEDIA_BUS_FMT_SGRBG12_1X12,

	MEDIA_BUS_FMT_Y8_1X8,

	MEDIA_BUS_FMT_UV8_1X8,

	MEDIA_BUS_FMT_YDYUYDYV8_1X16,

	MEDIA_BUS_FMT_SBGGR8_1X8,

	MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,

	MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8,

};



static int

ipipeif_get_pack_mode(enum v4l2_mbus_pixelcode in_pix_fmt)

ipipeif_get_pack_mode(u32 in_pix_fmt)

{

	switch (in_pix_fmt) {

	case V4L2_MBUS_FMT_SBGGR8_1X8:

	case V4L2_MBUS_FMT_Y8_1X8:

	case V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8:

	case V4L2_MBUS_FMT_UV8_1X8:

	case MEDIA_BUS_FMT_SBGGR8_1X8:

	case MEDIA_BUS_FMT_Y8_1X8:

	case MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8:

	case MEDIA_BUS_FMT_UV8_1X8:

		return IPIPEIF_5_1_PACK_8_BIT;



	case V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8:

	case MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8:

		return IPIPEIF_5_1_PACK_8_BIT_A_LAW;



	case V4L2_MBUS_FMT_SGRBG12_1X12:

	case MEDIA_BUS_FMT_SGRBG12_1X12:

		return IPIPEIF_5_1_PACK_16_BIT;



	case V4L2_MBUS_FMT_SBGGR12_1X12:

	case MEDIA_BUS_FMT_SBGGR12_1X12:

		return IPIPEIF_5_1_PACK_12_BIT;



	default:
@@ -107,8 +107,8 @@ ipipeif_get_cfg_src1(struct vpfe_ipipeif_device *ipipeif) 


	informat = &ipipeif->formats[IPIPEIF_PAD_SINK];

	if (ipipeif->input == IPIPEIF_INPUT_MEMORY &&

	   (informat->code == V4L2_MBUS_FMT_Y8_1X8 ||

	    informat->code == V4L2_MBUS_FMT_UV8_1X8))

	   (informat->code == MEDIA_BUS_FMT_Y8_1X8 ||

	    informat->code == MEDIA_BUS_FMT_UV8_1X8))

		return IPIPEIF_CCDC;



	return IPIPEIF_SRC1_PARALLEL_PORT;
@@ -122,11 +122,11 @@ ipipeif_get_data_shift(struct vpfe_ipipeif_device *ipipeif) 
	informat = &ipipeif->formats[IPIPEIF_PAD_SINK];



	switch (informat->code) {

	case V4L2_MBUS_FMT_SGRBG12_1X12:

	case MEDIA_BUS_FMT_SGRBG12_1X12:

		return IPIPEIF_5_1_BITS11_0;



	case V4L2_MBUS_FMT_Y8_1X8:

	case V4L2_MBUS_FMT_UV8_1X8:

	case MEDIA_BUS_FMT_Y8_1X8:

	case MEDIA_BUS_FMT_UV8_1X8:

		return IPIPEIF_5_1_BITS11_0;



	default:
@@ -143,7 +143,7 @@ ipipeif_get_source(struct vpfe_ipipeif_device *ipipeif) 
	if (ipipeif->input == IPIPEIF_INPUT_ISIF)

		return IPIPEIF_CCDC;



	if (informat->code == V4L2_MBUS_FMT_UYVY8_2X8)

	if (informat->code == MEDIA_BUS_FMT_UYVY8_2X8)

		return IPIPEIF_SDRAM_YUV;



	return IPIPEIF_SDRAM_RAW;
@@ -190,7 +190,7 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd) 
	struct v4l2_mbus_framefmt *informat, *outformat;

	struct ipipeif_params params = ipipeif->config;

	enum ipipeif_input_source ipipeif_source;

	enum v4l2_mbus_pixelcode isif_port_if;

	u32 isif_port_if;

	void *ipipeif_base_addr;

	unsigned int val;

	int data_shift;
@@ -268,16 +268,16 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd) 
	ipipeif_write(val, ipipeif_base_addr, IPIPEIF_INIRSZ);

	isif_port_if = informat->code;



	if (isif_port_if == V4L2_MBUS_FMT_Y8_1X8)

		isif_port_if = V4L2_MBUS_FMT_YUYV8_1X16;

	else if (isif_port_if == V4L2_MBUS_FMT_UV8_1X8)

		isif_port_if = V4L2_MBUS_FMT_SGRBG12_1X12;

	if (isif_port_if == MEDIA_BUS_FMT_Y8_1X8)

		isif_port_if = MEDIA_BUS_FMT_YUYV8_1X16;

	else if (isif_port_if == MEDIA_BUS_FMT_UV8_1X8)

		isif_port_if = MEDIA_BUS_FMT_SGRBG12_1X12;



	/* Enable DPCM decompression */

	switch (ipipeif_source) {

	case IPIPEIF_SDRAM_RAW:

		val = 0;

		if (outformat->code == V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8) {

		if (outformat->code == MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8) {

			val = 1;

			val |= (IPIPEIF_DPCM_8BIT_10BIT & 1) <<

				IPIPEIF_DPCM_BITS_SHIFT;
@@ -296,9 +296,9 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd) 
		/* configure CFG2 */

		val = ipipeif_read(ipipeif_base_addr, IPIPEIF_CFG2);

		switch (isif_port_if) {

		case V4L2_MBUS_FMT_YUYV8_1X16:

		case V4L2_MBUS_FMT_UYVY8_2X8:

		case V4L2_MBUS_FMT_Y8_1X8:

		case MEDIA_BUS_FMT_YUYV8_1X16:

		case MEDIA_BUS_FMT_UYVY8_2X8:

		case MEDIA_BUS_FMT_Y8_1X8:

			RESETBIT(val, IPIPEIF_CFG2_YUV8_SHIFT);

			SETBIT(val, IPIPEIF_CFG2_YUV16_SHIFT);

			ipipeif_write(val, ipipeif_base_addr, IPIPEIF_CFG2);
@@ -344,16 +344,16 @@ static int ipipeif_hw_setup(struct v4l2_subdev *sd) 
		val |= VPFE_PINPOL_POSITIVE << IPIPEIF_CFG2_VDPOL_SHIFT;



		switch (isif_port_if) {

		case V4L2_MBUS_FMT_YUYV8_1X16:

		case V4L2_MBUS_FMT_YUYV10_1X20:

		case MEDIA_BUS_FMT_YUYV8_1X16:

		case MEDIA_BUS_FMT_YUYV10_1X20:

			RESETBIT(val, IPIPEIF_CFG2_YUV8_SHIFT);

			SETBIT(val, IPIPEIF_CFG2_YUV16_SHIFT);

			break;



		case V4L2_MBUS_FMT_YUYV8_2X8:

		case V4L2_MBUS_FMT_UYVY8_2X8:

		case V4L2_MBUS_FMT_Y8_1X8:

		case V4L2_MBUS_FMT_YUYV10_2X10:

		case MEDIA_BUS_FMT_YUYV8_2X8:

		case MEDIA_BUS_FMT_UYVY8_2X8:

		case MEDIA_BUS_FMT_Y8_1X8:

		case MEDIA_BUS_FMT_YUYV10_2X10:

			SETBIT(val, IPIPEIF_CFG2_YUV8_SHIFT);

			SETBIT(val, IPIPEIF_CFG2_YUV16_SHIFT);

			val |= IPIPEIF_CBCR_Y << IPIPEIF_CFG2_YUV8P_SHIFT;
@@ -625,7 +625,7 @@ ipipeif_try_format(struct vpfe_ipipeif_device *ipipeif, 


		/* If not found, use SBGGR10 as default */

		if (i >= ARRAY_SIZE(ipipeif_input_fmts))

			fmt->code = V4L2_MBUS_FMT_SGRBG12_1X12;

			fmt->code = MEDIA_BUS_FMT_SGRBG12_1X12;

	} else if (pad == IPIPEIF_PAD_SOURCE) {

		for (i = 0; i < ARRAY_SIZE(ipipeif_output_fmts); i++)

			if (fmt->code == ipipeif_output_fmts[i])
@@ -633,7 +633,7 @@ ipipeif_try_format(struct vpfe_ipipeif_device *ipipeif, 


		/* If not found, use UYVY as default */

		if (i >= ARRAY_SIZE(ipipeif_output_fmts))

			fmt->code = V4L2_MBUS_FMT_UYVY8_2X8;

			fmt->code = MEDIA_BUS_FMT_UYVY8_2X8;

	}



	fmt->width = clamp_t(u32, fmt->width, MIN_OUT_HEIGHT, max_out_width);
@@ -770,7 +770,7 @@ ipipeif_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
	memset(&format, 0, sizeof(format));

	format.pad = IPIPEIF_PAD_SINK;

	format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;

	format.format.code = V4L2_MBUS_FMT_SGRBG12_1X12;

	format.format.code = MEDIA_BUS_FMT_SGRBG12_1X12;

	format.format.width = IPIPE_MAX_OUTPUT_WIDTH_A;

	format.format.height = IPIPE_MAX_OUTPUT_HEIGHT_A;

	ipipeif_set_format(sd, fh, &format);
@@ -778,7 +778,7 @@ ipipeif_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh) 
	memset(&format, 0, sizeof(format));

	format.pad = IPIPEIF_PAD_SOURCE;

	format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;

	format.format.code = V4L2_MBUS_FMT_UYVY8_2X8;

	format.format.code = MEDIA_BUS_FMT_UYVY8_2X8;

	format.format.width = IPIPE_MAX_OUTPUT_WIDTH_A;

	format.format.height = IPIPE_MAX_OUTPUT_HEIGHT_A;

	ipipeif_set_format(sd, fh, &format);
@@ -805,9 +805,9 @@ ipipeif_video_in_queue(struct vpfe_device *vpfe_dev, unsigned long addr) 
		return -EINVAL;



	switch (ipipeif->formats[IPIPEIF_PAD_SINK].code) {

	case V4L2_MBUS_FMT_Y8_1X8:

	case V4L2_MBUS_FMT_UV8_1X8:

	case V4L2_MBUS_FMT_YDYUYDYV8_1X16:

	case MEDIA_BUS_FMT_Y8_1X8:

	case MEDIA_BUS_FMT_UV8_1X8:

	case MEDIA_BUS_FMT_YDYUYDYV8_1X16:

		adofs = ipipeif->formats[IPIPEIF_PAD_SINK].width;

		break;

drivers/staging/media/davinci_vpfe/dm365_isif.c

+45 −45
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ 
#define MAX_HEIGHT	4096



static const unsigned int isif_fmts[] = {

	V4L2_MBUS_FMT_YUYV8_2X8,

	V4L2_MBUS_FMT_UYVY8_2X8,

	V4L2_MBUS_FMT_YUYV8_1X16,

	V4L2_MBUS_FMT_YUYV10_1X20,

	V4L2_MBUS_FMT_SGRBG12_1X12,

	V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8,

	V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,

	MEDIA_BUS_FMT_YUYV8_2X8,

	MEDIA_BUS_FMT_UYVY8_2X8,

	MEDIA_BUS_FMT_YUYV8_1X16,

	MEDIA_BUS_FMT_YUYV10_1X20,

	MEDIA_BUS_FMT_SGRBG12_1X12,

	MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8,

	MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,

};



#define ISIF_COLPTN_R_Ye	0x0
@@ -154,7 +154,7 @@ enum v4l2_field vpfe_isif_get_fid(struct vpfe_device *vpfe_dev) 
static int

isif_set_pixel_format(struct vpfe_isif_device *isif, unsigned int pixfmt)

{

	if (isif->formats[ISIF_PAD_SINK].code == V4L2_MBUS_FMT_SGRBG12_1X12) {

	if (isif->formats[ISIF_PAD_SINK].code == MEDIA_BUS_FMT_SGRBG12_1X12) {

		if (pixfmt == V4L2_PIX_FMT_SBGGR16)

			isif->isif_cfg.data_pack = ISIF_PACK_16BIT;

		else if ((pixfmt == V4L2_PIX_FMT_SGRBG10DPCM8) ||
@@ -184,7 +184,7 @@ static int 
isif_set_frame_format(struct vpfe_isif_device *isif,

		      enum isif_frmfmt frm_fmt)

{

	if (isif->formats[ISIF_PAD_SINK].code == V4L2_MBUS_FMT_SGRBG12_1X12)

	if (isif->formats[ISIF_PAD_SINK].code == MEDIA_BUS_FMT_SGRBG12_1X12)

		isif->isif_cfg.bayer.frm_fmt = frm_fmt;

	else

		isif->isif_cfg.ycbcr.frm_fmt = frm_fmt;
@@ -196,7 +196,7 @@ static int isif_set_image_window(struct vpfe_isif_device *isif) 
{

	struct v4l2_rect *win = &isif->crop;



	if (isif->formats[ISIF_PAD_SINK].code == V4L2_MBUS_FMT_SGRBG12_1X12) {

	if (isif->formats[ISIF_PAD_SINK].code == MEDIA_BUS_FMT_SGRBG12_1X12) {

		isif->isif_cfg.bayer.win.top = win->top;

		isif->isif_cfg.bayer.win.left = win->left;

		isif->isif_cfg.bayer.win.width = win->width;
@@ -214,7 +214,7 @@ static int isif_set_image_window(struct vpfe_isif_device *isif) 
static int

isif_set_buftype(struct vpfe_isif_device *isif, enum isif_buftype buf_type)

{

	if (isif->formats[ISIF_PAD_SINK].code == V4L2_MBUS_FMT_SGRBG12_1X12)

	if (isif->formats[ISIF_PAD_SINK].code == MEDIA_BUS_FMT_SGRBG12_1X12)

		isif->isif_cfg.bayer.buf_type = buf_type;

	else

		isif->isif_cfg.ycbcr.buf_type = buf_type;
@@ -296,7 +296,7 @@ isif_try_format(struct vpfe_isif_device *isif, struct v4l2_subdev_fh *fh, 


	/* If not found, use YUYV8_2x8 as default */

	if (i >= ARRAY_SIZE(isif_fmts))

		fmt->format.code = V4L2_MBUS_FMT_YUYV8_2X8;

		fmt->format.code = MEDIA_BUS_FMT_YUYV8_2X8;



	/* Clamp the size. */

	fmt->format.width = clamp_t(u32, width, 32, MAX_WIDTH);
@@ -429,7 +429,7 @@ static int isif_get_params(struct v4l2_subdev *sd, void *params) 
	struct vpfe_isif_device *isif = v4l2_get_subdevdata(sd);



	/* only raw module parameters can be set through the IOCTL */

	if (isif->formats[ISIF_PAD_SINK].code != V4L2_MBUS_FMT_SGRBG12_1X12)

	if (isif->formats[ISIF_PAD_SINK].code != MEDIA_BUS_FMT_SGRBG12_1X12)

		return -EINVAL;

	memcpy(params, &isif->isif_cfg.bayer.config_params,

			sizeof(isif->isif_cfg.bayer.config_params));
@@ -604,7 +604,7 @@ static int isif_set_params(struct v4l2_subdev *sd, void *params) 
	int ret = -EINVAL;



	/* only raw module parameters can be set through the IOCTL */

	if (isif->formats[ISIF_PAD_SINK].code != V4L2_MBUS_FMT_SGRBG12_1X12)

	if (isif->formats[ISIF_PAD_SINK].code != MEDIA_BUS_FMT_SGRBG12_1X12)

		return ret;



	memcpy(&isif_raw_params, params, sizeof(isif_raw_params));
@@ -1041,19 +1041,19 @@ isif_config_culling(struct vpfe_isif_device *isif, struct vpfe_isif_cul *cul) 
static int isif_get_pix_fmt(u32 mbus_code)

{

	switch (mbus_code) {

	case V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8:

	case V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8:

	case V4L2_MBUS_FMT_SGRBG12_1X12:

	case MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8:

	case MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8:

	case MEDIA_BUS_FMT_SGRBG12_1X12:

		return ISIF_PIXFMT_RAW;



	case V4L2_MBUS_FMT_YUYV8_2X8:

	case V4L2_MBUS_FMT_UYVY8_2X8:

	case V4L2_MBUS_FMT_YUYV10_2X10:

	case V4L2_MBUS_FMT_Y8_1X8:

	case MEDIA_BUS_FMT_YUYV8_2X8:

	case MEDIA_BUS_FMT_UYVY8_2X8:

	case MEDIA_BUS_FMT_YUYV10_2X10:

	case MEDIA_BUS_FMT_Y8_1X8:

		return ISIF_PIXFMT_YCBCR_8BIT;



	case V4L2_MBUS_FMT_YUYV8_1X16:

	case V4L2_MBUS_FMT_YUYV10_1X20:

	case MEDIA_BUS_FMT_YUYV8_1X16:

	case MEDIA_BUS_FMT_YUYV10_1X20:

		return ISIF_PIXFMT_YCBCR_16BIT;



	default:
@@ -1121,11 +1121,11 @@ static int isif_config_raw(struct v4l2_subdev *sd, int mode) 
	      ISIF_FRM_FMT_MASK) << ISIF_FRM_FMT_SHIFT) | ((pix_fmt &

	      ISIF_INPUT_MASK) << ISIF_INPUT_SHIFT);



	/* currently only V4L2_MBUS_FMT_SGRBG12_1X12 is

	/* currently only MEDIA_BUS_FMT_SGRBG12_1X12 is

	 * supported. shift appropriately depending on

	 * different MBUS fmt's added

	 */

	if (format->code == V4L2_MBUS_FMT_SGRBG12_1X12)

	if (format->code == MEDIA_BUS_FMT_SGRBG12_1X12)

		val |= ((VPFE_ISIF_NO_SHIFT &

			ISIF_DATASFT_MASK) << ISIF_DATASFT_SHIFT);
@@ -1154,7 +1154,7 @@ static int isif_config_raw(struct v4l2_subdev *sd, int mode) 
	/* Configure Gain & Offset */

	isif_config_gain_offset(isif);

	/* Configure Color pattern */

	if (format->code == V4L2_MBUS_FMT_SGRBG12_1X12)

	if (format->code == MEDIA_BUS_FMT_SGRBG12_1X12)

		val = isif_sgrbg_pattern;

	else

		/* default set to rggb */
@@ -1254,8 +1254,8 @@ static int isif_config_ycbcr(struct v4l2_subdev *sd, int mode) 
		  (((params->vd_pol & ISIF_VD_POL_MASK) << ISIF_VD_POL_SHIFT));

	/* pack the data to 8-bit CCDCCFG */

	switch (format->code) {

	case V4L2_MBUS_FMT_YUYV8_2X8:

	case V4L2_MBUS_FMT_UYVY8_2X8:

	case MEDIA_BUS_FMT_YUYV8_2X8:

	case MEDIA_BUS_FMT_UYVY8_2X8:

		if (pix_fmt != ISIF_PIXFMT_YCBCR_8BIT) {

			pr_debug("Invalid pix_fmt(input mode)\n");

			return -EINVAL;
@@ -1266,7 +1266,7 @@ static int isif_config_ycbcr(struct v4l2_subdev *sd, int mode) 
		ccdcfg = ccdcfg | ISIF_PACK_8BIT | ISIF_YCINSWP_YCBCR;

		break;



	case V4L2_MBUS_FMT_YUYV10_2X10:

	case MEDIA_BUS_FMT_YUYV10_2X10:

		if (pix_fmt != ISIF_PIXFMT_YCBCR_8BIT) {

			pr_debug("Invalid pix_fmt(input mode)\n");

			return -EINVAL;
@@ -1278,7 +1278,7 @@ static int isif_config_ycbcr(struct v4l2_subdev *sd, int mode) 
			ISIF_BW656_ENABLE;

		break;



	case V4L2_MBUS_FMT_YUYV10_1X20:

	case MEDIA_BUS_FMT_YUYV10_1X20:

		if (pix_fmt != ISIF_PIXFMT_YCBCR_16BIT) {

			pr_debug("Invalid pix_fmt(input mode)\n");

			return -EINVAL;
@@ -1286,7 +1286,7 @@ static int isif_config_ycbcr(struct v4l2_subdev *sd, int mode) 
		isif_write(isif->isif_cfg.base_addr, 3, REC656IF);

		break;



	case V4L2_MBUS_FMT_Y8_1X8:

	case MEDIA_BUS_FMT_Y8_1X8:

		ccdcfg |= ISIF_PACK_8BIT;

		ccdcfg |= ISIF_YCINSWP_YCBCR;

		if (pix_fmt != ISIF_PIXFMT_YCBCR_8BIT) {
@@ -1295,7 +1295,7 @@ static int isif_config_ycbcr(struct v4l2_subdev *sd, int mode) 
		}

		break;



	case V4L2_MBUS_FMT_YUYV8_1X16:

	case MEDIA_BUS_FMT_YUYV8_1X16:

		if (pix_fmt != ISIF_PIXFMT_YCBCR_16BIT) {

			pr_debug("Invalid pix_fmt(input mode)\n");

			return -EINVAL;
@@ -1313,8 +1313,8 @@ static int isif_config_ycbcr(struct v4l2_subdev *sd, int mode) 
		ISIF_PIX_ORDER_SHIFT;

	isif_write(isif->isif_cfg.base_addr, ccdcfg, CCDCFG);

	/* configure video window */

	if (format->code == V4L2_MBUS_FMT_YUYV10_1X20 ||

			format->code == V4L2_MBUS_FMT_YUYV8_1X16)

	if (format->code == MEDIA_BUS_FMT_YUYV10_1X20 ||

			format->code == MEDIA_BUS_FMT_YUYV8_1X16)

		isif_setwin(isif, &params->win, params->frm_fmt, 1, mode);

	else

		isif_setwin(isif, &params->win, params->frm_fmt, 2, mode);
@@ -1345,17 +1345,17 @@ static int isif_configure(struct v4l2_subdev *sd, int mode) 
	format = &isif->formats[ISIF_PAD_SINK];



	switch (format->code) {

	case V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8:

	case V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8:

	case V4L2_MBUS_FMT_SGRBG12_1X12:

	case MEDIA_BUS_FMT_SGRBG10_ALAW8_1X8:

	case MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8:

	case MEDIA_BUS_FMT_SGRBG12_1X12:

		return isif_config_raw(sd, mode);



	case V4L2_MBUS_FMT_YUYV8_2X8:

	case V4L2_MBUS_FMT_UYVY8_2X8:

	case V4L2_MBUS_FMT_YUYV10_2X10:

	case V4L2_MBUS_FMT_Y8_1X8:

	case V4L2_MBUS_FMT_YUYV8_1X16:

	case V4L2_MBUS_FMT_YUYV10_1X20:

	case MEDIA_BUS_FMT_YUYV8_2X8:

	case MEDIA_BUS_FMT_UYVY8_2X8:

	case MEDIA_BUS_FMT_YUYV10_2X10:

	case MEDIA_BUS_FMT_Y8_1X8:

	case MEDIA_BUS_FMT_YUYV8_1X16:

	case MEDIA_BUS_FMT_YUYV10_1X20:

		return isif_config_ycbcr(sd, mode);



	default:
@@ -1630,7 +1630,7 @@ isif_init_formats(struct v4l2_subdev *sd, 
	memset(&format, 0, sizeof(format));

	format.pad = ISIF_PAD_SINK;

	format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;

	format.format.code = V4L2_MBUS_FMT_SGRBG12_1X12;

	format.format.code = MEDIA_BUS_FMT_SGRBG12_1X12;

	format.format.width = MAX_WIDTH;

	format.format.height = MAX_HEIGHT;

	isif_set_format(sd, fh, &format);
@@ -1638,7 +1638,7 @@ isif_init_formats(struct v4l2_subdev *sd, 
	memset(&format, 0, sizeof(format));

	format.pad = ISIF_PAD_SOURCE;

	format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;

	format.format.code = V4L2_MBUS_FMT_SGRBG12_1X12;

	format.format.code = MEDIA_BUS_FMT_SGRBG12_1X12;

	format.format.width = MAX_WIDTH;

	format.format.height = MAX_HEIGHT;

	isif_set_format(sd, fh, &format);

drivers/staging/media/davinci_vpfe/dm365_resizer.c

+49 −49

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE