Commit f7134e45 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: imx: imx7-media-csi: Set the MIPI data type based on the bus code 



The MIPI CSI-2 data type depends solely on the media bus code on the
sink pad. Deriving it from the pixel format is confusing. Simplify the
code.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent df221c96

drivers/staging/media/imx/imx7-media-csi.c

+39 −25
Original line number Diff line number Diff line
@@ -482,7 +482,6 @@ static void imx7_csi_configure(struct imx7_csi *csi) 
{

	struct imx_media_video_dev *vdev = csi->vdev;

	struct v4l2_pix_format *out_pix = &vdev->fmt;

	__u32 in_code = csi->format_mbus[IMX7_CSI_PAD_SINK].code;

	u32 cr1, cr18;

	int width = out_pix->width;
@@ -518,37 +517,52 @@ static void imx7_csi_configure(struct imx7_csi *csi) 
	cr18 &= BIT_MIPI_DATA_FORMAT_MASK;

	cr18 |= BIT_DATA_FROM_MIPI;



	switch (out_pix->pixelformat) {

	case V4L2_PIX_FMT_UYVY:

	case V4L2_PIX_FMT_YUYV:

		cr18 |= BIT_MIPI_DATA_FORMAT_YUV422_8B;

		break;

	case V4L2_PIX_FMT_GREY:

		if (in_code == MEDIA_BUS_FMT_Y8_1X8)

	switch (csi->format_mbus[IMX7_CSI_PAD_SINK].code) {

	case MEDIA_BUS_FMT_Y8_1X8:

	case MEDIA_BUS_FMT_SBGGR8_1X8:

	case MEDIA_BUS_FMT_SGBRG8_1X8:

	case MEDIA_BUS_FMT_SGRBG8_1X8:

	case MEDIA_BUS_FMT_SRGGB8_1X8:

		cr18 |= BIT_MIPI_DATA_FORMAT_RAW8;

		else if (in_code == MEDIA_BUS_FMT_Y10_1X10)

			cr18 |= BIT_MIPI_DATA_FORMAT_RAW10;

		else

			cr18 |= BIT_MIPI_DATA_FORMAT_RAW12;

		break;

	case V4L2_PIX_FMT_Y10:

	case MEDIA_BUS_FMT_Y10_1X10:

	case MEDIA_BUS_FMT_SBGGR10_1X10:

	case MEDIA_BUS_FMT_SGBRG10_1X10:

	case MEDIA_BUS_FMT_SGRBG10_1X10:

	case MEDIA_BUS_FMT_SRGGB10_1X10:

		cr18 |= BIT_MIPI_DATA_FORMAT_RAW10;

		cr1 |= BIT_PIXEL_BIT;

		break;

	case V4L2_PIX_FMT_Y12:

	case MEDIA_BUS_FMT_Y12_1X12:

	case MEDIA_BUS_FMT_SBGGR12_1X12:

	case MEDIA_BUS_FMT_SGBRG12_1X12:

	case MEDIA_BUS_FMT_SGRBG12_1X12:

	case MEDIA_BUS_FMT_SRGGB12_1X12:

		cr18 |= BIT_MIPI_DATA_FORMAT_RAW12;

		cr1 |= BIT_PIXEL_BIT;

		break;

	case V4L2_PIX_FMT_SBGGR8:

		cr18 |= BIT_MIPI_DATA_FORMAT_RAW8;

	case MEDIA_BUS_FMT_Y14_1X14:

	case MEDIA_BUS_FMT_SBGGR14_1X14:

	case MEDIA_BUS_FMT_SGBRG14_1X14:

	case MEDIA_BUS_FMT_SGRBG14_1X14:

	case MEDIA_BUS_FMT_SRGGB14_1X14:

		cr18 |= BIT_MIPI_DATA_FORMAT_RAW14;

		break;

	/*

	 * CSI-2 sources are supposed to use the 1X16 formats, but not all of

	 * them comply. Support both variants.

	 */

	case MEDIA_BUS_FMT_UYVY8_2X8:

	case MEDIA_BUS_FMT_UYVY8_1X16:

	case MEDIA_BUS_FMT_YUYV8_2X8:

	case MEDIA_BUS_FMT_YUYV8_1X16:

		cr18 |= BIT_MIPI_DATA_FORMAT_YUV422_8B;

		break;

	}



	switch (out_pix->pixelformat) {

	case V4L2_PIX_FMT_Y10:

	case V4L2_PIX_FMT_Y12:

	case V4L2_PIX_FMT_SBGGR8:

	case V4L2_PIX_FMT_SBGGR16:

		if (in_code == MEDIA_BUS_FMT_SBGGR10_1X10)

			cr18 |= BIT_MIPI_DATA_FORMAT_RAW10;

		else if (in_code == MEDIA_BUS_FMT_SBGGR12_1X12)

			cr18 |= BIT_MIPI_DATA_FORMAT_RAW12;

		else if (in_code == MEDIA_BUS_FMT_SBGGR14_1X14)

			cr18 |= BIT_MIPI_DATA_FORMAT_RAW14;

		cr1 |= BIT_PIXEL_BIT;

		break;

	}