[PATCH] media: rkisp1: Support devices without self path
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Mon Jun 27 04:27:54 PDT 2022
Hi Paul,
Thank you for the patch.
On Mon, Jun 27, 2022 at 07:44:29PM +0900, Paul Elder wrote:
> Some hardware supported by the rkisp1 driver, such as the ISP in the
> i.MX8MP, don't have a self path. Add a feature flag for this, and
> massage the rest of the driver to support the lack of a self path.
>
> Signed-off-by: Paul Elder <paul.elder at ideasonboard.com>
>
> ---
> This patch depends on "media: rkisp1: Cleanups and add support for
> i.MX8MP" [1], which in turn depends on v4 of "media: rkisp1: Misc bug fixes
> and cleanups" [2].
>
> [1] https://lore.kernel.org/linux-media/20220625070034.6odv6cyvqqigb2sa@guri/T/
> [2] https://lore.kernel.org/linux-media/Ymbxs2p9Tuf331qM@pendragon.ideasonboard.com/T/
> ---
> .../media/platform/rockchip/rkisp1/rkisp1-capture.c | 11 ++++++++---
> .../media/platform/rockchip/rkisp1/rkisp1-common.h | 1 +
> drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 10 +++++++---
> .../media/platform/rockchip/rkisp1/rkisp1-resizer.c | 7 +++++--
> 4 files changed, 21 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> index 234b1f8488cb..9387996f64a4 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
> @@ -711,6 +711,8 @@ irqreturn_t rkisp1_capture_isr(int irq, void *ctx)
> struct rkisp1_device *rkisp1 = dev_get_drvdata(dev);
> unsigned int i;
> u32 status;
> + bool self_path = rkisp1->info->features & RKISP1_FEATURE_SELF_PATH;
> + unsigned int dev_count = ARRAY_SIZE(rkisp1->capture_devs) - (self_path ? 0 : 1);
Please move those two lines up a bit, just below rkisp1, to more or less
soft them by length.
I'm tempted to just write
unsigned int dev_count = self_path ? 2 : 1;
Or even better, add an inline function to the common.h header for this ?
The code is duplicated in many places.
>
> status = rkisp1_read(rkisp1, RKISP1_CIF_MI_MIS);
> if (!status)
> @@ -718,7 +720,7 @@ irqreturn_t rkisp1_capture_isr(int irq, void *ctx)
>
> rkisp1_write(rkisp1, RKISP1_CIF_MI_ICR, status);
>
> - for (i = 0; i < ARRAY_SIZE(rkisp1->capture_devs); ++i) {
> + for (i = 0; i < dev_count; ++i) {
> struct rkisp1_capture *cap = &rkisp1->capture_devs[i];
>
> if (!(status & RKISP1_CIF_MI_FRAME(cap)))
> @@ -875,6 +877,7 @@ static void rkisp1_cap_stream_enable(struct rkisp1_capture *cap)
> {
> struct rkisp1_device *rkisp1 = cap->rkisp1;
> struct rkisp1_capture *other = &rkisp1->capture_devs[cap->id ^ 1];
> + bool has_self_path = rkisp1->info->features & RKISP1_FEATURE_SELF_PATH;
>
> cap->ops->set_data_path(cap);
> cap->ops->config(cap);
> @@ -892,7 +895,7 @@ static void rkisp1_cap_stream_enable(struct rkisp1_capture *cap)
> * This's also required because the second FE maybe corrupt
> * especially when run at 120fps.
> */
> - if (!other->is_streaming) {
> + if (has_self_path && !other->is_streaming) {
Shouldn't this be
if (!has_self_path || !other->is_streaming) {
? If there's no self-path, it can't be streaming, should we should
update immediately, or am I missing something ?
> /* force cfg update */
> rkisp1_write(rkisp1, RKISP1_CIF_MI_INIT,
> RKISP1_CIF_MI_INIT_SOFT_UPD);
> @@ -1447,8 +1450,10 @@ int rkisp1_capture_devs_register(struct rkisp1_device *rkisp1)
> {
> unsigned int i;
> int ret;
> + bool self_path = rkisp1->info->features & RKISP1_FEATURE_SELF_PATH;
> + unsigned int dev_count = ARRAY_SIZE(rkisp1->capture_devs) - (self_path ? 0 : 1);
>
> - for (i = 0; i < ARRAY_SIZE(rkisp1->capture_devs); i++) {
> + for (i = 0; i < dev_count; i++) {
> struct rkisp1_capture *cap = &rkisp1->capture_devs[i];
>
> rkisp1_capture_init(rkisp1, i);
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> index 0b834579d08c..4a9e53aa3229 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h
> @@ -114,6 +114,7 @@ enum rkisp1_feature {
> RKISP1_FEATURE_RSZ_CROP = BIT(2),
> RKISP1_FEATURE_MAIN_STRIDE = BIT(3),
> RKISP1_FEATURE_DMA_34BIT = BIT(4),
> + RKISP1_FEATURE_SELF_PATH = BIT(5),
> };
>
> /*
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> index 4c77aa2bc50a..721075849a25 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
> @@ -328,6 +328,8 @@ static int rkisp1_create_links(struct rkisp1_device *rkisp1)
> {
> unsigned int i;
> int ret;
> + bool self_path = rkisp1->info->features & RKISP1_FEATURE_SELF_PATH;
> + unsigned int dev_count = self_path ? 2 : 1;
>
> if (rkisp1->info->features & RKISP1_FEATURE_MIPI_CSI2) {
> /* Link the CSI receiver to the ISP. */
> @@ -341,7 +343,7 @@ static int rkisp1_create_links(struct rkisp1_device *rkisp1)
> }
>
> /* create ISP->RSZ->CAP links */
> - for (i = 0; i < 2; i++) {
> + for (i = 0; i < dev_count; i++) {
> struct media_entity *resizer =
> &rkisp1->resizer_devs[i].sd.entity;
> struct media_entity *capture =
> @@ -466,7 +468,8 @@ static const struct rkisp1_info px30_isp_info = {
> .isr_size = ARRAY_SIZE(px30_isp_isrs),
> .isp_ver = RKISP1_V12,
> .features = RKISP1_FEATURE_MIPI_CSI2
> - | RKISP1_FEATURE_DUAL_CROP,
> + | RKISP1_FEATURE_DUAL_CROP
> + | RKISP1_FEATURE_SELF_PATH,
> };
>
> static const char * const rk3399_isp_clks[] = {
> @@ -486,7 +489,8 @@ static const struct rkisp1_info rk3399_isp_info = {
> .isr_size = ARRAY_SIZE(rk3399_isp_isrs),
> .isp_ver = RKISP1_V10,
> .features = RKISP1_FEATURE_MIPI_CSI2
> - | RKISP1_FEATURE_DUAL_CROP,
> + | RKISP1_FEATURE_DUAL_CROP
> + | RKISP1_FEATURE_SELF_PATH,
> };
>
> static const char * const imx8mp_isp_clks[] = {
> diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
> index 29a31b18a082..fe699b49757c 100644
> --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
> +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-resizer.c
> @@ -673,6 +673,7 @@ static int rkisp1_rsz_s_stream(struct v4l2_subdev *sd, int enable)
> struct rkisp1_device *rkisp1 = rsz->rkisp1;
> struct rkisp1_capture *other = &rkisp1->capture_devs[rsz->id ^ 1];
> enum rkisp1_shadow_regs_when when = RKISP1_SHADOW_REGS_SYNC;
> + bool has_self_path = rkisp1->info->features & RKISP1_FEATURE_SELF_PATH;
>
> if (!enable) {
> if (rkisp1->info->features & RKISP1_FEATURE_DUAL_CROP)
> @@ -681,7 +682,7 @@ static int rkisp1_rsz_s_stream(struct v4l2_subdev *sd, int enable)
> return 0;
> }
>
> - if (other->is_streaming)
> + if (has_self_path && other->is_streaming)
> when = RKISP1_SHADOW_REGS_ASYNC;
>
> mutex_lock(&rsz->ops_lock);
> @@ -771,8 +772,10 @@ int rkisp1_resizer_devs_register(struct rkisp1_device *rkisp1)
> {
> unsigned int i;
> int ret;
> + bool self_path = rkisp1->info->features & RKISP1_FEATURE_SELF_PATH;
> + unsigned int dev_count = ARRAY_SIZE(rkisp1->resizer_devs) - (self_path ? 0 : 1);
>
> - for (i = 0; i < ARRAY_SIZE(rkisp1->resizer_devs); i++) {
> + for (i = 0; i < dev_count; i++) {
> struct rkisp1_resizer *rsz = &rkisp1->resizer_devs[i];
>
> rsz->rkisp1 = rkisp1;
--
Regards,
Laurent Pinchart
More information about the Linux-rockchip
mailing list