media: intel/ipu6: initial ipu7 code sharing preparation
Subsystems (2)
v2 cover media: intel/ipu6: initial ipu7 code sharing preparation
Create ipu-isys.h and ipu-isys-subdev.c files that intention is to be shared with incoming ipu7 driver. Do some cleanups on the way.
This is on top of:
https://git.linuxtv.org/sailus/media_tree.git/log/?h=devel
plus one patch:
https://lore.kernel.org/linux-media/[email protected]/
v1 -> v2:
use ipu_isys_ prefix for common ipuX code
Stanislaw Gruszka (5):
media: intel/ipu6: Separate ipu6 subdev functions
media: intel/ipu6: Remove ipu6_isys dependency from ipu6_isys_subdev
media: intel/ipu6: Remove redundant ipu6_isys_subdev_to_csi2 macro
media: intel/ipu6: Rename ipu6_isys_subdev
media: intel/ipu6: Move ipu_isys_subdev functions to common code
drivers/media/pci/intel/ipu6/Makefile | 3 +- .../media/pci/intel/ipu6/ipu-isys-subdev.c | 255 ++++++++++++++++++ drivers/media/pci/intel/ipu6/ipu-isys.h | 44 +++ drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 31 +-- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 7 +- .../media/pci/intel/ipu6/ipu6-isys-queue.c | 6 +- .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 249 +---------------- .../media/pci/intel/ipu6/ipu6-isys-subdev.h | 40 +-- .../media/pci/intel/ipu6/ipu6-isys-video.c | 27 +- .../media/pci/intel/ipu6/ipu6-isys-video.h | 4 +- drivers/media/pci/intel/ipu6/ipu6-isys.c | 2 +- 11 files changed, 338 insertions(+), 330 deletions(-) create mode 100644 drivers/media/pci/intel/ipu6/ipu-isys-subdev.c create mode 100644 drivers/media/pci/intel/ipu6/ipu-isys.h
Signature · 1 line
2.34.1
PATCH v2 1/5 media: intel/ipu6: Separate ipu6 subdev functions
Move ipu6 isys functions that do not have dependency's other than v4l-subdev into separate file. Rename them using ipu_isys_ prefix.
This is initial commit of changes that separate layers in ipu6 driver to make them reusable in incoming ipu7 driver.
--- drivers/media/pci/intel/ipu6/Makefile | 3 +- .../media/pci/intel/ipu6/ipu-isys-subdev.c | 94 +++++++++++++++++++ drivers/media/pci/intel/ipu6/ipu-isys.h | 19 ++++ drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 2 +- .../media/pci/intel/ipu6/ipu6-isys-queue.c | 6 +- .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 68 -------------- .../media/pci/intel/ipu6/ipu6-isys-subdev.h | 11 +-- .../media/pci/intel/ipu6/ipu6-isys-video.c | 17 ++-- 8 files changed, 129 insertions(+), 91 deletions(-) create mode 100644 drivers/media/pci/intel/ipu6/ipu-isys-subdev.c create mode 100644 drivers/media/pci/intel/ipu6/ipu-isys.h
drivers/media/pci/intel/ipu6/Makefile +2 -1
@@ -18,6 +18,7 @@ intel-ipu6-isys-y := ipu6-isys.o \ ipu6-isys-subdev.o \ ipu6-isys-mcd-phy.o \ ipu6-isys-jsl-phy.o \ - ipu6-isys-dwc-phy.o + ipu6-isys-dwc-phy.o \ + ipu-isys-subdev.o obj-$(CONFIG_VIDEO_INTEL_IPU6) += intel-ipu6-isys.o
drivers/media/pci/intel/ipu6/ipu-isys-subdev.c new file +94 -0
94 lines not on this page · raw message
drivers/media/pci/intel/ipu6/ipu-isys.h new file +19 -0
@@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 2025 Intel Corporation */ + +#ifndef IPU_ISYS_H +#define IPU_ISYS_H + +#include <media/v4l2-subdev.h> + +int ipu_isys_get_stream_pad_fmt (struct v4l2_subdev *sd,u32 pad,u32 stream, +struct v4l2_mbus_framefmt *format); +int ipu_isys_get_stream_pad_crop (struct v4l2_subdev *sd,u32 pad,u32 stream, +struct v4l2_rect *crop); +u32 ipu_isys_get_src_stream_by_src_pad (struct v4l2_subdev *sd,u32 pad); + +int ipu_isys_subdev_set_routing (struct v4l2_subdev *sd, +struct v4l2_subdev_state *state, +enum v4l2_subdev_format_whence which, +struct v4l2_subdev_krouting *routing); +#endif
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +1 -1
@@ -494,7 +494,7 @@ static const struct v4l2_subdev_pad_ops csi2_sd_pad_ops = { .get_selection = ipu6_isys_csi2_get_sel, .set_selection = ipu6_isys_csi2_set_sel, .enum_mbus_code = ipu6_isys_subdev_enum_mbus_code, - .set_routing = ipu6_isys_subdev_set_routing, + .set_routing = ipu_isys_subdev_set_routing, .enable_streams = ipu6_isys_csi2_enable_streams, .disable_streams = ipu6_isys_csi2_disable_streams, };
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c +3 -3
@@ -446,10 +446,10 @@ static int ipu6_isys_link_fmt_validate(struct ipu6_isys_queue *aq)return -ENOTCONN ; sd =media_entity_to_v4l2_subdev (remote_pad->entity); - r_stream =ipu6_isys_get_src_stream_by_src_pad (sd, remote_pad->index); + r_stream =ipu_isys_get_src_stream_by_src_pad (sd, remote_pad->index); - ret =ipu6_isys_get_stream_pad_fmt (sd, remote_pad->index, r_stream, - &format); + ret =ipu_isys_get_stream_pad_fmt (sd, remote_pad->index, r_stream, + &format);if (ret) { dev_dbg(dev, "failed to get %s: pad %d, stream:%d format\n",
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +0 -68
80 lines not on this page · raw message
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h +2 -9
@@ -10,6 +10,8 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h> +#include "ipu-isys.h" +struct ipu6_isys ;struct ipu6_isys_subdev {
@@ -37,15 +39,6 @@ int ipu6_isys_subdev_enum_mbus_code(struct v4l2_subdev *sd,struct v4l2_subdev_state *state, struct v4l2_subdev_mbus_code_enum *code); -u32 ipu6_isys_get_src_stream_by_src_pad (struct v4l2_subdev *sd,u32 pad); -int ipu6_isys_get_stream_pad_fmt (struct v4l2_subdev *sd,u32 pad,u32 stream, -struct v4l2_mbus_framefmt *format); -int ipu6_isys_get_stream_pad_crop (struct v4l2_subdev *sd,u32 pad,u32 stream, -struct v4l2_rect *crop); -int ipu6_isys_subdev_set_routing (struct v4l2_subdev *sd, -struct v4l2_subdev_state *state, -enum v4l2_subdev_format_whence which, -struct v4l2_subdev_krouting *routing); int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd, const struct v4l2_subdev_ops *ops, unsigned int nr_ctrls,
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +8 -9
@@ -387,7 +387,7 @@ static int link_validate(struct media_link *link) link->sink->entity->name); s_pad =media_pad_remote_pad_first (&av->pad); - s_stream =ipu6_isys_get_src_stream_by_src_pad (s_sd, s_pad->index); + s_stream =ipu_isys_get_src_stream_by_src_pad (s_sd, s_pad->index);v4l2_subdev_lock_state (s_state);
@@ -456,16 +456,15 @@ static int ipu6_isys_fw_pin_cfg(struct ipu6_isys_video *av,u32 src_stream;int ret; - src_stream =ipu6_isys_get_src_stream_by_src_pad (sd, src_pad->index); - ret =ipu6_isys_get_stream_pad_fmt (sd, src_pad->index, src_stream, - &fmt); + src_stream =ipu_isys_get_src_stream_by_src_pad (sd, src_pad->index); + ret =ipu_isys_get_stream_pad_fmt (sd, src_pad->index, src_stream, &fmt);if (ret <0 ) {dev_err (dev,"can't get stream format (%d)\n" , ret);return ret; } - ret =ipu6_isys_get_stream_pad_crop (sd, src_pad->index, src_stream, - &v4l2_crop); + ret =ipu_isys_get_stream_pad_crop (sd, src_pad->index, src_stream, + &v4l2_crop);if (ret <0 ) {dev_err (dev,"can't get stream crop (%d)\n" , ret);return ret;
@@ -776,8 +775,8 @@ void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av, link_freq =ipu6_isys_csi2_get_link_freq (csi2);if (link_freq >0 ) { lanes = csi2->nlanes; - ret =ipu6_isys_get_stream_pad_fmt (&csi2->asd.sd,0 , - av->source_stream, &format); + ret =ipu_isys_get_stream_pad_fmt (&csi2->asd.sd,0 , + av->source_stream, &format);if (!ret) { bpp =ipu6_isys_mbus_code_to_bpp (format.code); pixel_rate =mul_u64_u32_div (link_freq, lanes *2 , bpp);
@@ -1003,7 +1002,7 @@ int ipu6_isys_video_set_streaming(struct ipu6_isys_video *av, int state, sd = &stream->asd->sd; r_pad =media_pad_remote_pad_first (&av->pad); - r_stream =ipu6_isys_get_src_stream_by_src_pad (sd, r_pad->index); + r_stream =ipu_isys_get_src_stream_by_src_pad (sd, r_pad->index); subdev_state =v4l2_subdev_lock_and_get_active_state (sd); routing = &subdev_state->routing;
Signature · 1 line
2.34.1
PATCH v2 2/5 media: intel/ipu6: Remove ipu6_isys dependency from ipu6_isys_subdev
In reply to Stanislaw Gruszkaisys back pointer of ipu6_isys_subdev structure is only used to get pointer to struct device. We can use device pointer directly, what would allow to refactor ipu6 subdev code to make it more independent.
--- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 15 ++++----------- drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c | 10 ++++------ drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h | 8 ++------ 3 files changed, 10 insertions(+), 23 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +4 -11
@@ -98,12 +98,8 @@ s64 ipu6_isys_csi2_get_link_freq(struct ipu6_isys_csi2 *csi2)static int csi2_subscribe_event (struct v4l2_subdev *sd,struct v4l2_fh *fh,struct v4l2_event_subscription *sub) { -struct ipu6_isys_subdev *asd =to_ipu6_isys_subdev (sd); -struct ipu6_isys_csi2 *csi2 =to_ipu6_isys_csi2 (asd); -struct device *dev = &csi2->isys->adev->auxdev.dev; - -dev_dbg (dev,"csi2 subscribe event(type %u id %u)\n" , - sub->type, sub->id); +dev_dbg (sd->dev,"csi2 subscribe event(type %u id %u)\n" , sub->type, + sub->id);switch (sub->type) {case V4L2_EVENT_FRAME_SYNC :
@@ -402,8 +398,6 @@ static int ipu6_isys_csi2_set_sel(struct v4l2_subdev *sd,struct v4l2_subdev_state *state, struct v4l2_subdev_selection *sel) { - struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(sd); -struct device *dev = &asd->isys->adev->auxdev.dev; struct v4l2_mbus_framefmt *sink_ffmt;struct v4l2_mbus_framefmt *src_ffmt;struct v4l2_rect *crop;
@@ -442,7 +436,7 @@ static int ipu6_isys_csi2_set_sel(struct v4l2_subdev *sd, src_ffmt->code =ipu6_isys_convert_bayer_order (sink_ffmt->code, sel->r.left, sel->r.top); -dev_dbg (dev,"set crop for %s sel: %d,%d,%d,%d code: 0x%x\n" , +dev_dbg (sd->dev,"set crop for %s sel: %d,%d,%d,%d code: 0x%x\n" , sd->name, sel->r.left, sel->r.top, sel->r.width, sel->r.height, src_ffmt->code);
@@ -532,8 +526,7 @@ int ipu6_isys_csi2_init(struct ipu6_isys_csi2 *csi2, csi2->port = index; csi2->asd.sd.entity.ops = &csi2_entity_ops; - csi2->asd.isys = isys; - ret =ipu6_isys_subdev_init (&csi2->asd, &csi2_sd_ops,0 , + ret =ipu6_isys_subdev_init (&csi2->asd, dev, &csi2_sd_ops,0 ,NR_OF_CSI2_SINK_PADS ,NR_OF_CSI2_SRC_PADS );if (ret) goto fail;
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +4 -6
@@ -265,10 +265,9 @@ static const struct v4l2_subdev_internal_ops ipu6_isys_subdev_internal_ops = { .init_state = ipu6_isys_subdev_init_state, }; -int ipu6_isys_subdev_init (struct ipu6_isys_subdev *asd, +int ipu6_isys_subdev_init (struct ipu6_isys_subdev *asd,struct device *dev,const struct v4l2_subdev_ops *ops, -unsigned int nr_ctrls, -unsigned int num_sink_pads, +unsigned int nr_ctrls,unsigned int num_sink_pads,unsigned int num_source_pads) {unsigned int num_pads = num_sink_pads + num_source_pads;
@@ -281,12 +280,11 @@ int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd,V4L2_SUBDEV_FL_HAS_EVENTS |V4L2_SUBDEV_FL_STREAMS ; asd->sd.owner =THIS_MODULE ; - asd->sd.dev = &asd->isys->adev->auxdev.dev; + asd->sd.dev = dev; asd->sd.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; asd->sd.internal_ops = &ipu6_isys_subdev_internal_ops; - asd->pad =devm_kcalloc (&asd->isys->adev->auxdev.dev, num_pads, -sizeof (*asd->pad),GFP_KERNEL ); + asd->pad =devm_kcalloc (dev, num_pads,sizeof (*asd->pad),GFP_KERNEL );if (!asd->pad)return -ENOMEM ;
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h +2 -6
@@ -12,11 +12,8 @@#include "ipu-isys.h" -struct ipu6_isys ; -struct ipu6_isys_subdev {struct v4l2_subdev sd; -struct ipu6_isys *isys;u32 const *supported_codes;struct media_pad *pad;struct v4l2_ctrl_handler ctrl_handler;
@@ -39,10 +36,9 @@ int ipu6_isys_subdev_enum_mbus_code(struct v4l2_subdev *sd,struct v4l2_subdev_state *state, struct v4l2_subdev_mbus_code_enum *code); -int ipu6_isys_subdev_init (struct ipu6_isys_subdev *asd, +int ipu6_isys_subdev_init (struct ipu6_isys_subdev *asd,struct device *dev,const struct v4l2_subdev_ops *ops, -unsigned int nr_ctrls, -unsigned int num_sink_pads, +unsigned int nr_ctrls,unsigned int num_sink_pads,unsigned int num_source_pads);void ipu6_isys_subdev_cleanup (struct ipu6_isys_subdev *asd);#endif /* IPU6_ISYS_SUBDEV_H */
Signature · 1 line
2.34.1
Sakari Ailus
maintainerRe: [PATCH v2 2/5] media: intel/ipu6: Remove ipu6_isys dependency from ipu6_isys_subdev
Hi Stanislaw,
Quoted 63 lines · Stanislaw Gruszka
isys back pointer of
ipu6_isys_subdevstructure is only used to get pointer to struct device. We can use device pointer directly, what would allow to refactor ipu6 subdev code to make it more independent.Signed-off-by Stanislaw Gruszka <[email protected]>--- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 15 ++++----------- drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c | 10 ++++------ drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h | 8 ++------ 3 files changed, 10 insertions(+), 23 deletions(-)drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +4
-11@@ -98,12 +98,8 @@ s64 ipu6_isys_csi2_get_link_freq(struct ipu6_isys_csi2 *csi2)static int csi2_subscribe_event (struct v4l2_subdev *sd,struct v4l2_fh *fh,struct v4l2_event_subscription *sub) { -struct ipu6_isys_subdev *asd =to_ipu6_isys_subdev (sd); -struct ipu6_isys_csi2 *csi2 =to_ipu6_isys_csi2 (asd); -struct device *dev = &csi2->isys->adev->auxdev.dev; - -dev_dbg (dev,"csi2 subscribe event(type %u id %u)\n" , - sub->type, sub->id); +dev_dbg (sd->dev,"csi2 subscribe event(type %u id %u)\n" , sub->type, + sub->id);switch (sub->type) {case V4L2_EVENT_FRAME_SYNC :@@ -402,8 +398,6 @@ static int ipu6_isys_csi2_set_sel(struct v4l2_subdev *sd,struct v4l2_subdev_state *state, struct v4l2_subdev_selection *sel) { - struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(sd); -struct device *dev = &asd->isys->adev->auxdev.dev; struct v4l2_mbus_framefmt *sink_ffmt;struct v4l2_mbus_framefmt *src_ffmt;struct v4l2_rect *crop;@@ -442,7 +436,7 @@ static int ipu6_isys_csi2_set_sel(struct v4l2_subdev *sd, src_ffmt->code =ipu6_isys_convert_bayer_order (sink_ffmt->code, sel->r.left, sel->r.top); -dev_dbg (dev,"set crop for %s sel: %d,%d,%d,%d code: 0x%x\n" , +dev_dbg (sd->dev,"set crop for %s sel: %d,%d,%d,%d code: 0x%x\n" , sd->name, sel->r.left, sel->r.top, sel->r.width, sel->r.height, src_ffmt->code);@@ -532,8 +526,7 @@ int ipu6_isys_csi2_init(struct ipu6_isys_csi2 *csi2, csi2->port = index; csi2->asd.sd.entity.ops = &csi2_entity_ops; - csi2->asd.isys = isys; - ret =ipu6_isys_subdev_init (&csi2->asd, &csi2_sd_ops,0 , + ret =ipu6_isys_subdev_init (&csi2->asd, dev, &csi2_sd_ops,0 ,NR_OF_CSI2_SINK_PADS ,NR_OF_CSI2_SRC_PADS );if (ret) goto fail;drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +0
-0
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c static const struct v4l2_subdev_internal_ops ipu6_isys_subdev_internal_ops = { · line 268
Quoted 5 lines
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +1
-1@@ -265,10 +265,9 @@ static const struct v4l2_subdev_internal_ops ipu6_isys_subdev_internal_ops = { .init_state = ipu6_isys_subdev_init_state, }; -int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd, +int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd, struct device *dev,
I wouldn't pass a function arguments that it already has access to through other means, i.e. dev in this case.
That being said, having a macro to obtain a struct device pointer based on sub-device or isys could be nice, it could be called e.g. ipu_isys_to_dev(). As this patch is simply moving the code around I'd add this in a separate patch.
Quoted 51 lines
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +3
-5const struct v4l2_subdev_ops *ops, - unsigned int nr_ctrls, - unsigned int num_sink_pads, + unsigned int nr_ctrls, unsigned int num_sink_pads, unsigned int num_source_pads) { unsigned int num_pads = num_sink_pads + num_source_pads;@@ -281,12 +280,11 @@ int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd,V4L2_SUBDEV_FL_HAS_EVENTS |V4L2_SUBDEV_FL_STREAMS ; asd->sd.owner =THIS_MODULE ; - asd->sd.dev = &asd->isys->adev->auxdev.dev; + asd->sd.dev = dev; asd->sd.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; asd->sd.internal_ops = &ipu6_isys_subdev_internal_ops; - asd->pad =devm_kcalloc (&asd->isys->adev->auxdev.dev, num_pads, -sizeof (*asd->pad),GFP_KERNEL ); + asd->pad =devm_kcalloc (dev, num_pads,sizeof (*asd->pad),GFP_KERNEL );if (!asd->pad)return -ENOMEM ;drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h +2
-6@@ -12,11 +12,8 @@#include "ipu-isys.h" -struct ipu6_isys ; -struct ipu6_isys_subdev {struct v4l2_subdev sd; -struct ipu6_isys *isys;u32 const *supported_codes;struct media_pad *pad;struct v4l2_ctrl_handler ctrl_handler;@@ -39,10 +36,9 @@ int ipu6_isys_subdev_enum_mbus_code(struct v4l2_subdev *sd,struct v4l2_subdev_state *state, struct v4l2_subdev_mbus_code_enum *code); -int ipu6_isys_subdev_init (struct ipu6_isys_subdev *asd, +int ipu6_isys_subdev_init (struct ipu6_isys_subdev *asd,struct device *dev,const struct v4l2_subdev_ops *ops, -unsigned int nr_ctrls, -unsigned int num_sink_pads, +unsigned int nr_ctrls,unsigned int num_sink_pads,unsigned int num_source_pads);void ipu6_isys_subdev_cleanup (struct ipu6_isys_subdev *asd);#endif /* IPU6_ISYS_SUBDEV_H */
Signature · 3 lines
Regards, Sakari Ailus
Sakari Ailus
maintainerRe: [PATCH v2 2/5] media: intel/ipu6: Remove ipu6_isys dependency from ipu6_isys_subdev
Quoted 8 lines · Sakari Ailus
Quoted 8 lines
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +0
-0@@ -265,10 +265,9 @@ static const struct v4l2_subdev_internal_ops ipu6_isys_subdev_internal_ops = { .init_state = ipu6_isys_subdev_init_state, };
Quoted 5 lines
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c static const struct v4l2_subdev_internal_ops ipu6_isys_subdev_internal_ops = { · line 268
Quoted 2 lines
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +1
-1-int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd, +int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd, struct device *dev,I wouldn't pass a function arguments that it already has access to through other means, i.e. dev in this case.
Oh, please ignore the above. The comment below still holds though. :-)
Quoted 5 lines
That being said, having a macro to obtain a struct device pointer based on sub-device or isys could be nice, it could be called e.g.
ipu_isys_to_dev(). As this patch is simply moving the code around I'd add this in a separate patch.
Signature · 1 line
Sakari Ailus
PATCH v2 3/5 media: intel/ipu6: Remove redundant ipu6_isys_subdev_to_csi2 macro
In reply to Stanislaw Gruszkato_ipu6_isys_csi2 and ipu6_isys_subdev_to_csi2 are the same macros with different name, use the former one consequently.
--- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 4 ++-- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 3 --- drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 4 ++-- drivers/media/pci/intel/ipu6/ipu6-isys.c | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-)
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +2 -2
@@ -560,7 +560,7 @@ void ipu6_isys_csi2_sof_event_by_stream(struct ipu6_isys_stream *stream) {struct video_device *vdev = stream->asd->sd.devnode;struct device *dev = &stream->isys->adev->auxdev.dev; -struct ipu6_isys_csi2 *csi2 =ipu6_isys_subdev_to_csi2 (stream->asd); +struct ipu6_isys_csi2 *csi2 =to_ipu6_isys_csi2 (stream->asd);struct v4l2_event ev = { .type =V4L2_EVENT_FRAME_SYNC , };
@@ -575,7 +575,7 @@ void ipu6_isys_csi2_sof_event_by_stream(struct ipu6_isys_stream *stream)void ipu6_isys_csi2_eof_event_by_stream (struct ipu6_isys_stream *stream) {struct device *dev = &stream->isys->adev->auxdev.dev; -struct ipu6_isys_csi2 *csi2 =ipu6_isys_subdev_to_csi2 (stream->asd); +struct ipu6_isys_csi2 *csi2 =to_ipu6_isys_csi2 (stream->asd);u32 frame_sequence =atomic_read (&stream->sequence); dev_dbg(dev, "eof_event::csi2-%i sequence: %i\n",
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h +0 -3
@@ -57,9 +57,6 @@ struct ipu6_csi2_error {bool is_info_only; }; -#define ipu6_isys_subdev_to_csi2 (__sd) \ - container_of(__sd, struct ipu6_isys_csi2, asd) -#define to_ipu6_isys_csi2 (__asd) container_of(__asd, struct ipu6_isys_csi2, asd)s64 ipu6_isys_csi2_get_link_freq (struct ipu6_isys_csi2 *csi2);
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +2 -2
@@ -729,7 +729,7 @@ int ipu6_isys_video_prepare_stream(struct ipu6_isys_video *av,return -EINVAL ; stream->stream_source = stream->asd->source; - csi2 =ipu6_isys_subdev_to_csi2 (stream->asd); + csi2 =to_ipu6_isys_csi2 (stream->asd); csi2->receiver_errors =0 ; stream->source_entity = source_entity;
@@ -771,7 +771,7 @@ void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av,else av->watermark.hblank =0 ; - csi2 =ipu6_isys_subdev_to_csi2 (av->stream->asd); + csi2 =to_ipu6_isys_csi2 (av->stream->asd); link_freq =ipu6_isys_csi2_get_link_freq (csi2);if (link_freq >0 ) { lanes = csi2->nlanes;
drivers/media/pci/intel/ipu6/ipu6-isys.c +1 -1
@@ -1266,7 +1266,7 @@ static int isys_isr_one(struct ipu6_bus_device *adev) } stream->error = resp->error_info.error; - csi2 =ipu6_isys_subdev_to_csi2 (stream->asd); + csi2 =to_ipu6_isys_csi2 (stream->asd);switch (resp->type) {case IPU6_FW_ISYS_RESP_TYPE_STREAM_OPEN_DONE :
Signature · 1 line
2.34.1
PATCH v2 4/5 media: intel/ipu6: Rename ipu6_isys_subdev
In reply to Stanislaw Gruszkaipu6_isys_subdev structure will be shared with ipu7, to avoid confusion rename it to ipu_isys_subdev.
--- drivers/media/pci/intel/ipu6/ipu-isys.h | 14 +++++++++++++ drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 4 ++-- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 4 +++- .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 8 ++++---- .../media/pci/intel/ipu6/ipu6-isys-subdev.h | 20 ++----------------- .../media/pci/intel/ipu6/ipu6-isys-video.c | 6 +++--- .../media/pci/intel/ipu6/ipu6-isys-video.h | 4 ++-- 7 files changed, 30 insertions(+), 30 deletions(-)
drivers/media/pci/intel/ipu6/ipu-isys.h +14 -0
@@ -4,8 +4,22 @@#ifndef IPU_ISYS_H #define IPU_ISYS_H +#include <linux/container_of.h> + +#include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h> +struct ipu_isys_subdev { +struct v4l2_subdev sd; +u32 const *supported_codes; +struct media_pad *pad; +struct v4l2_ctrl_handler ctrl_handler; +void (*ctrl_init)(struct v4l2_subdev *sd); +int source;/* SSI stream source; -1 if unset */ +}; + +#define to_ipu_isys_subdev (__sd) container_of(__sd, struct ipu_isys_subdev, sd) +int ipu_isys_get_stream_pad_fmt (struct v4l2_subdev *sd,u32 pad,u32 stream,struct v4l2_mbus_framefmt *format); int ipu_isys_get_stream_pad_crop(struct v4l2_subdev *sd, u32 pad, u32 stream,
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +2 -2
@@ -224,7 +224,7 @@ static int ipu6_isys_csi2_set_stream(struct v4l2_subdev *sd,const struct ipu6_isys_csi2_timing *timing, unsigned int nlanes, int enable) { - struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(sd); + struct ipu_isys_subdev *asd = to_ipu_isys_subdev(sd);struct ipu6_isys_csi2 *csi2 =to_ipu6_isys_csi2 (asd);struct ipu6_isys *isys = csi2->isys;struct device *dev = &isys->adev->auxdev.dev;
@@ -339,7 +339,7 @@ static int ipu6_isys_csi2_enable_streams(struct v4l2_subdev *sd,struct v4l2_subdev_state *state, u32 pad, u64 streams_mask) { - struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(sd); + struct ipu_isys_subdev *asd = to_ipu_isys_subdev(sd);struct ipu6_isys_csi2 *csi2 =to_ipu6_isys_csi2 (asd);struct ipu6_isys_csi2_timing timing = { };struct v4l2_subdev *remote_sd;
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h +3 -1
@@ -9,6 +9,8 @@#include "ipu6-isys-subdev.h" #include "ipu6-isys-video.h" +#include "ipu-isys.h" +struct media_entity ;struct v4l2_mbus_frame_desc_entry ;
@@ -35,7 +37,7 @@ struct ipu6_isys_stream;#define CSI2_CSI_RX_DLY_CNT_SETTLE_DLANE_B -2struct ipu6_isys_csi2 { -struct ipu6_isys_subdev asd; +struct ipu_isys_subdev asd;struct ipu6_isys *isys;struct ipu6_isys_video av[NR_OF_CSI2_SRC_PADS ];
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +4 -4
@@ -141,7 +141,7 @@ int ipu6_isys_subdev_set_fmt(struct v4l2_subdev *sd,struct v4l2_subdev_state *state, struct v4l2_subdev_format *format) { - struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(sd); + struct ipu_isys_subdev *asd = to_ipu_isys_subdev(sd);struct v4l2_mbus_framefmt *fmt;struct v4l2_rect *crop;u32 code = asd->supported_codes[0 ];
@@ -209,7 +209,7 @@ int ipu6_isys_subdev_enum_mbus_code(struct v4l2_subdev *sd,struct v4l2_subdev_state *state, struct v4l2_subdev_mbus_code_enum *code) { - struct ipu6_isys_subdev *asd = to_ipu6_isys_subdev(sd); + struct ipu_isys_subdev *asd = to_ipu_isys_subdev(sd);const u32 *supported_codes = asd->supported_codes;u32 index;
@@ -265,7 +265,7 @@ static const struct v4l2_subdev_internal_ops ipu6_isys_subdev_internal_ops = { .init_state = ipu6_isys_subdev_init_state, }; -int ipu6_isys_subdev_init (struct ipu6_isys_subdev *asd,struct device *dev, +int ipu6_isys_subdev_init (struct ipu_isys_subdev *asd,struct device *dev,const struct v4l2_subdev_ops *ops,unsigned int nr_ctrls,unsigned int num_sink_pads,unsigned int num_source_pads)
@@ -326,7 +326,7 @@ int ipu6_isys_subdev_init(struct ipu6_isys_subdev *asd, struct device *dev,return ret; } -void ipu6_isys_subdev_cleanup (struct ipu6_isys_subdev *asd) +void ipu6_isys_subdev_cleanup (struct ipu_isys_subdev *asd) {media_entity_cleanup (&asd->sd.entity);v4l2_ctrl_handler_free (&asd->ctrl_handler);
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h +2 -18
@@ -4,26 +4,10 @@#ifndef IPU6_ISYS_SUBDEV_H #define IPU6_ISYS_SUBDEV_H -#include <linux/container_of.h> - -#include <media/media-entity.h> -#include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h> #include "ipu-isys.h" -struct ipu6_isys_subdev { -struct v4l2_subdev sd; -u32 const *supported_codes; -struct media_pad *pad; -struct v4l2_ctrl_handler ctrl_handler; -void (*ctrl_init)(struct v4l2_subdev *sd); -int source;/* SSI stream source; -1 if unset */ -}; - -#define to_ipu6_isys_subdev (__sd) \ - container_of(__sd, struct ipu6_isys_subdev, sd) -unsigned int ipu6_isys_mbus_code_to_bpp (u32 code);unsigned int ipu6_isys_mbus_code_to_mipi (u32 code);bool ipu6_isys_is_bayer_format (u32 code);
@@ -36,9 +20,9 @@ int ipu6_isys_subdev_enum_mbus_code(struct v4l2_subdev *sd,struct v4l2_subdev_state *state, struct v4l2_subdev_mbus_code_enum *code); -int ipu6_isys_subdev_init (struct ipu6_isys_subdev *asd,struct device *dev, +int ipu6_isys_subdev_init (struct ipu_isys_subdev *asd,struct device *dev,const struct v4l2_subdev_ops *ops,unsigned int nr_ctrls,unsigned int num_sink_pads,unsigned int num_source_pads); -void ipu6_isys_subdev_cleanup (struct ipu6_isys_subdev *asd); +void ipu6_isys_subdev_cleanup (struct ipu_isys_subdev *asd);#endif /* IPU6_ISYS_SUBDEV_H */
drivers/media/pci/intel/ipu6/ipu6-isys-video.c +3 -3
@@ -869,7 +869,7 @@ void ipu6_isys_put_stream(struct ipu6_isys_stream *stream) }static struct ipu6_isys_stream * -ipu6_isys_get_stream (struct ipu6_isys_video *av,struct ipu6_isys_subdev *asd) +ipu6_isys_get_stream (struct ipu6_isys_video *av,struct ipu_isys_subdev *asd) {struct ipu6_isys_stream *stream =NULL ;struct ipu6_isys *isys = av->isys;
@@ -1174,7 +1174,7 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av,struct v4l2_subdev_route *route =NULL ;struct v4l2_subdev_route *r;struct v4l2_subdev_state *state; -struct ipu6_isys_subdev *asd; +struct ipu_isys_subdev *asd;struct v4l2_subdev *remote_sd;struct media_pipeline *pipeline;struct media_pad *source_pad, *remote_pad;
@@ -1189,7 +1189,7 @@ int ipu6_isys_setup_video(struct ipu6_isys_video *av, } remote_sd =media_entity_to_v4l2_subdev (remote_pad->entity); - asd =to_ipu6_isys_subdev (remote_sd); + asd =to_ipu_isys_subdev (remote_sd); source_pad =media_pad_remote_pad_first (&remote_pad->entity->pads[0 ]);if (!source_pad) {dev_dbg (dev,"No external source entity\n" );
drivers/media/pci/intel/ipu6/ipu6-isys-video.h +2 -2
@@ -21,7 +21,7 @@struct file ;struct ipu6_isys ;struct ipu6_isys_csi2 ; -struct ipu6_isys_subdev ; +struct ipu_isys_subdev ;struct ipu6_isys_pixelformat {u32 pixelformat;
@@ -56,7 +56,7 @@ struct ipu6_isys_stream {int stream_source;int stream_handle;unsigned int nr_output_pins; -struct ipu6_isys_subdev *asd; +struct ipu_isys_subdev *asd;int nr_queues;/* Number of capture queues */ int nr_streaming;
Signature · 1 line
2.34.1
PATCH v2 5/5 media: intel/ipu6: Move ipu_isys_subdev functions to common code
In reply to Stanislaw GruszkaMove more functions (those that utilize ipu_isys_subdev structure internally), to common code to be shared with ipu7 driver.
Additionally use isd variable name for ipu_isys_subdevice, asd name is used for historical reason - precursor of the drier was atomisp driver, the variables names stayed unchanged, what is a little confusing.
--- .../media/pci/intel/ipu6/ipu-isys-subdev.c | 161 ++++++++++++++++ drivers/media/pci/intel/ipu6/ipu-isys.h | 11 ++ drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 8 +- .../media/pci/intel/ipu6/ipu6-isys-subdev.c | 179 +----------------- .../media/pci/intel/ipu6/ipu6-isys-subdev.h | 11 +- 5 files changed, 178 insertions(+), 192 deletions(-)
drivers/media/pci/intel/ipu6/ipu-isys-subdev.c +161 -0
@@ -92,3 +92,164 @@ int ipu_isys_subdev_set_routing(struct v4l2_subdev *sd, {return subdev_set_routing (sd, state, routing); } + +int ipu_isys_subdev_set_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *state, +struct v4l2_subdev_format *format) +{ +struct ipu_isys_subdev *isd =to_ipu_isys_subdev (sd); +struct v4l2_mbus_framefmt *fmt; +struct v4l2_rect *crop; +u32 code = isd->supported_codes[0 ]; +u32 other_pad, other_stream; +unsigned int i; +int ret; + +for (i =0 ; isd->supported_codes[i]; i++) { +if (isd->supported_codes[i] == format->format.code) { + code = isd->supported_codes[i]; +break ; + } + } + format->format.code = code; + format->format.field =V4L2_FIELD_NONE ; + +/* Store the format and propagate it to the source pad. */ + fmt =v4l2_subdev_state_get_format (state, format->pad, format->stream); +if (!fmt) +return -EINVAL ; + + *fmt = format->format; + +if (!(sd->entity.pads[format->pad].flags &MEDIA_PAD_FL_SINK )) +return 0 ; + +/* propagate format to following source pad */ + fmt =v4l2_subdev_state_get_opposite_stream_format (state, format->pad, + format->stream); +if (!fmt) +return -EINVAL ; + + *fmt = format->format; + + ret =v4l2_subdev_routing_find_opposite_end (&state->routing, + format->pad, format->stream, + &other_pad, &other_stream); +if (ret) +return -EINVAL ; + + crop =v4l2_subdev_state_get_crop (state, other_pad, other_stream); +/* reset crop */ + crop->left =0 ; + crop->top =0 ; + crop->width = fmt->width; + crop->height = fmt->height; + +return 0 ; +} + +int ipu_isys_subdev_enum_mbus_code (struct v4l2_subdev *sd, +struct v4l2_subdev_state *state, +struct v4l2_subdev_mbus_code_enum *code) +{ +struct ipu_isys_subdev *isd =to_ipu_isys_subdev (sd); +const u32 *supported_codes = isd->supported_codes; +u32 index; + +for (index =0 ; supported_codes[index]; index++) { +if (index == code->index) { + code->code = supported_codes[index]; +return 0 ; + } + } + +return -EINVAL ; +} + +static int ipu_isys_subdev_init_state (struct v4l2_subdev *sd, +struct v4l2_subdev_state *state) +{ +struct v4l2_subdev_route route = { + .sink_pad =0 , + .sink_stream =0 , + .source_pad =1 , + .source_stream =0 , + .flags =V4L2_SUBDEV_ROUTE_FL_ACTIVE , + }; +struct v4l2_subdev_krouting routing = { + .num_routes =1 , + .routes = &route, + }; + +return subdev_set_routing (sd, state, &routing); +} + +static const struct v4l2_subdev_internal_ops ipu_isys_subdev_internal_ops = { + .init_state = ipu_isys_subdev_init_state, +}; + +int ipu_isys_subdev_init (struct ipu_isys_subdev *isd,struct device *dev, +const struct v4l2_subdev_ops *ops, +unsigned int nr_ctrls,unsigned int num_sink_pads, +unsigned int num_source_pads) +{ +unsigned int num_pads = num_sink_pads + num_source_pads; +unsigned int i; +int ret; + +v4l2_subdev_init (&isd->sd, ops); + + isd->sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE | +V4L2_SUBDEV_FL_HAS_EVENTS |V4L2_SUBDEV_FL_STREAMS ; + isd->sd.owner =THIS_MODULE ; + isd->sd.dev = dev; + isd->sd.entity.function =MEDIA_ENT_F_VID_IF_BRIDGE ; + isd->sd.internal_ops = &ipu_isys_subdev_internal_ops; + + isd->pad =devm_kcalloc (dev, num_pads,sizeof (*isd->pad),GFP_KERNEL ); +if (!isd->pad) +return -ENOMEM ; + +for (i =0 ; i < num_sink_pads; i++) + isd->pad[i].flags =MEDIA_PAD_FL_SINK | +MEDIA_PAD_FL_MUST_CONNECT ; + +for (i = num_sink_pads; i < num_pads; i++) + isd->pad[i].flags =MEDIA_PAD_FL_SOURCE ; + + ret =media_entity_pads_init (&isd->sd.entity, num_pads, isd->pad); +if (ret) +return ret; + +if (isd->ctrl_init) { + ret =v4l2_ctrl_handler_init (&isd->ctrl_handler, nr_ctrls); +if (ret) + goto out_media_entity_cleanup; + + isd->ctrl_init (&isd->sd); +if (isd->ctrl_handler.error) { + ret = isd->ctrl_handler.error; + goto out_v4l2_ctrl_handler_free; + } + + isd->sd.ctrl_handler = &isd->ctrl_handler; + } + + isd->source =-1 ; + +return 0 ; + +out_v4l2_ctrl_handler_free: +v4l2_ctrl_handler_free (&isd->ctrl_handler); + +out_media_entity_cleanup: +media_entity_cleanup (&isd->sd.entity); + +return ret; +} + +void ipu_isys_subdev_cleanup (struct ipu_isys_subdev *isd) +{ +media_entity_cleanup (&isd->sd.entity); +v4l2_ctrl_handler_free (&isd->ctrl_handler); +}
drivers/media/pci/intel/ipu6/ipu-isys.h +11 -0
@@ -30,4 +30,15 @@ int ipu_isys_subdev_set_routing(struct v4l2_subdev *sd,struct v4l2_subdev_state *state, enum v4l2_subdev_format_whence which, struct v4l2_subdev_krouting *routing); +int ipu_isys_subdev_set_fmt (struct v4l2_subdev *sd, +struct v4l2_subdev_state *state, +struct v4l2_subdev_format *format); +int ipu_isys_subdev_enum_mbus_code (struct v4l2_subdev *sd, +struct v4l2_subdev_state *state, +struct v4l2_subdev_mbus_code_enum *code); +int ipu_isys_subdev_init (struct ipu_isys_subdev *isd,struct device *dev, +const struct v4l2_subdev_ops *ops, +unsigned int nr_ctrls,unsigned int num_sink_pads, +unsigned int num_source_pads); +void ipu_isys_subdev_cleanup (struct ipu_isys_subdev *isd);#endif
drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +4 -4
@@ -487,7 +487,7 @@ static const struct v4l2_subdev_pad_ops csi2_sd_pad_ops = { .set_fmt = ipu6_isys_subdev_set_fmt, .get_selection = ipu6_isys_csi2_get_sel, .set_selection = ipu6_isys_csi2_set_sel, - .enum_mbus_code = ipu6_isys_subdev_enum_mbus_code, + .enum_mbus_code = ipu_isys_subdev_enum_mbus_code, .set_routing = ipu_isys_subdev_set_routing, .enable_streams = ipu6_isys_csi2_enable_streams, .disable_streams = ipu6_isys_csi2_disable_streams,
@@ -510,7 +510,7 @@ void ipu6_isys_csi2_cleanup(struct ipu6_isys_csi2 *csi2)v4l2_device_unregister_subdev (&csi2->asd.sd);v4l2_subdev_cleanup (&csi2->asd.sd); -ipu6_isys_subdev_cleanup (&csi2->asd); +ipu_isys_subdev_cleanup (&csi2->asd); csi2->isys =NULL ; }
@@ -526,8 +526,8 @@ int ipu6_isys_csi2_init(struct ipu6_isys_csi2 *csi2, csi2->port = index; csi2->asd.sd.entity.ops = &csi2_entity_ops; - ret =ipu6_isys_subdev_init (&csi2->asd, dev, &csi2_sd_ops,0 , -NR_OF_CSI2_SINK_PADS ,NR_OF_CSI2_SRC_PADS ); + ret =ipu_isys_subdev_init (&csi2->asd, dev, &csi2_sd_ops,0 , +NR_OF_CSI2_SINK_PADS ,NR_OF_CSI2_SRC_PADS );if (ret) goto fail;
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c +1 -178
189 lines not on this page · raw message
drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h +1 -10
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: GPL-2.0-only */ -/* Copyright (C) 2013--2024 Intel Corporation */ +/* Copyright (C) 2013-2025 Intel Corporation */ #ifndef IPU6_ISYS_SUBDEV_H #define IPU6_ISYS_SUBDEV_H
@@ -16,13 +16,4 @@ u32 ipu6_isys_convert_bayer_order(u32 code, int x, int y);int ipu6_isys_subdev_set_fmt (struct v4l2_subdev *sd,struct v4l2_subdev_state *state,struct v4l2_subdev_format *fmt); -int ipu6_isys_subdev_enum_mbus_code (struct v4l2_subdev *sd, -struct v4l2_subdev_state *state, -struct v4l2_subdev_mbus_code_enum - *code); -int ipu6_isys_subdev_init (struct ipu_isys_subdev *asd,struct device *dev, -const struct v4l2_subdev_ops *ops, -unsigned int nr_ctrls,unsigned int num_sink_pads, -unsigned int num_source_pads); -void ipu6_isys_subdev_cleanup (struct ipu_isys_subdev *asd);#endif /* IPU6_ISYS_SUBDEV_H */
Signature · 1 line
2.34.1