Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06d1f0c2 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] vivid-tpg: separate planes and buffers 



Add a new field that contains the number of buffers. This may be
less than the number of planes in case multiple planes are combined
into one buffer.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent ba24b442

drivers/media/platform/vivid/vivid-tpg.c

+3 −0
Original line number Diff line number Diff line
@@ -170,7 +170,9 @@ bool tpg_s_fourcc(struct tpg_data *tpg, u32 fourcc) 
{

	tpg->fourcc = fourcc;

	tpg->planes = 1;

	tpg->buffers = 1;

	tpg->recalc_colors = true;



	switch (fourcc) {

	case V4L2_PIX_FMT_RGB565:

	case V4L2_PIX_FMT_RGB565X:
@@ -190,6 +192,7 @@ bool tpg_s_fourcc(struct tpg_data *tpg, u32 fourcc) 
		break;

	case V4L2_PIX_FMT_NV16M:

	case V4L2_PIX_FMT_NV61M:

		tpg->buffers = 2;

		tpg->planes = 2;

		/* fall-through */

	case V4L2_PIX_FMT_YUYV:

drivers/media/platform/vivid/vivid-tpg.h

+6 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ struct tpg_data { 
	enum tpg_pixel_aspect		pix_aspect;

	unsigned			rgb_range;

	unsigned			real_rgb_range;

	unsigned			buffers;

	unsigned			planes;

	/* Used to store the colors in native format, either RGB or YUV */

	u8				colors[TPG_COLOR_MAX][3];
@@ -327,6 +328,11 @@ static inline u32 tpg_g_quantization(const struct tpg_data *tpg) 
	return tpg->quantization;

}



static inline unsigned tpg_g_buffers(const struct tpg_data *tpg)

{

	return tpg->buffers;

}



static inline unsigned tpg_g_planes(const struct tpg_data *tpg)

{

	return tpg->planes;