Commit 59fe916c authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: media/platform: don't set description in ENUM_FMT 



The V4L2 core sets the format description and flags for the driver in order
to ensure consistent naming.

So drop the strscpy of the description in drivers. Also remove any
description strings in driver-internal structures since those are
no longer needed.

And in am437x-vpfe.c drop an unnecessary f->type assignment in
vpfe_enum_fmt().

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarBenoit Parrot <bparrot@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
[hverkuil-cisco@xs4all.nl: addressed some small suggestions from Laurent]
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 642ac63d

drivers/media/platform/am437x/am437x-vpfe.c

+2 −16
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ struct bus_format { 


/*

 * struct vpfe_fmt - VPFE media bus format information

 * @name: V4L2 format description

 * @code: V4L2 media bus format code

 * @shifted: V4L2 media bus format code for the same pixel layout but

 *	shifted to be 8 bits per pixel. =0 if format is not shiftable.
@@ -86,7 +85,6 @@ struct bus_format { 
 * @supported: Indicates format supported by subdev

 */

struct vpfe_fmt {

	const char *name;

	u32 fourcc;

	u32 code;

	struct bus_format l;
@@ -97,7 +95,6 @@ struct vpfe_fmt { 


static struct vpfe_fmt formats[] = {

	{

		.name		= "YUV 4:2:2 packed, YCbYCr",

		.fourcc		= V4L2_PIX_FMT_YUYV,

		.code		= MEDIA_BUS_FMT_YUYV8_2X8,

		.l.width	= 10,
@@ -106,7 +103,6 @@ static struct vpfe_fmt formats[] = { 
		.s.bpp		= 2,

		.supported	= false,

	}, {

		.name		= "YUV 4:2:2 packed, CbYCrY",

		.fourcc		= V4L2_PIX_FMT_UYVY,

		.code		= MEDIA_BUS_FMT_UYVY8_2X8,

		.l.width	= 10,
@@ -115,7 +111,6 @@ static struct vpfe_fmt formats[] = { 
		.s.bpp		= 2,

		.supported	= false,

	}, {

		.name		= "YUV 4:2:2 packed, YCrYCb",

		.fourcc		= V4L2_PIX_FMT_YVYU,

		.code		= MEDIA_BUS_FMT_YVYU8_2X8,

		.l.width	= 10,
@@ -124,7 +119,6 @@ static struct vpfe_fmt formats[] = { 
		.s.bpp		= 2,

		.supported	= false,

	}, {

		.name		= "YUV 4:2:2 packed, CrYCbY",

		.fourcc		= V4L2_PIX_FMT_VYUY,

		.code		= MEDIA_BUS_FMT_VYUY8_2X8,

		.l.width	= 10,
@@ -133,7 +127,6 @@ static struct vpfe_fmt formats[] = { 
		.s.bpp		= 2,

		.supported	= false,

	}, {

		.name		= "RAW8 BGGR",

		.fourcc		= V4L2_PIX_FMT_SBGGR8,

		.code		= MEDIA_BUS_FMT_SBGGR8_1X8,

		.l.width	= 10,
@@ -142,7 +135,6 @@ static struct vpfe_fmt formats[] = { 
		.s.bpp		= 1,

		.supported	= false,

	}, {

		.name		= "RAW8 GBRG",

		.fourcc		= V4L2_PIX_FMT_SGBRG8,

		.code		= MEDIA_BUS_FMT_SGBRG8_1X8,

		.l.width	= 10,
@@ -151,7 +143,6 @@ static struct vpfe_fmt formats[] = { 
		.s.bpp		= 1,

		.supported	= false,

	}, {

		.name		= "RAW8 GRBG",

		.fourcc		= V4L2_PIX_FMT_SGRBG8,

		.code		= MEDIA_BUS_FMT_SGRBG8_1X8,

		.l.width	= 10,
@@ -160,7 +151,6 @@ static struct vpfe_fmt formats[] = { 
		.s.bpp		= 1,

		.supported	= false,

	}, {

		.name		= "RAW8 RGGB",

		.fourcc		= V4L2_PIX_FMT_SRGGB8,

		.code		= MEDIA_BUS_FMT_SRGGB8_1X8,

		.l.width	= 10,
@@ -169,7 +159,6 @@ static struct vpfe_fmt formats[] = { 
		.s.bpp		= 1,

		.supported	= false,

	}, {

		.name		= "RGB565 (LE)",

		.fourcc		= V4L2_PIX_FMT_RGB565,

		.code		= MEDIA_BUS_FMT_RGB565_2X8_LE,

		.l.width	= 10,
@@ -178,7 +167,6 @@ static struct vpfe_fmt formats[] = { 
		.s.bpp		= 2,

		.supported	= false,

	}, {

		.name		= "RGB565 (BE)",

		.fourcc		= V4L2_PIX_FMT_RGB565X,

		.code		= MEDIA_BUS_FMT_RGB565_2X8_BE,

		.l.width	= 10,
@@ -1540,12 +1528,10 @@ static int vpfe_enum_fmt(struct file *file, void *priv, 
	if (!fmt)

		return -EINVAL;



	strscpy(f->description, fmt->name, sizeof(f->description));

	f->pixelformat = fmt->fourcc;

	f->type = vpfe->fmt.type;



	vpfe_dbg(1, vpfe, "vpfe_enum_format: mbus index: %d code: %x pixelformat: %s [%s]\n",

		f->index, fmt->code, print_fourcc(fmt->fourcc), fmt->name);

	vpfe_dbg(1, vpfe, "vpfe_enum_format: mbus index: %d code: %x pixelformat: %s\n",

		 f->index, fmt->code, print_fourcc(fmt->fourcc));



	return 0;

}

drivers/media/platform/davinci/vpbe_display.c

+2 −12
Original line number Diff line number Diff line
@@ -792,7 +792,6 @@ static int vpbe_display_enum_fmt(struct file *file, void *priv, 
{

	struct vpbe_layer *layer = video_drvdata(file);

	struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;

	unsigned int index = 0;



	v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,

				"VIDIOC_ENUM_FMT, layer id = %d\n",
@@ -803,19 +802,10 @@ static int vpbe_display_enum_fmt(struct file *file, void *priv, 
	}



	/* Fill in the information about format */

	index = fmt->index;

	memset(fmt, 0, sizeof(*fmt));

	fmt->index = index;

	fmt->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;

	if (index == 0) {

		strscpy(fmt->description, "YUV 4:2:2 - UYVY",

			sizeof(fmt->description));

	if (fmt->index == 0)

		fmt->pixelformat = V4L2_PIX_FMT_UYVY;

	} else {

		strscpy(fmt->description, "Y/CbCr 4:2:0",

			sizeof(fmt->description));

	else

		fmt->pixelformat = V4L2_PIX_FMT_NV12;

	}



	return 0;

}

drivers/media/platform/davinci/vpif_capture.c

+2 −9
Original line number Diff line number Diff line
@@ -938,17 +938,10 @@ static int vpif_enum_fmt_vid_cap(struct file *file, void *priv, 
	}



	/* Fill in the information about format */

	if (ch->vpifparams.iface.if_type == VPIF_IF_RAW_BAYER) {

		fmt->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

		strscpy(fmt->description, "Raw Mode -Bayer Pattern GrRBGb",

			sizeof(fmt->description));

	if (ch->vpifparams.iface.if_type == VPIF_IF_RAW_BAYER)

		fmt->pixelformat = V4L2_PIX_FMT_SBGGR8;

	} else {

		fmt->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;

		strscpy(fmt->description, "YCbCr4:2:2 Semi-Planar",

			sizeof(fmt->description));

	else

		fmt->pixelformat = V4L2_PIX_FMT_NV16;

	}

	return 0;

}

drivers/media/platform/davinci/vpif_display.c

+0 −4
Original line number Diff line number Diff line
@@ -601,11 +601,7 @@ static int vpif_enum_fmt_vid_out(struct file *file, void *priv, 
		return -EINVAL;



	/* Fill in the information about format */

	fmt->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;

	strscpy(fmt->description, "YCbCr4:2:2 YC Planar",

		sizeof(fmt->description));

	fmt->pixelformat = V4L2_PIX_FMT_YUV422P;

	fmt->flags = 0;

	return 0;

}

drivers/media/platform/exynos-gsc/gsc-core.c

+0 −22
Original line number Diff line number Diff line
@@ -27,21 +27,18 @@ 


static const struct gsc_fmt gsc_formats[] = {

	{

		.name		= "RGB565",

		.pixelformat	= V4L2_PIX_FMT_RGB565X,

		.depth		= { 16 },

		.color		= GSC_RGB,

		.num_planes	= 1,

		.num_comp	= 1,

	}, {

		.name		= "BGRX-8-8-8-8, 32 bpp",

		.pixelformat	= V4L2_PIX_FMT_BGR32,

		.depth		= { 32 },

		.color		= GSC_RGB,

		.num_planes	= 1,

		.num_comp	= 1,

	}, {

		.name		= "YUV 4:2:2 packed, YCbYCr",

		.pixelformat	= V4L2_PIX_FMT_YUYV,

		.depth		= { 16 },

		.color		= GSC_YUV422,
@@ -51,7 +48,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_comp	= 1,

		.mbus_code	= MEDIA_BUS_FMT_YUYV8_2X8,

	}, {

		.name		= "YUV 4:2:2 packed, CbYCrY",

		.pixelformat	= V4L2_PIX_FMT_UYVY,

		.depth		= { 16 },

		.color		= GSC_YUV422,
@@ -61,7 +57,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_comp	= 1,

		.mbus_code	= MEDIA_BUS_FMT_UYVY8_2X8,

	}, {

		.name		= "YUV 4:2:2 packed, CrYCbY",

		.pixelformat	= V4L2_PIX_FMT_VYUY,

		.depth		= { 16 },

		.color		= GSC_YUV422,
@@ -71,7 +66,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_comp	= 1,

		.mbus_code	= MEDIA_BUS_FMT_VYUY8_2X8,

	}, {

		.name		= "YUV 4:2:2 packed, YCrYCb",

		.pixelformat	= V4L2_PIX_FMT_YVYU,

		.depth		= { 16 },

		.color		= GSC_YUV422,
@@ -81,7 +75,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_comp	= 1,

		.mbus_code	= MEDIA_BUS_FMT_YVYU8_2X8,

	}, {

		.name		= "YUV 4:4:4 planar, YCbYCr",

		.pixelformat	= V4L2_PIX_FMT_YUV32,

		.depth		= { 32 },

		.color		= GSC_YUV444,
@@ -90,7 +83,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 1,

		.num_comp	= 1,

	}, {

		.name		= "YUV 4:2:2 planar, Y/Cb/Cr",

		.pixelformat	= V4L2_PIX_FMT_YUV422P,

		.depth		= { 16 },

		.color		= GSC_YUV422,
@@ -99,7 +91,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 1,

		.num_comp	= 3,

	}, {

		.name		= "YUV 4:2:2 planar, Y/CbCr",

		.pixelformat	= V4L2_PIX_FMT_NV16,

		.depth		= { 16 },

		.color		= GSC_YUV422,
@@ -108,7 +99,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 1,

		.num_comp	= 2,

	}, {

		.name		= "YUV 4:2:2 non-contig, Y/CbCr",

		.pixelformat	= V4L2_PIX_FMT_NV16M,

		.depth		= { 8, 8 },

		.color		= GSC_YUV422,
@@ -117,7 +107,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 2,

		.num_comp	= 2,

	}, {

		.name		= "YUV 4:2:2 planar, Y/CrCb",

		.pixelformat	= V4L2_PIX_FMT_NV61,

		.depth		= { 16 },

		.color		= GSC_YUV422,
@@ -126,7 +115,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 1,

		.num_comp	= 2,

	}, {

		.name		= "YUV 4:2:2 non-contig, Y/CrCb",

		.pixelformat	= V4L2_PIX_FMT_NV61M,

		.depth		= { 8, 8 },

		.color		= GSC_YUV422,
@@ -135,7 +123,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 2,

		.num_comp	= 2,

	}, {

		.name		= "YUV 4:2:0 planar, YCbCr",

		.pixelformat	= V4L2_PIX_FMT_YUV420,

		.depth		= { 12 },

		.color		= GSC_YUV420,
@@ -144,7 +131,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 1,

		.num_comp	= 3,

	}, {

		.name		= "YUV 4:2:0 planar, YCrCb",

		.pixelformat	= V4L2_PIX_FMT_YVU420,

		.depth		= { 12 },

		.color		= GSC_YUV420,
@@ -154,7 +140,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_comp	= 3,



	}, {

		.name		= "YUV 4:2:0 planar, Y/CbCr",

		.pixelformat	= V4L2_PIX_FMT_NV12,

		.depth		= { 12 },

		.color		= GSC_YUV420,
@@ -163,7 +148,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 1,

		.num_comp	= 2,

	}, {

		.name		= "YUV 4:2:0 planar, Y/CrCb",

		.pixelformat	= V4L2_PIX_FMT_NV21,

		.depth		= { 12 },

		.color		= GSC_YUV420,
@@ -172,7 +156,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 1,

		.num_comp	= 2,

	}, {

		.name		= "YUV 4:2:0 non-contig. 2p, Y/CrCb",

		.pixelformat	= V4L2_PIX_FMT_NV21M,

		.depth		= { 8, 4 },

		.color		= GSC_YUV420,
@@ -181,7 +164,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 2,

		.num_comp	= 2,

	}, {

		.name		= "YUV 4:2:0 non-contig. 2p, Y/CbCr",

		.pixelformat	= V4L2_PIX_FMT_NV12M,

		.depth		= { 8, 4 },

		.color		= GSC_YUV420,
@@ -190,7 +172,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 2,

		.num_comp	= 2,

	}, {

		.name		= "YUV 4:2:0 non-contig. 3p, Y/Cb/Cr",

		.pixelformat	= V4L2_PIX_FMT_YUV420M,

		.depth		= { 8, 2, 2 },

		.color		= GSC_YUV420,
@@ -199,7 +180,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 3,

		.num_comp	= 3,

	}, {

		.name		= "YUV 4:2:0 non-contig. 3p, Y/Cr/Cb",

		.pixelformat	= V4L2_PIX_FMT_YVU420M,

		.depth		= { 8, 2, 2 },

		.color		= GSC_YUV420,
@@ -208,7 +188,6 @@ static const struct gsc_fmt gsc_formats[] = { 
		.num_planes	= 3,

		.num_comp	= 3,

	}, {

		.name		= "YUV 4:2:0 n.c. 2p, Y/CbCr tiled",

		.pixelformat	= V4L2_PIX_FMT_NV12MT_16X16,

		.depth		= { 8, 4 },

		.color		= GSC_YUV420,
@@ -335,7 +314,6 @@ int gsc_enum_fmt(struct v4l2_fmtdesc *f) 
	if (!fmt)

		return -EINVAL;



	strscpy(f->description, fmt->name, sizeof(f->description));

	f->pixelformat = fmt->pixelformat;



	return 0;