media: ti-vpe: cal: add embedded data support

Add support for capturing embedded data from the sensor. The only
difference with capturing pixel data and embedded data is that we need
to ensure the PIX PROC is disabled for embedded data so that CAL doesn't
repack the data.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index cce627c5519c349898f6b5713f7818fb6a1ffa33..05bdc6d126d82fdb2bcc320f747e8cbd242fc961 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -473,14 +473,17 @@ int cal_ctx_prepare(struct cal_ctx *ctx)
 {
        int ret;
 
-       ret = cal_reserve_pix_proc(ctx->cal);
-       if (ret < 0) {
-               ctx_err(ctx, "Failed to reserve pix proc: %d\n", ret);
-               return ret;
-       }
+       ctx->use_pix_proc = !ctx->fmtinfo->meta;
 
-       ctx->pix_proc = ret;
-       ctx->use_pix_proc = true;
+       if (ctx->use_pix_proc) {
+               ret = cal_reserve_pix_proc(ctx->cal);
+               if (ret < 0) {
+                       ctx_err(ctx, "Failed to reserve pix proc: %d\n", ret);
+                       return ret;
+               }
+
+               ctx->pix_proc = ret;
+       }
 
        return 0;
 }

diff --git a/drivers/media/platform/ti-vpe/cal.h b/drivers/media/platform/ti-vpe/cal.h
index d3e89d2ee10fb07b3e0312f3dfa9ccce60cde661..527e22d022f300b767b164ca4a502faddef675e9 100644 (file)
--- a/drivers/media/platform/ti-vpe/cal.h
+++ b/drivers/media/platform/ti-vpe/cal.h
@@ -88,6 +88,7 @@ struct cal_format_info {
        u32     code;
        /* Bits per pixel */
        u8      bpp;
+       bool    meta;
 };
 
 /* buffer for one video frame */