summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/vivid/vivid-tpg.c
diff options
context:
space:
mode:
authorHans Verkuil2015-03-07 17:01:53 +0100
committerMauro Carvalho Chehab2015-04-03 01:35:37 +0200
commit06d1f0c2eaaebe04fa3ea780ca37dcd6e05ade16 (patch)
tree330cc399696cf6a97ab18451d4e595c18441bd6e /drivers/media/platform/vivid/vivid-tpg.c
parent[media] vivid: do not allow video loopback for SEQ_TB/BT (diff)
downloadkernel-qcow2-linux-06d1f0c2eaaebe04fa3ea780ca37dcd6e05ade16.tar.gz
kernel-qcow2-linux-06d1f0c2eaaebe04fa3ea780ca37dcd6e05ade16.tar.xz
kernel-qcow2-linux-06d1f0c2eaaebe04fa3ea780ca37dcd6e05ade16.zip
[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: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/vivid/vivid-tpg.c')
-rw-r--r--drivers/media/platform/vivid/vivid-tpg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/vivid/vivid-tpg.c b/drivers/media/platform/vivid/vivid-tpg.c
index 145b6ff2f816..d7f55d437f91 100644
--- a/drivers/media/platform/vivid/vivid-tpg.c
+++ b/drivers/media/platform/vivid/vivid-tpg.c
@@ -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: