From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Cc: rfoss@kernel.org, todor.too@gmail.com, agross@kernel.org,
andersson@kernel.org, konrad.dybcio@linaro.org,
mchehab@kernel.org, hverkuil-cisco@xs4all.nl,
sakari.ailus@linux.intel.com, andrey.konovalov@linaro.org,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 05/15] media: qcom: camss: Pass line_num from compat resources
Date: Mon, 28 Aug 2023 21:36:16 +0300 [thread overview]
Message-ID: <20230828183616.GJ14596@pendragon.ideasonboard.com> (raw)
In-Reply-To: <20230823104444.1954663-6-bryan.odonoghue@linaro.org>
Hi Bryan,
Thank you for the patch.
On Wed, Aug 23, 2023 at 11:44:34AM +0100, Bryan O'Donoghue wrote:
> line_num indicates the number of RDI - raw data interface channels which
> are associated with a given IFE/VFE - image/video front end.
Should the variable then be renamed to num_rdi or similar ?
> On several SoCs the RDI number is not static for each VFE - for example
> on sm8250 VFE Lite has four RDIs where regular VFE has three.
>
> Assigning line_num statically in the subdev_init() phase initialises
> each VFE to the lower number, meaning in practical terms that we are
> lobbing off one RDI on some VFEs.
>
> Interrupt handling uses static for (i = RDI0; i < RDI2; i++) {} in some
> of our VFE blocks but this can't work for situations where we have a
> mixture of VFE @ 3 RDI and VFE-lite @ 4 RDI blocks.
>
> First step to remediate is to pass line_num from a compat string
> controlled data-structure and do so on a per-VFE basis.
>
> Later patches will assign the correct number of RDI blocks per VFE.
>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> .../media/platform/qcom/camss/camss-vfe-170.c | 2 --
> .../media/platform/qcom/camss/camss-vfe-4-1.c | 2 --
> .../media/platform/qcom/camss/camss-vfe-4-7.c | 2 --
> .../media/platform/qcom/camss/camss-vfe-4-8.c | 2 --
> .../media/platform/qcom/camss/camss-vfe-480.c | 1 -
> drivers/media/platform/qcom/camss/camss-vfe.c | 5 +++
> drivers/media/platform/qcom/camss/camss.c | 36 ++++++++++++-------
> drivers/media/platform/qcom/camss/camss.h | 1 +
> 8 files changed, 30 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-170.c b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> index 9905bb06b3823..8aa921400ded0 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe-170.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-170.c
> @@ -756,8 +756,6 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
> {
> vfe->isr_ops = vfe_isr_ops_170;
> vfe->video_ops = vfe_video_ops_170;
> -
> - vfe->line_num = VFE_LINE_NUM_GEN2;
> }
>
> const struct vfe_hw_ops vfe_ops_170 = {
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
> index bc309f326f519..2911e4126e7ad 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-1.c
> @@ -992,8 +992,6 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
> vfe->isr_ops = vfe_isr_ops_gen1;
> vfe->ops_gen1 = &vfe_ops_gen1_4_1;
> vfe->video_ops = vfe_video_ops_gen1;
> -
> - vfe->line_num = VFE_LINE_NUM_GEN1;
> }
>
> const struct vfe_hw_ops vfe_ops_4_1 = {
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
> index 8acd76c9746ba..b65ed0fef595e 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-7.c
> @@ -1188,8 +1188,6 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
> vfe->isr_ops = vfe_isr_ops_gen1;
> vfe->ops_gen1 = &vfe_ops_gen1_4_7;
> vfe->video_ops = vfe_video_ops_gen1;
> -
> - vfe->line_num = VFE_LINE_NUM_GEN1;
> }
>
> const struct vfe_hw_ops vfe_ops_4_7 = {
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c
> index 3a0167ecf873a..7b3805177f037 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe-4-8.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-4-8.c
> @@ -1173,8 +1173,6 @@ static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
> vfe->isr_ops = vfe_isr_ops_gen1;
> vfe->ops_gen1 = &vfe_ops_gen1_4_8;
> vfe->video_ops = vfe_video_ops_gen1;
> -
> - vfe->line_num = VFE_LINE_NUM_GEN1;
> }
>
> const struct vfe_hw_ops vfe_ops_4_8 = {
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe-480.c b/drivers/media/platform/qcom/camss/camss-vfe-480.c
> index 80338efceb9e1..b1a07e846e25b 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe-480.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe-480.c
> @@ -572,7 +572,6 @@ static const struct camss_video_ops vfe_video_ops_480 = {
> static void vfe_subdev_init(struct device *dev, struct vfe_device *vfe)
> {
> vfe->video_ops = vfe_video_ops_480;
> - vfe->line_num = MAX_VFE_OUTPUT_LINES;
> }
>
> const struct vfe_hw_ops vfe_ops_480 = {
> diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
> index 526dd4ab343fe..b789b3b2e4cfd 100644
> --- a/drivers/media/platform/qcom/camss/camss-vfe.c
> +++ b/drivers/media/platform/qcom/camss/camss-vfe.c
> @@ -1305,6 +1305,11 @@ int msm_vfe_subdev_init(struct camss *camss, struct vfe_device *vfe,
> default:
> return -EINVAL;
> }
> +
> + if (!res->line_num)
> + return -EINVAL;
> +
> + vfe->line_num = res->line_num;
> vfe->ops->subdev_init(dev, vfe);
>
> /* Memory */
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index c8a2571e664fe..ce0d86e45fe48 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -123,7 +123,8 @@ static const struct resources vfe_res_8x16[] = {
> { 0 },
> { 0 } },
> .reg = { "vfe0" },
> - .interrupt = { "vfe0" }
> + .interrupt = { "vfe0" },
> + .line_num = VFE_LINE_NUM_GEN1,
> }
> };
>
> @@ -263,7 +264,8 @@ static const struct resources vfe_res_8x96[] = {
> { 0 },
> { 0 } },
> .reg = { "vfe0" },
> - .interrupt = { "vfe0" }
> + .interrupt = { "vfe0" },
> + .line_num = VFE_LINE_NUM_GEN1,
> },
>
> /* VFE1 */
> @@ -281,7 +283,8 @@ static const struct resources vfe_res_8x96[] = {
> { 0 },
> { 0 } },
> .reg = { "vfe1" },
> - .interrupt = { "vfe1" }
> + .interrupt = { "vfe1" },
> + .line_num = VFE_LINE_NUM_GEN1,
> }
> };
>
> @@ -442,7 +445,8 @@ static const struct resources vfe_res_660[] = {
> { 0 },
> { 0 } },
> .reg = { "vfe0" },
> - .interrupt = { "vfe0" }
> + .interrupt = { "vfe0" },
> + .line_num = VFE_LINE_NUM_GEN1,
> },
>
> /* VFE1 */
> @@ -463,7 +467,8 @@ static const struct resources vfe_res_660[] = {
> { 0 },
> { 0 } },
> .reg = { "vfe1" },
> - .interrupt = { "vfe1" }
> + .interrupt = { "vfe1" },
> + .line_num = VFE_LINE_NUM_GEN1,
> }
> };
>
> @@ -621,7 +626,8 @@ static const struct resources vfe_res_845[] = {
> { 19200000, 75000000, 384000000, 538666667 },
> { 384000000 } },
> .reg = { "vfe0" },
> - .interrupt = { "vfe0" }
> + .interrupt = { "vfe0" },
> + .line_num = VFE_LINE_NUM_GEN2,
> },
>
> /* VFE1 */
> @@ -641,7 +647,8 @@ static const struct resources vfe_res_845[] = {
> { 19200000, 75000000, 384000000, 538666667 },
> { 384000000 } },
> .reg = { "vfe1" },
> - .interrupt = { "vfe1" }
> + .interrupt = { "vfe1" },
> + .line_num = VFE_LINE_NUM_GEN2,
> },
>
> /* VFE-lite */
> @@ -660,7 +667,8 @@ static const struct resources vfe_res_845[] = {
> { 19200000, 75000000, 384000000, 538666667 },
> { 384000000 } },
> .reg = { "vfe_lite" },
> - .interrupt = { "vfe_lite" }
> + .interrupt = { "vfe_lite" },
> + .line_num = VFE_LINE_NUM_GEN2,
> }
> };
>
> @@ -787,7 +795,8 @@ static const struct resources vfe_res_8250[] = {
> { 0 },
> { 0 } },
> .reg = { "vfe0" },
> - .interrupt = { "vfe0" }
> + .interrupt = { "vfe0" },
> + .line_num = 4,
> },
> /* VFE1 */
> {
> @@ -805,7 +814,8 @@ static const struct resources vfe_res_8250[] = {
> { 0 },
> { 0 } },
> .reg = { "vfe1" },
> - .interrupt = { "vfe1" }
> + .interrupt = { "vfe1" },
> + .line_num = 4,
> },
> /* VFE2 (lite) */
> {
> @@ -822,7 +832,8 @@ static const struct resources vfe_res_8250[] = {
> { 400000000, 480000000 },
> { 0 } },
> .reg = { "vfe_lite0" },
> - .interrupt = { "vfe_lite0" }
> + .interrupt = { "vfe_lite0" },
> + .line_num = 4,
> },
> /* VFE3 (lite) */
> {
> @@ -839,7 +850,8 @@ static const struct resources vfe_res_8250[] = {
> { 400000000, 480000000 },
> { 0 } },
> .reg = { "vfe_lite1" },
> - .interrupt = { "vfe_lite1" }
> + .interrupt = { "vfe_lite1" },
> + .line_num = 4,
> },
> };
>
> diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
> index dd8c58d349685..101ce6e527931 100644
> --- a/drivers/media/platform/qcom/camss/camss.h
> +++ b/drivers/media/platform/qcom/camss/camss.h
> @@ -48,6 +48,7 @@ struct resources {
> u32 clock_rate[CAMSS_RES_MAX][CAMSS_RES_MAX];
> char *reg[CAMSS_RES_MAX];
> char *interrupt[CAMSS_RES_MAX];
> + u8 line_num;
> };
>
> struct icc_bw_tbl {
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2023-08-28 18:37 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-23 10:44 [PATCH v3 00/15] media: qcom: camss: Add parameter passing to remove several outstanding bugs Bryan O'Donoghue
2023-08-23 10:44 ` [PATCH v3 01/15] media: qcom: camss: Amalgamate struct resource with struct resource_ispif Bryan O'Donoghue
2023-08-26 9:55 ` Konrad Dybcio
2023-08-28 17:30 ` Laurent Pinchart
2023-08-23 10:44 ` [PATCH v3 02/15] media: qcom: camss: Start to move to module compat matched resources Bryan O'Donoghue
2023-08-28 17:33 ` Laurent Pinchart
2023-08-23 10:44 ` [PATCH v3 03/15] media: qcom: camss: Pass icc bandwidth table as a platform parameter Bryan O'Donoghue
2023-08-28 17:35 ` Laurent Pinchart
2023-08-23 10:44 ` [PATCH v3 04/15] media: qcom: camss: Pass remainder of variables as resources Bryan O'Donoghue
2023-08-26 9:57 ` Konrad Dybcio
2023-08-28 17:51 ` Laurent Pinchart
2023-08-23 10:44 ` [PATCH v3 05/15] media: qcom: camss: Pass line_num from compat resources Bryan O'Donoghue
2023-08-28 18:36 ` Laurent Pinchart [this message]
2023-08-28 19:31 ` Bryan O'Donoghue
2023-08-23 10:44 ` [PATCH v3 06/15] media: qcom: camss: Assign the correct number of RDIs per VFE Bryan O'Donoghue
2023-08-28 18:43 ` Laurent Pinchart
2023-08-23 10:44 ` [PATCH v3 07/15] media: qcom: camss: Capture VFE CSID dependency in a helper function Bryan O'Donoghue
2023-08-26 10:02 ` Konrad Dybcio
2023-08-26 12:01 ` Bryan O'Donoghue
2023-08-26 12:04 ` Konrad Dybcio
2023-08-26 12:12 ` Bryan O'Donoghue
2023-08-26 12:13 ` Konrad Dybcio
2023-08-26 12:16 ` Bryan O'Donoghue
2023-08-28 18:47 ` Laurent Pinchart
2023-08-28 19:37 ` Bryan O'Donoghue
2023-08-28 19:40 ` Laurent Pinchart
2023-08-28 19:41 ` Bryan O'Donoghue
2023-09-04 10:15 ` Bryan O'Donoghue
2023-08-23 10:44 ` [PATCH v3 08/15] media: qcom: camss: Untangle if/else spaghetti in camss Bryan O'Donoghue
2023-08-26 10:03 ` Konrad Dybcio
2023-08-28 18:51 ` Laurent Pinchart
2023-08-28 19:43 ` Bryan O'Donoghue
2023-09-04 12:24 ` Bryan O'Donoghue
2023-08-23 10:44 ` [PATCH v3 09/15] media: qcom: camss: Improve error printout on icc_get fail Bryan O'Donoghue
2023-08-26 10:05 ` Konrad Dybcio
2023-08-26 12:01 ` Bryan O'Donoghue
2023-08-23 10:44 ` [PATCH v3 10/15] media: qcom: camss: Allow clocks vfeN vfe_liteN or vfe_lite Bryan O'Donoghue
2023-08-26 10:08 ` Konrad Dybcio
2023-08-26 12:05 ` Bryan O'Donoghue
2023-08-28 18:55 ` Laurent Pinchart
2023-08-23 10:44 ` [PATCH v3 11/15] media: qcom: camss: Functionally decompose CSIPHY clock lookups Bryan O'Donoghue
2023-08-26 10:12 ` Konrad Dybcio
2023-08-26 12:07 ` Bryan O'Donoghue
2023-08-26 12:11 ` Konrad Dybcio
2023-08-26 12:14 ` Bryan O'Donoghue
2023-08-26 12:48 ` Konrad Dybcio
2023-08-28 18:59 ` Laurent Pinchart
2023-08-23 10:44 ` [PATCH v3 12/15] media: qcom: camss: Fix support for setting CSIPHY clock name csiphyX Bryan O'Donoghue
2023-08-26 10:13 ` Konrad Dybcio
2023-08-26 12:08 ` Bryan O'Donoghue
2023-08-26 12:12 ` Konrad Dybcio
2023-09-04 19:11 ` Bryan O'Donoghue
2023-09-04 19:32 ` Konrad Dybcio
2023-09-04 19:33 ` Bryan O'Donoghue
2023-08-23 10:44 ` [PATCH v3 13/15] media: qcom: camss: Support RDI3 for VFE 17x Bryan O'Donoghue
2023-08-28 19:03 ` Laurent Pinchart
2023-08-23 10:44 ` [PATCH v3 14/15] media: qcom: camss: Convert vfe_disable() from int to void Bryan O'Donoghue
2023-08-26 10:16 ` Konrad Dybcio
2023-08-23 10:44 ` [PATCH v3 15/15] media: qcom: camss: Comment CSID dt_id field Bryan O'Donoghue
2023-08-26 10:18 ` Konrad Dybcio
2023-08-28 15:34 ` Bryan O'Donoghue
2023-08-28 15:38 ` Konrad Dybcio
2023-08-28 15:43 ` Bryan O'Donoghue
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230828183616.GJ14596@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=andrey.konovalov@linaro.org \
--cc=bryan.odonoghue@linaro.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=konrad.dybcio@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=rfoss@kernel.org \
--cc=sakari.ailus@linux.intel.com \
--cc=todor.too@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.