| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250919-vdev-state-v2-9-b2c42426965c@ideasonboard.com>
Date: Fri, 19 Sep 2025 15:26:01 +0530
From: Jai Luthra <jai.luthra@...asonboard.com>
To: Hans Verkuil <hverkuil@...nel.org>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Sakari Ailus <sakari.ailus@...ux.intel.com>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Tomi Valkeinen <tomi.valkeinen@...asonboard.com>,
Jacopo Mondi <jacopo.mondi@...asonboard.com>, linux-media@...r.kernel.org
Cc: Jai Luthra <jai.luthra@...asonboard.com>,
Dafna Hirschfeld <dafna@...tmail.com>, Heiko Stuebner <heiko@...ech.de>,
linux-rockchip@...ts.infradead.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org
Subject: [PATCH v2 09/10] media: rkisp1: Use video_device_state
Use the newly introduced video_device_state to store the active V4L2
format for the video device.
Additionally, calculate stride on-demand instead of storing it in the
driver context structure.
This change allows using a single function for both .s_fmt and .try_fmt
hooks, while leveraging the framework helper for the .g_fmt hook.
Signed-off-by: Jai Luthra <jai.luthra@...asonboard.com>
--
Cc: Dafna Hirschfeld <dafna@...tmail.com>
Cc: Laurent Pinchart <laurent.pinchart@...asonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@...nel.org>
Cc: Heiko Stuebner <heiko@...ech.de>
Cc: linux-media@...r.kernel.org
Cc: linux-rockchip@...ts.infradead.org
Cc: linux-arm-kernel@...ts.infradead.org
Cc: linux-kernel@...r.kernel.org
---
.../platform/rockchip/rkisp1/rkisp1-capture.c | 135 +++++++++++----------
.../media/platform/rockchip/rkisp1/rkisp1-common.h | 4 -
2 files changed, 70 insertions(+), 69 deletions(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
index 38541f482b2d0dcf23546a0b9f893fb8544bcc40..81bf4ed8bccdb0873c910fa49b22ef72eab295eb 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
@@ -482,7 +482,10 @@ static void rkisp1_irq_frame_end_enable(struct rkisp1_capture *cap)
static void rkisp1_mp_config(struct rkisp1_capture *cap)
{
- const struct v4l2_pix_format_mplane *pixm = &cap->pix.fmt;
+ const struct v4l2_format *format =
+ video_device_state_get_fmt(cap->vnode.vdev.state);
+ const struct v4l2_pix_format_mplane *pixm = &format->fmt.pix_mp;
+ u32 stride = pixm->plane_fmt[0].bytesperline / cap->pix.info->bpp[0];
struct rkisp1_device *rkisp1 = cap->rkisp1;
u32 reg;
@@ -494,11 +497,11 @@ static void rkisp1_mp_config(struct rkisp1_capture *cap)
rkisp1_pixfmt_comp_size(pixm, RKISP1_PLANE_CR));
if (rkisp1_has_feature(rkisp1, MAIN_STRIDE)) {
- rkisp1_write(rkisp1, RKISP1_CIF_MI_MP_Y_LLENGTH, cap->stride);
+ rkisp1_write(rkisp1, RKISP1_CIF_MI_MP_Y_LLENGTH, stride);
rkisp1_write(rkisp1, RKISP1_CIF_MI_MP_Y_PIC_WIDTH, pixm->width);
rkisp1_write(rkisp1, RKISP1_CIF_MI_MP_Y_PIC_HEIGHT, pixm->height);
rkisp1_write(rkisp1, RKISP1_CIF_MI_MP_Y_PIC_SIZE,
- cap->stride * pixm->height);
+ stride * pixm->height);
}
rkisp1_irq_frame_end_enable(cap);
@@ -546,7 +549,10 @@ static void rkisp1_mp_config(struct rkisp1_capture *cap)
static void rkisp1_sp_config(struct rkisp1_capture *cap)
{
- const struct v4l2_pix_format_mplane *pixm = &cap->pix.fmt;
+ const struct v4l2_format *format =
+ video_device_state_get_fmt(cap->vnode.vdev.state);
+ const struct v4l2_pix_format_mplane *pixm = &format->fmt.pix_mp;
+ u32 stride = pixm->plane_fmt[0].bytesperline / cap->pix.info->bpp[0];
struct rkisp1_device *rkisp1 = cap->rkisp1;
u32 mi_ctrl, reg;
@@ -557,11 +563,11 @@ static void rkisp1_sp_config(struct rkisp1_capture *cap)
rkisp1_write(rkisp1, cap->config->mi.cr_size_init,
rkisp1_pixfmt_comp_size(pixm, RKISP1_PLANE_CR));
- rkisp1_write(rkisp1, RKISP1_CIF_MI_SP_Y_LLENGTH, cap->stride);
+ rkisp1_write(rkisp1, RKISP1_CIF_MI_SP_Y_LLENGTH, stride);
rkisp1_write(rkisp1, RKISP1_CIF_MI_SP_Y_PIC_WIDTH, pixm->width);
rkisp1_write(rkisp1, RKISP1_CIF_MI_SP_Y_PIC_HEIGHT, pixm->height);
rkisp1_write(rkisp1, RKISP1_CIF_MI_SP_Y_PIC_SIZE,
- cap->stride * pixm->height);
+ stride * pixm->height);
rkisp1_irq_frame_end_enable(cap);
@@ -704,7 +710,9 @@ static const struct rkisp1_capture_ops rkisp1_capture_ops_sp = {
static int rkisp1_dummy_buf_create(struct rkisp1_capture *cap)
{
- const struct v4l2_pix_format_mplane *pixm = &cap->pix.fmt;
+ const struct v4l2_format *format =
+ video_device_state_get_fmt(cap->vnode.vdev.state);
+ const struct v4l2_pix_format_mplane *pixm = &format->fmt.pix_mp;
struct rkisp1_dummy_buffer *dummy_buf = &cap->buf.dummy;
dummy_buf->size = max3(rkisp1_pixfmt_comp_size(pixm, RKISP1_PLANE_Y),
@@ -869,7 +877,9 @@ static int rkisp1_vb2_queue_setup(struct vb2_queue *queue,
struct device *alloc_devs[])
{
struct rkisp1_capture *cap = queue->drv_priv;
- const struct v4l2_pix_format_mplane *pixm = &cap->pix.fmt;
+ const struct v4l2_format *format =
+ video_device_state_get_fmt(cap->vnode.vdev.state);
+ const struct v4l2_pix_format_mplane *pixm = &format->fmt.pix_mp;
unsigned int i;
if (*num_planes) {
@@ -894,7 +904,9 @@ static int rkisp1_vb2_buf_init(struct vb2_buffer *vb)
struct rkisp1_buffer *ispbuf =
container_of(vbuf, struct rkisp1_buffer, vb);
struct rkisp1_capture *cap = vb->vb2_queue->drv_priv;
- const struct v4l2_pix_format_mplane *pixm = &cap->pix.fmt;
+ const struct v4l2_format *format =
+ video_device_state_get_fmt(cap->vnode.vdev.state);
+ const struct v4l2_pix_format_mplane *pixm = &format->fmt.pix_mp;
unsigned int i;
memset(ispbuf->buff_addr, 0, sizeof(ispbuf->buff_addr));
@@ -936,10 +948,13 @@ static void rkisp1_vb2_buf_queue(struct vb2_buffer *vb)
static int rkisp1_vb2_buf_prepare(struct vb2_buffer *vb)
{
struct rkisp1_capture *cap = vb->vb2_queue->drv_priv;
+ const struct v4l2_format *format =
+ video_device_state_get_fmt(cap->vnode.vdev.state);
+ const struct v4l2_pix_format_mplane *pixm = &format->fmt.pix_mp;
unsigned int i;
- for (i = 0; i < cap->pix.fmt.num_planes; i++) {
- unsigned long size = cap->pix.fmt.plane_fmt[i].sizeimage;
+ for (i = 0; i < pixm->num_planes; i++) {
+ unsigned long size = pixm->plane_fmt[i].sizeimage;
if (vb2_plane_size(vb, i) < size) {
dev_err(cap->rkisp1->dev,
@@ -1278,7 +1293,7 @@ rkisp1_find_fmt_cfg(const struct rkisp1_capture *cap, const u32 pixelfmt)
return NULL;
}
-static void rkisp1_try_fmt(const struct rkisp1_capture *cap,
+static void rkisp1_adj_fmt(const struct rkisp1_capture *cap,
struct v4l2_pix_format_mplane *pixm,
const struct rkisp1_capture_fmt_cfg **fmt_cfg,
const struct v4l2_format_info **fmt_info)
@@ -1317,23 +1332,23 @@ static void rkisp1_try_fmt(const struct rkisp1_capture *cap,
*fmt_info = info;
}
-static void rkisp1_set_fmt(struct rkisp1_capture *cap,
- struct v4l2_pix_format_mplane *pixm)
-{
- rkisp1_try_fmt(cap, pixm, &cap->pix.cfg, &cap->pix.info);
-
- cap->pix.fmt = *pixm;
- cap->stride = pixm->plane_fmt[0].bytesperline / cap->pix.info->bpp[0];
-}
-
-static int rkisp1_try_fmt_vid_cap_mplane(struct file *file,
+static int rkisp1_adj_fmt_vid_cap_mplane(struct file *file,
struct video_device_state *state,
struct v4l2_format *f)
{
struct rkisp1_capture *cap = video_drvdata(file);
- rkisp1_try_fmt(cap, &f->fmt.pix_mp, NULL, NULL);
+ if (state->which == VIDEO_DEVICE_STATE_ACTIVE) {
+ if (vb2_is_busy(cap->vnode.vdev.queue))
+ return -EBUSY;
+ rkisp1_adj_fmt(cap, &f->fmt.pix_mp, &cap->pix.cfg,
+ &cap->pix.info);
+ } else {
+ rkisp1_adj_fmt(cap, &f->fmt.pix_mp, NULL, NULL);
+ }
+
+ state->fmt = *f;
return 0;
}
@@ -1402,33 +1417,6 @@ static int rkisp1_enum_framesizes(struct file *file,
return 0;
}
-static int rkisp1_s_fmt_vid_cap_mplane(struct file *file,
- struct video_device_state *state,
- struct v4l2_format *f)
-{
- struct rkisp1_capture *cap = video_drvdata(file);
- struct rkisp1_vdev_node *node =
- rkisp1_vdev_to_node(&cap->vnode.vdev);
-
- if (vb2_is_busy(&node->buf_queue))
- return -EBUSY;
-
- rkisp1_set_fmt(cap, &f->fmt.pix_mp);
-
- return 0;
-}
-
-static int rkisp1_g_fmt_vid_cap_mplane(struct file *file,
- struct video_device_state *state,
- struct v4l2_format *f)
-{
- struct rkisp1_capture *cap = video_drvdata(file);
-
- f->fmt.pix_mp = cap->pix.fmt;
-
- return 0;
-}
-
static int
rkisp1_querycap(struct file *file, struct video_device_state *state,
struct v4l2_capability *cap)
@@ -1450,9 +1438,9 @@ static const struct v4l2_ioctl_ops rkisp1_v4l2_ioctl_ops = {
.vidioc_prepare_buf = vb2_ioctl_prepare_buf,
.vidioc_streamon = vb2_ioctl_streamon,
.vidioc_streamoff = vb2_ioctl_streamoff,
- .vidioc_try_fmt_vid_cap_mplane = rkisp1_try_fmt_vid_cap_mplane,
- .vidioc_s_fmt_vid_cap_mplane = rkisp1_s_fmt_vid_cap_mplane,
- .vidioc_g_fmt_vid_cap_mplane = rkisp1_g_fmt_vid_cap_mplane,
+ .vidioc_try_fmt_vid_cap_mplane = rkisp1_adj_fmt_vid_cap_mplane,
+ .vidioc_s_fmt_vid_cap_mplane = rkisp1_adj_fmt_vid_cap_mplane,
+ .vidioc_g_fmt_vid_cap_mplane = video_device_g_fmt,
.vidioc_enum_fmt_vid_cap = rkisp1_enum_fmt_vid_cap_mplane,
.vidioc_enum_framesizes = rkisp1_enum_framesizes,
.vidioc_querycap = rkisp1_querycap,
@@ -1460,6 +1448,25 @@ static const struct v4l2_ioctl_ops rkisp1_v4l2_ioctl_ops = {
.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
};
+static int rkisp1_vdev_init_state(struct video_device_state *state)
+{
+ struct rkisp1_capture *cap = video_get_drvdata(state->vdev);
+ struct v4l2_pix_format_mplane *pixm = &state->fmt.fmt.pix_mp;
+
+ state->fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
+ pixm->pixelformat = V4L2_PIX_FMT_YUYV;
+ pixm->width = RKISP1_DEFAULT_WIDTH;
+ pixm->height = RKISP1_DEFAULT_HEIGHT;
+
+ rkisp1_adj_fmt(cap, pixm, &cap->pix.cfg, &cap->pix.info);
+
+ return 0;
+}
+
+static const struct video_device_internal_ops rkisp1_vdev_ops = {
+ .init_state = rkisp1_vdev_init_state,
+};
+
static int rkisp1_capture_link_validate(struct media_link *link)
{
struct video_device *vdev =
@@ -1467,8 +1474,11 @@ static int rkisp1_capture_link_validate(struct media_link *link)
struct v4l2_subdev *sd =
media_entity_to_v4l2_subdev(link->source->entity);
struct rkisp1_capture *cap = video_get_drvdata(vdev);
+ const struct v4l2_format *format =
+ video_device_state_get_fmt(cap->vnode.vdev.state);
+ const struct v4l2_pix_format_mplane *pixm = &format->fmt.pix_mp;
const struct rkisp1_capture_fmt_cfg *fmt =
- rkisp1_find_fmt_cfg(cap, cap->pix.fmt.pixelformat);
+ rkisp1_find_fmt_cfg(cap, pixm->pixelformat);
struct v4l2_subdev_format sd_fmt = {
.which = V4L2_SUBDEV_FORMAT_ACTIVE,
.pad = link->source->index,
@@ -1479,16 +1489,16 @@ static int rkisp1_capture_link_validate(struct media_link *link)
if (ret)
return ret;
- if (sd_fmt.format.height != cap->pix.fmt.height ||
- sd_fmt.format.width != cap->pix.fmt.width ||
+ if (sd_fmt.format.height != pixm->height ||
+ sd_fmt.format.width != pixm->width ||
sd_fmt.format.code != fmt->mbus) {
dev_dbg(cap->rkisp1->dev,
"link '%s':%u -> '%s':%u not valid: 0x%04x/%ux%u != 0x%04x/%ux%u\n",
link->source->entity->name, link->source->index,
link->sink->entity->name, link->sink->index,
sd_fmt.format.code, sd_fmt.format.width,
- sd_fmt.format.height, fmt->mbus, cap->pix.fmt.width,
- cap->pix.fmt.height);
+ sd_fmt.format.height, fmt->mbus, pixm->width,
+ pixm->height);
return -EPIPE;
}
@@ -1546,6 +1556,7 @@ static int rkisp1_register_capture(struct rkisp1_capture *cap)
mutex_init(&node->vlock);
vdev->ioctl_ops = &rkisp1_v4l2_ioctl_ops;
+ vdev->vdev_ops = &rkisp1_vdev_ops;
vdev->release = video_device_release_empty;
vdev->fops = &rkisp1_fops;
vdev->minor = -1;
@@ -1554,6 +1565,7 @@ static int rkisp1_register_capture(struct rkisp1_capture *cap)
vdev->device_caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE |
V4L2_CAP_STREAMING | V4L2_CAP_IO_MC;
vdev->entity.ops = &rkisp1_media_ops;
+ set_bit(V4L2_FL_USES_STATE, &vdev->flags);
video_set_drvdata(vdev, cap);
vdev->vfl_dir = VFL_DIR_RX;
node->pad.flags = MEDIA_PAD_FL_SINK;
@@ -1604,7 +1616,6 @@ static void
rkisp1_capture_init(struct rkisp1_device *rkisp1, enum rkisp1_stream_id id)
{
struct rkisp1_capture *cap = &rkisp1->capture_devs[id];
- struct v4l2_pix_format_mplane pixm;
memset(cap, 0, sizeof(*cap));
cap->id = id;
@@ -1622,12 +1633,6 @@ rkisp1_capture_init(struct rkisp1_device *rkisp1, enum rkisp1_stream_id id)
}
cap->is_streaming = false;
-
- memset(&pixm, 0, sizeof(pixm));
- pixm.pixelformat = V4L2_PIX_FMT_YUYV;
- pixm.width = RKISP1_DEFAULT_WIDTH;
- pixm.height = RKISP1_DEFAULT_HEIGHT;
- rkisp1_set_fmt(cap, &pixm);
}
int rkisp1_capture_devs_register(struct rkisp1_device *rkisp1)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
index 6028ecdd23de6f69d53f77796252ee399a14436a..5731c4b368f8832c2b0748338cd0da2d0edf0a93 100644
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
@@ -309,7 +309,6 @@ struct rkisp1_device;
* handler to stop the streaming by waiting on the 'done' wait queue.
* If the irq handler is not called, the stream is stopped by the callback
* after timeout.
- * @stride: the line stride for the first plane, in pixel units
* @buf.lock: lock to protect buf.queue
* @buf.queue: queued buffer list
* @buf.dummy: dummy space to store dropped data
@@ -319,7 +318,6 @@ struct rkisp1_device;
* @buf.next: the buffer used for next frame
* @pix.cfg: pixel configuration
* @pix.info: a pointer to the v4l2_format_info of the pixel format
- * @pix.fmt: buffer format
*/
struct rkisp1_capture {
struct rkisp1_vdev_node vnode;
@@ -330,7 +328,6 @@ struct rkisp1_capture {
bool is_streaming;
bool is_stopping;
wait_queue_head_t done;
- unsigned int stride;
struct {
/* protects queue, curr and next */
spinlock_t lock;
@@ -342,7 +339,6 @@ struct rkisp1_capture {
struct {
const struct rkisp1_capture_fmt_cfg *cfg;
const struct v4l2_format_info *info;
- struct v4l2_pix_format_mplane fmt;
} pix;
};
--
2.51.0
Powered by blists - more mailing lists