Commit c2aad411 authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Mauro Carvalho Chehab
Browse files

media: sun6i-csi: Rework capture format management with helper 



Remove the need for local copies of the v4l2 format and add a common
helper to prepare a format compatible with the driver, using the
relevant v4l2 helpers.

Report a raw colorspace for bayer-encoded pixel formats instead of SRGB.
Also cleanup the size bound defines while at it.

Signed-off-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent b79dca9b

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c

+61 −61
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ 
#include "sun6i_csi_capture.h"

#include "sun6i_csi_reg.h"



/* This is got from BSP sources. */

#define MIN_WIDTH	(32)

#define MIN_HEIGHT	(32)

#define MAX_WIDTH	(4800)

#define MAX_HEIGHT	(4800)



/* Helpers */



void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,
@@ -833,6 +827,55 @@ static const struct vb2_ops sun6i_csi_capture_queue_ops = { 


/* V4L2 Device */



static void sun6i_csi_capture_format_prepare(struct v4l2_format *format)

{

	struct v4l2_pix_format *pix_format = &format->fmt.pix;

	const struct v4l2_format_info *info;

	unsigned int width, height;



	v4l_bound_align_image(&pix_format->width, SUN6I_CSI_CAPTURE_WIDTH_MIN,

			      SUN6I_CSI_CAPTURE_WIDTH_MAX, 1,

			      &pix_format->height, SUN6I_CSI_CAPTURE_HEIGHT_MIN,

			      SUN6I_CSI_CAPTURE_HEIGHT_MAX, 1, 0);



	if (!sun6i_csi_capture_format_check(pix_format->pixelformat))

		pix_format->pixelformat = sun6i_csi_capture_formats[0];



	width = pix_format->width;

	height = pix_format->height;



	info = v4l2_format_info(pix_format->pixelformat);



	switch (pix_format->pixelformat) {

	case V4L2_PIX_FMT_NV12_16L16:

		pix_format->bytesperline = width * 12 / 8;

		pix_format->sizeimage = pix_format->bytesperline * height;

		break;

	case V4L2_PIX_FMT_JPEG:

		pix_format->bytesperline = width;

		pix_format->sizeimage = pix_format->bytesperline * height;

		break;

	default:

		v4l2_fill_pixfmt(pix_format, pix_format->pixelformat,

				 width, height);

		break;

	}



	if (pix_format->field == V4L2_FIELD_ANY)

		pix_format->field = V4L2_FIELD_NONE;



	if (pix_format->pixelformat == V4L2_PIX_FMT_JPEG)

		pix_format->colorspace = V4L2_COLORSPACE_JPEG;

	else if (info && info->pixel_enc == V4L2_PIXEL_ENC_BAYER)

		pix_format->colorspace = V4L2_COLORSPACE_RAW;

	else

		pix_format->colorspace = V4L2_COLORSPACE_SRGB;



	pix_format->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;

	pix_format->quantization = V4L2_QUANTIZATION_DEFAULT;

	pix_format->xfer_func = V4L2_XFER_FUNC_DEFAULT;

}



static int sun6i_csi_capture_querycap(struct file *file, void *private,

				      struct v4l2_capability *capability)

{
@@ -864,54 +907,8 @@ static int sun6i_csi_capture_g_fmt(struct file *file, void *private, 
				   struct v4l2_format *format)

{

	struct sun6i_csi_device *csi_dev = video_drvdata(file);

	struct sun6i_csi_capture *capture = &csi_dev->capture;



	*format = capture->format;



	return 0;

}



static int sun6i_csi_capture_format_try(struct sun6i_csi_capture *capture,

					struct v4l2_format *format)

{

	struct v4l2_pix_format *pix_format = &format->fmt.pix;

	int bpp;



	if (!sun6i_csi_capture_format_check(pix_format->pixelformat))

		pix_format->pixelformat = sun6i_csi_capture_formats[0];



	v4l_bound_align_image(&pix_format->width, MIN_WIDTH, MAX_WIDTH, 1,

			      &pix_format->height, MIN_HEIGHT, MAX_WIDTH, 1, 1);



	bpp = sun6i_csi_get_bpp(pix_format->pixelformat);

	pix_format->bytesperline = (pix_format->width * bpp) >> 3;

	pix_format->sizeimage = pix_format->bytesperline * pix_format->height;



	if (pix_format->field == V4L2_FIELD_ANY)

		pix_format->field = V4L2_FIELD_NONE;



	if (pix_format->pixelformat == V4L2_PIX_FMT_JPEG)

		pix_format->colorspace = V4L2_COLORSPACE_JPEG;

	else

		pix_format->colorspace = V4L2_COLORSPACE_SRGB;



	pix_format->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;

	pix_format->quantization = V4L2_QUANTIZATION_DEFAULT;

	pix_format->xfer_func = V4L2_XFER_FUNC_DEFAULT;



	return 0;

}



static int sun6i_csi_capture_format_set(struct sun6i_csi_capture *capture,

					struct v4l2_format *format)

{

	int ret;



	ret = sun6i_csi_capture_format_try(capture, format);

	if (ret)

		return ret;



	capture->format = *format;

	*format = csi_dev->capture.format;



	return 0;

}
@@ -925,16 +922,19 @@ static int sun6i_csi_capture_s_fmt(struct file *file, void *private, 
	if (vb2_is_busy(&capture->queue))

		return -EBUSY;



	return sun6i_csi_capture_format_set(capture, format);

	sun6i_csi_capture_format_prepare(format);



	csi_dev->capture.format = *format;



	return 0;

}



static int sun6i_csi_capture_try_fmt(struct file *file, void *private,

				     struct v4l2_format *format)

{

	struct sun6i_csi_device *csi_dev = video_drvdata(file);

	struct sun6i_csi_capture *capture = &csi_dev->capture;

	sun6i_csi_capture_format_prepare(format);



	return sun6i_csi_capture_format_try(capture, format);

	return 0;

}



static int sun6i_csi_capture_enum_input(struct file *file, void *private,
@@ -1125,8 +1125,8 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev) 
	struct video_device *video_dev = &capture->video_dev;

	struct vb2_queue *queue = &capture->queue;

	struct media_pad *pad = &capture->pad;

	struct v4l2_format format = { 0 };

	struct v4l2_pix_format *pix_format = &format.fmt.pix;

	struct v4l2_format *format = &csi_dev->capture.format;

	struct v4l2_pix_format *pix_format = &format->fmt.pix;

	int ret;



	/* State */
@@ -1169,13 +1169,13 @@ int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev) 


	/* V4L2 Format */



	format.type = queue->type;

	format->type = queue->type;

	pix_format->pixelformat = sun6i_csi_capture_formats[0];

	pix_format->width = 1280;

	pix_format->height = 720;

	pix_format->field = V4L2_FIELD_NONE;



	sun6i_csi_capture_format_set(capture, &format);

	sun6i_csi_capture_format_prepare(format);



	/* Video Device */

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h

+5 −0
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ 
#include <media/v4l2-dev.h>

#include <media/videobuf2-core.h>



#define SUN6I_CSI_CAPTURE_WIDTH_MIN	32

#define SUN6I_CSI_CAPTURE_WIDTH_MAX	4800

#define SUN6I_CSI_CAPTURE_HEIGHT_MIN	32

#define SUN6I_CSI_CAPTURE_HEIGHT_MAX	4800



struct sun6i_csi_device;



#undef current