Commit fb1f6ae6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: remove format duplication at mbus->fourcc table 



This table used to be used also to translate between ia_css
abstraction and V4L2 fourcc codes.

This was removed on a past patch, but the table now contains
two fields with identical values.

Get rid of one of them.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 4e86bde2

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -5026,7 +5026,7 @@ static inline int atomisp_set_sensor_mipi_to_isp( 
			 mipi_info->input_format);

			 mipi_info->input_format);

		if (!fc)

		if (!fc)

			return -EINVAL;

			return -EINVAL;

		input_format = fc->css_stream_fmt;

		input_format = fc->atomisp_in_fmt;

	} else {

	} else {

		struct v4l2_mbus_framefmt *sink;

		struct v4l2_mbus_framefmt *sink;
@@ -5036,7 +5036,7 @@ static inline int atomisp_set_sensor_mipi_to_isp( 
		fc = atomisp_find_in_fmt_conv(sink->code);

		fc = atomisp_find_in_fmt_conv(sink->code);

		if (!fc)

		if (!fc)

			return -EINVAL;

			return -EINVAL;

		input_format = fc->css_stream_fmt;

		input_format = fc->atomisp_in_fmt;

		bayer_order = fc->bayer_order;

		bayer_order = fc->bayer_order;

	}

	}
@@ -5047,7 +5047,7 @@ static inline int atomisp_set_sensor_mipi_to_isp( 
		 mipi_info->metadata_format);

		 mipi_info->metadata_format);

	if (!fc)

	if (!fc)

		return -EINVAL;

		return -EINVAL;

	input_format = fc->css_stream_fmt;

	input_format = fc->atomisp_in_fmt;

	atomisp_css_input_configure_port(asd,

	atomisp_css_input_configure_port(asd,

					 __get_mipi_port(asd->isp, mipi_info->port),

					 __get_mipi_port(asd->isp, mipi_info->port),

					 mipi_info->num_lanes,

					 mipi_info->num_lanes,
@@ -5230,7 +5230,7 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev, 
		if (!fc)

		if (!fc)

			return -EINVAL;

			return -EINVAL;

		if (format->sh_fmt == IA_CSS_FRAME_FORMAT_RAW &&

		if (format->sh_fmt == IA_CSS_FRAME_FORMAT_RAW &&

		    raw_output_format_match_input(fc->css_stream_fmt,

		    raw_output_format_match_input(fc->atomisp_in_fmt,

						  pix->pixelformat))

						  pix->pixelformat))

			return -EINVAL;

			return -EINVAL;

	}

	}

drivers/staging/media/atomisp/pci/atomisp_subdev.c

+21 −21
Original line number Original line Diff line number Diff line
@@ -31,31 +31,31 @@ 
#include "atomisp_internal.h"

#include "atomisp_internal.h"





