Re: [PATCH 2/3] media: qcom: camss: Fix CSID to VFE routing for non ISPIF platforms
From: Loic Poulain
Date: Sun Nov 22 2026 - 15:03:16 EST
On Sun, Nov 22, 2026 at 3:10 AM <bryan.odonoghue@xxxxxxxxxx> wrote:
>
> From: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
>
> This patch fixes a basic routing error that has been present in CAMSS since
> the addition of non ISPIF platforms.
>
> The ISPIF platforms can route any CSID to any VFE however this is not the
> case on the non ISPIF platforms.
>
> The current requirement is a 1:1 mapping CSID0->VFE0 CSID1->VFE1 etc.
> Demote the spurious poly-mapping down to its 1:1 real form.
>
> Fixes: 9229b53f9758 ("Revert "media: qcom: camss: Restructure camss_link_entities"")
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
Reviewed-by: Loic Poulain <loic.poulain@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/qcom/camss/camss.c | 38 ++++++++++++++++++-------------
> 1 file changed, 22 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index aa6d01d8fcb2a..060879a55e483 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -5257,24 +5257,30 @@ static int camss_link_entities(struct camss *camss)
> }
> }
> } else {
> - for (i = 0; i < camss->res->csid_num; i++)
> - for (k = 0; k < camss->res->vfe_num; k++)
> - for (j = 0; j < camss->vfe[k].res->line_num; j++) {
> - struct v4l2_subdev *csid = &camss->csid[i].subdev;
> - struct v4l2_subdev *vfe = &camss->vfe[k].line[j].subdev;
>
> - ret = media_create_pad_link(&csid->entity,
> - MSM_CSID_PAD_FIRST_SRC + j,
> - &vfe->entity,
> - MSM_VFE_PAD_SINK,
> - 0);
> - if (ret < 0) {
> - camss_link_err(camss, csid->entity.name,
> - vfe->entity.name,
> - ret);
> - return ret;
> - }
> + if (camss->res->csid_num != camss->res->vfe_num) {
> + return dev_err_probe(camss->dev, -EINVAL,
> + "csid_num %u != vfe_num %u\n",
> + camss->res->csid_num, camss->res->vfe_num);
> + }
> +
> + for (i = 0; i < camss->res->csid_num; i++)
> + for (j = 0; j < camss->vfe[i].res->line_num; j++) {
> + struct v4l2_subdev *csid = &camss->csid[i].subdev;
> + struct v4l2_subdev *vfe = &camss->vfe[i].line[j].subdev;
> +
> + ret = media_create_pad_link(&csid->entity,
> + MSM_CSID_PAD_FIRST_SRC + j,
> + &vfe->entity,
> + MSM_VFE_PAD_SINK,
> + 0);
> + if (ret < 0) {
> + camss_link_err(camss, csid->entity.name,
> + vfe->entity.name,
> + ret);
> + return ret;
> }
> + }
> }
>
> return 0;
>
> --
> 2.56.0
>