github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 20:46:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

media: dw100: Implement dynamic vertex map update

Browse Source 
Implement dynamic vertex map updates by handling the
V4L2_CID_DW100_DEWARPING_16x16_VERTEX_MAP control during streaming. This
allows to implement features like dynamic zoom, pan, rotate and dewarp.

To stay compatible with the old version, updates of
V4L2_CID_DW100_DEWARPING_16x16_VERTEX_MAP are ignored during streaming
when requests are not used. Print a corresponding warning once.

Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patch.msgid.link/20260304-sklug-v6-16-topic-dw100-v3-1-dev-v5-2-1a7e1f721b50@ideasonboard.com
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
Stefan Klug 2026-03-04 16:50:23 +01:00 committed by Hans Verkuil
parent 3906de8da7
commit dc4b7a52a0
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/media/platform/nxp/dw100/dw100.c
View File

@ -98,6 +98,7 @@ struct dw100_ctx {
unsigned int map_width;
unsigned int map_height;
bool user_map_is_set;
bool user_map_is_dirty;
/* Source and destination queue data */
struct dw100_q_data q_data[2];
@ -293,11 +294,15 @@ static u32 dw100_map_format_coordinates(u16 xq, u16 yq)
return (u32)((yq << 16) | xq);
}
static u32 *dw100_get_user_map(struct dw100_ctx *ctx)
static void dw100_update_mapping(struct dw100_ctx *ctx)
{
struct v4l2_ctrl *ctrl = ctx->ctrls[DW100_CTRL_DEWARPING_MAP];
return ctrl->p_cur.p_u32;
if (!ctx->user_map_is_dirty)
return;
memcpy(ctx->map, ctrl->p_cur.p_u32, ctx->map_size);
ctx->user_map_is_dirty = false;
}
/*
@ -306,8 +311,6 @@ static u32 *dw100_get_user_map(struct dw100_ctx *ctx)
*/
static int dw100_create_mapping(struct dw100_ctx *ctx)
{
u32 *user_map;
if (ctx->map)
dma_free_coherent(&ctx->dw_dev->pdev->dev, ctx->map_size,
ctx->map, ctx->map_dma);
@ -318,8 +321,8 @@ static int dw100_create_mapping(struct dw100_ctx *ctx)
if (!ctx->map)
return -ENOMEM;
user_map = dw100_get_user_map(ctx);
memcpy(ctx->map, user_map, ctx->map_size);
ctx->user_map_is_dirty = true;
dw100_update_mapping(ctx);
dev_dbg(&ctx->dw_dev->pdev->dev,
"%ux%u %s mapping created (d:%pad-c:%p) for stream %ux%u->%ux%u\n",
@ -351,6 +354,7 @@ static int dw100_s_ctrl(struct v4l2_ctrl *ctrl)
switch (ctrl->id) {
case V4L2_CID_DW100_DEWARPING_16x16_VERTEX_MAP:
ctx->user_map_is_set = true;
ctx->user_map_is_dirty = true;
break;
}
@ -405,6 +409,7 @@ static void dw100_ctrl_dewarping_map_init(const struct v4l2_ctrl *ctrl,
}
ctx->user_map_is_set = false;
ctx->user_map_is_dirty = true;
}
static const struct v4l2_ctrl_type_ops dw100_ctrl_type_ops = {
@ -1476,6 +1481,12 @@ static void dw100_device_run(void *priv)
v4l2_ctrl_request_setup(src_buf->vb2_buf.req_obj.req,
&ctx->hdl);
if (src_buf->vb2_buf.req_obj.req)
dw100_update_mapping(ctx);
else if (ctx->user_map_is_dirty)
dev_warn_once(&ctx->dw_dev->pdev->dev,
"V4L2 requests are required to update the vertex map dynamically\n");
/*
* As the hardware does not update any volatile controls, we can
* complete control handling before starting the dewarper.