const struct atomisp_in_fmt_conv atomisp_in_fmt_conv[] = {

const struct atomisp_in_fmt_conv atomisp_in_fmt_conv[] = {

	{ MEDIA_BUS_FMT_SBGGR8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_BGGR, ATOMISP_INPUT_FORMAT_RAW_8 },

	{ MEDIA_BUS_FMT_SBGGR8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_BGGR },

	{ MEDIA_BUS_FMT_SGBRG8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_GBRG, ATOMISP_INPUT_FORMAT_RAW_8 },

	{ MEDIA_BUS_FMT_SGBRG8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_GBRG },

	{ MEDIA_BUS_FMT_SGRBG8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_GRBG, ATOMISP_INPUT_FORMAT_RAW_8 },

	{ MEDIA_BUS_FMT_SGRBG8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_GRBG },

	{ MEDIA_BUS_FMT_SRGGB8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_RGGB, ATOMISP_INPUT_FORMAT_RAW_8 },

	{ MEDIA_BUS_FMT_SRGGB8_1X8, 8, 8, ATOMISP_INPUT_FORMAT_RAW_8, IA_CSS_BAYER_ORDER_RGGB },

	{ MEDIA_BUS_FMT_SBGGR10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_BGGR, ATOMISP_INPUT_FORMAT_RAW_10 },

	{ MEDIA_BUS_FMT_SBGGR10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_BGGR },

	{ MEDIA_BUS_FMT_SGBRG10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_GBRG, ATOMISP_INPUT_FORMAT_RAW_10 },

	{ MEDIA_BUS_FMT_SGBRG10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_GBRG },

	{ MEDIA_BUS_FMT_SGRBG10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_GRBG, ATOMISP_INPUT_FORMAT_RAW_10 },

	{ MEDIA_BUS_FMT_SGRBG10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_GRBG },

	{ MEDIA_BUS_FMT_SRGGB10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_RGGB, ATOMISP_INPUT_FORMAT_RAW_10 },

	{ MEDIA_BUS_FMT_SRGGB10_1X10, 10, 10, ATOMISP_INPUT_FORMAT_RAW_10, IA_CSS_BAYER_ORDER_RGGB },

	{ MEDIA_BUS_FMT_SBGGR12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_BGGR, ATOMISP_INPUT_FORMAT_RAW_12 },

	{ MEDIA_BUS_FMT_SBGGR12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_BGGR },

	{ MEDIA_BUS_FMT_SGBRG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_GBRG, ATOMISP_INPUT_FORMAT_RAW_12 },

	{ MEDIA_BUS_FMT_SGBRG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_GBRG },

	{ MEDIA_BUS_FMT_SGRBG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_GRBG, ATOMISP_INPUT_FORMAT_RAW_12 },

	{ MEDIA_BUS_FMT_SGRBG12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_GRBG },

	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_RGGB, ATOMISP_INPUT_FORMAT_RAW_12 },

	{ MEDIA_BUS_FMT_SRGGB12_1X12, 12, 12, ATOMISP_INPUT_FORMAT_RAW_12, IA_CSS_BAYER_ORDER_RGGB },

	{ MEDIA_BUS_FMT_UYVY8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, ATOMISP_INPUT_FORMAT_YUV422_8 },

	{ MEDIA_BUS_FMT_UYVY8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0 },

	{ MEDIA_BUS_FMT_YUYV8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0, ATOMISP_INPUT_FORMAT_YUV422_8 },

	{ MEDIA_BUS_FMT_YUYV8_1X16, 8, 8, ATOMISP_INPUT_FORMAT_YUV422_8, 0 },

#if 0 // disabled due to clang warnings

#if 0 // disabled due to clang warnings

	{ MEDIA_BUS_FMT_JPEG_1X8, 8, 8, IA_CSS_FRAME_FORMAT_BINARY_8, 0, ATOMISP_INPUT_FORMAT_BINARY_8 },

	{ MEDIA_BUS_FMT_JPEG_1X8, 8, 8, IA_CSS_FRAME_FORMAT_BINARY_8, 0 },

	{ V4L2_MBUS_FMT_CUSTOM_NV12, 12, 12, IA_CSS_FRAME_FORMAT_NV12, 0, IA_CSS_FRAME_FORMAT_NV12 },

	{ V4L2_MBUS_FMT_CUSTOM_NV12, 12, 12, IA_CSS_FRAME_FORMAT_NV12, 0 },

	{ V4L2_MBUS_FMT_CUSTOM_NV21, 12, 12, IA_CSS_FRAME_FORMAT_NV21, 0, IA_CSS_FRAME_FORMAT_NV21 },

	{ V4L2_MBUS_FMT_CUSTOM_NV21, 12, 12, IA_CSS_FRAME_FORMAT_NV21, 0 },

#endif

#endif

	{ V4L2_MBUS_FMT_CUSTOM_YUV420, 12, 12, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY, 0, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY },

	{ V4L2_MBUS_FMT_CUSTOM_YUV420, 12, 12, ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY, 0 },

#if 0

#if 0

	{ V4L2_MBUS_FMT_CUSTOM_M10MO_RAW, 8, 8, IA_CSS_FRAME_FORMAT_BINARY_8, 0, ATOMISP_INPUT_FORMAT_BINARY_8 },

	{ V4L2_MBUS_FMT_CUSTOM_M10MO_RAW, 8, 8, IA_CSS_FRAME_FORMAT_BINARY_8, 0 },

#endif

#endif

	/* no valid V4L2 MBUS code for metadata format, so leave it 0. */

	/* no valid V4L2 MBUS code for metadata format, so leave it 0. */

	{ 0, 0, 0, ATOMISP_INPUT_FORMAT_EMBEDDED, 0, ATOMISP_INPUT_FORMAT_EMBEDDED },

	{ 0, 0, 0, ATOMISP_INPUT_FORMAT_EMBEDDED, 0 },

	{}

	{}

};

};
@@ -642,7 +642,7 @@ void atomisp_subdev_set_ffmt(struct v4l2_subdev *sd, 
			atomisp_css_input_set_bayer_order(isp_sd, stream_id,

			atomisp_css_input_set_bayer_order(isp_sd, stream_id,

							  fc->bayer_order);

							  fc->bayer_order);

			atomisp_css_input_set_format(isp_sd, stream_id,

			atomisp_css_input_set_format(isp_sd, stream_id,

						     fc->css_stream_fmt);

						     fc->atomisp_in_fmt);

			atomisp_css_set_default_isys_config(isp_sd, stream_id,

			atomisp_css_set_default_isys_config(isp_sd, stream_id,

							    ffmt);

							    ffmt);

		}

		}

drivers/staging/media/atomisp/pci/atomisp_subdev.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,6 @@ struct atomisp_in_fmt_conv { 
	u8 depth; /* uncompressed */

	u8 depth; /* uncompressed */

	enum atomisp_input_format atomisp_in_fmt;

	enum atomisp_input_format atomisp_in_fmt;

	enum ia_css_bayer_order bayer_order;

	enum ia_css_bayer_order bayer_order;

	enum atomisp_input_format css_stream_fmt;

};

};





struct atomisp_sub_device;

struct atomisp_sub_device;