From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
To: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>,
Robert Foss <rfoss@kernel.org>, Todor Tomov <todor.too@gmail.com>,
Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org,
linux-arm-msm@vger.kernel.org
Subject: Re: [PATCH v10 2/3] media: qcom: camss: Add link support for TPG
Date: Wed, 1 Apr 2026 12:26:12 +0100 [thread overview]
Message-ID: <0e781f65-3b23-4e83-bad7-338d90c4a2b2@linaro.org> (raw)
In-Reply-To: <20260317-camss_tpg-v10-2-b4cfa85c2e1b@oss.qualcomm.com>
On 17/03/2026 10:05, Wenmeng Liu wrote:
> TPG is connected to the csid as an entity, the link
> needs to be adapted.
>
> Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
> ---
> drivers/media/platform/qcom/camss/camss-csid.c | 45 +++++++++++++------
> drivers/media/platform/qcom/camss/camss-csid.h | 1 +
> drivers/media/platform/qcom/camss/camss-csiphy.c | 1 +
> drivers/media/platform/qcom/camss/camss-csiphy.h | 2 +
> drivers/media/platform/qcom/camss/camss.c | 55 ++++++++++++++++++++++++
> 5 files changed, 90 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.c b/drivers/media/platform/qcom/camss/camss-csid.c
> index ed1820488c9878df91c173cd4ff0209dfa1e3a8c..48459b46a981bc7504cdde7d6f39fcc4a1e273de 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.c
> +++ b/drivers/media/platform/qcom/camss/camss-csid.c
> @@ -35,6 +35,8 @@
> #define HW_VERSION_REVISION 16
> #define HW_VERSION_GENERATION 28
>
> +#define LANE_CFG_BITWIDTH 4
> +
> #define MSM_CSID_NAME "msm_csid"
>
> const char * const csid_testgen_modes[] = {
> @@ -1215,18 +1217,22 @@ void msm_csid_get_csid_id(struct media_entity *entity, u8 *id)
> }
>
> /*
> - * csid_get_lane_assign - Calculate CSI2 lane assign configuration parameter
> - * @lane_cfg - CSI2 lane configuration
> + * csid_get_lane_assign - Calculate lane assign by csiphy/tpg lane num
> + * @lane_cfg: CSI2 lane configuration
> + * @num_lanes: lane num
> *
> * Return lane assign
> */
> -static u32 csid_get_lane_assign(struct csiphy_lanes_cfg *lane_cfg)
> +static u32 csid_get_lane_assign(struct csiphy_lanes_cfg *lane_cfg, int num_lanes)
> {
> u32 lane_assign = 0;
> + int pos;
> int i;
>
> - for (i = 0; i < lane_cfg->num_data; i++)
> - lane_assign |= lane_cfg->data[i].pos << (i * 4);
> + for (i = 0; i < num_lanes; i++) {
> + pos = lane_cfg ? lane_cfg->data[i].pos : i;
> + lane_assign |= pos << (i * LANE_CFG_BITWIDTH);
> + }
>
> return lane_assign;
> }
> @@ -1251,6 +1257,7 @@ static int csid_link_setup(struct media_entity *entity,
> if ((local->flags & MEDIA_PAD_FL_SINK) &&
> (flags & MEDIA_LNK_FL_ENABLED)) {
> struct v4l2_subdev *sd;
> + struct tpg_device *tpg;
> struct csid_device *csid;
> struct csiphy_device *csiphy;
> struct csiphy_lanes_cfg *lane_cfg;
> @@ -1265,18 +1272,28 @@ static int csid_link_setup(struct media_entity *entity,
> return -EBUSY;
>
> sd = media_entity_to_v4l2_subdev(remote->entity);
> - csiphy = v4l2_get_subdevdata(sd);
> + if (sd->grp_id == TPG_GRP_ID) {
> + tpg = v4l2_get_subdevdata(sd);
>
> - /* If a sensor is not linked to CSIPHY */
> - /* do no allow a link from CSIPHY to CSID */
> - if (!csiphy->cfg.csi2)
> - return -EPERM;
> + csid->phy.lane_cnt = tpg->res->lane_cnt;
> + csid->phy.csiphy_id = tpg->id;
> + csid->phy.lane_assign = csid_get_lane_assign(NULL, csid->phy.lane_cnt);
> + csid->tpg_linked = true;
> + } else {
> + csiphy = v4l2_get_subdevdata(sd);
>
> - csid->phy.csiphy_id = csiphy->id;
> + /* If a sensor is not linked to CSIPHY */
> + /* do no allow a link from CSIPHY to CSID */
> + if (!csiphy->cfg.csi2)
> + return -EPERM;
>
> - lane_cfg = &csiphy->cfg.csi2->lane_cfg;
> - csid->phy.lane_cnt = lane_cfg->num_data;
> - csid->phy.lane_assign = csid_get_lane_assign(lane_cfg);
> + csid->phy.csiphy_id = csiphy->id;
> +
> + lane_cfg = &csiphy->cfg.csi2->lane_cfg;
> + csid->phy.lane_cnt = lane_cfg->num_data;
> + csid->phy.lane_assign = csid_get_lane_assign(lane_cfg, lane_cfg->num_data);
> + csid->tpg_linked = false;
> + }
> }
> /* Decide which virtual channels to enable based on which source pads are enabled */
> if (local->flags & MEDIA_PAD_FL_SOURCE) {
> diff --git a/drivers/media/platform/qcom/camss/camss-csid.h b/drivers/media/platform/qcom/camss/camss-csid.h
> index aedc96ed84b2fcc3f352160dcfd31554a671d0fc..5296b10f6bac839a3faa1039bdbf0fbbbe9456ac 100644
> --- a/drivers/media/platform/qcom/camss/camss-csid.h
> +++ b/drivers/media/platform/qcom/camss/camss-csid.h
> @@ -161,6 +161,7 @@ struct csid_device {
> int num_supplies;
> struct completion reset_complete;
> struct csid_testgen_config testgen;
> + bool tpg_linked;
> struct csid_phy_config phy;
> struct v4l2_mbus_framefmt fmt[MSM_CSID_PADS_NUM];
> struct v4l2_ctrl_handler ctrls;
> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
> index 62623393f414494d7d0095aa0efe5673382ec962..69fba36d10ef5d00d0d8e1ae0f5b3646c066d81c 100644
> --- a/drivers/media/platform/qcom/camss/camss-csiphy.c
> +++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
> @@ -789,6 +789,7 @@ int msm_csiphy_register_entity(struct csiphy_device *csiphy,
> sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
> snprintf(sd->name, ARRAY_SIZE(sd->name), "%s%d",
> MSM_CSIPHY_NAME, csiphy->id);
> + sd->grp_id = CSIPHY_GRP_ID;
> v4l2_set_subdevdata(sd, csiphy);
>
> ret = csiphy_init_formats(sd, NULL);
> diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/media/platform/qcom/camss/camss-csiphy.h
> index 2d5054819df7f9069611bcdf287846b1d20afc92..9d9657b82f748d02bf6be6139480cfbd0c5001c9 100644
> --- a/drivers/media/platform/qcom/camss/camss-csiphy.h
> +++ b/drivers/media/platform/qcom/camss/camss-csiphy.h
> @@ -21,6 +21,8 @@
> #define MSM_CSIPHY_PAD_SRC 1
> #define MSM_CSIPHY_PADS_NUM 2
>
> +#define CSIPHY_GRP_ID 1
> +
> struct csiphy_lane {
> u8 pos;
> u8 pol;
> diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
> index 00b87fd9afbd89871ffaee9cb2b2db6538e1d70d..1de35bcd8e5fc6eaa9dab537960520b2c07dd830 100644
> --- a/drivers/media/platform/qcom/camss/camss.c
> +++ b/drivers/media/platform/qcom/camss/camss.c
> @@ -4501,6 +4501,19 @@ static int camss_init_subdevices(struct camss *camss)
> }
> }
>
> + if (camss->tpg) {
> + for (i = 0; i < camss->res->tpg_num; i++) {
> + ret = msm_tpg_subdev_init(camss, &camss->tpg[i],
> + &res->tpg_res[i], i);
> + if (ret < 0) {
> + dev_err(camss->dev,
> + "Failed to init tpg%d sub-device: %d\n",
> + i, ret);
> + return ret;
> + }
> + }
> + }
> +
> /* note: SM8250 requires VFE to be initialized before CSID */
> for (i = 0; i < camss->res->vfe_num; i++) {
> ret = msm_vfe_subdev_init(camss, &camss->vfe[i],
> @@ -4589,6 +4602,23 @@ static int camss_link_entities(struct camss *camss)
> }
> }
>
> + for (i = 0; i < camss->res->tpg_num; i++) {
> + for (j = 0; j < camss->res->csid_num; j++) {
> + ret = media_create_pad_link(&camss->tpg[i].subdev.entity,
> + MSM_TPG_PAD_SRC,
> + &camss->csid[j].subdev.entity,
> + MSM_CSID_PAD_SINK,
> + 0);
> + if (ret < 0) {
> + camss_link_err(camss,
> + camss->tpg[i].subdev.entity.name,
> + camss->csid[j].subdev.entity.name,
> + ret);
> + return ret;
> + }
> + }
> + }
> +
> if (camss->ispif) {
> for (i = 0; i < camss->res->csid_num; i++) {
> for (j = 0; j < camss->ispif->line_num; j++) {
> @@ -4693,6 +4723,19 @@ static int camss_register_entities(struct camss *camss)
> }
> }
>
> + if (camss->tpg) {
> + for (i = 0; i < camss->res->tpg_num; i++) {
> + ret = msm_tpg_register_entity(&camss->tpg[i],
> + &camss->v4l2_dev);
> + if (ret < 0) {
> + dev_err(camss->dev,
> + "Failed to register tpg%d entity: %d\n",
> + i, ret);
> + goto err_reg_tpg;
> + }
> + }
> + }
> +
> for (i = 0; i < camss->res->csid_num; i++) {
> ret = msm_csid_register_entity(&camss->csid[i],
> &camss->v4l2_dev);
> @@ -4736,6 +4779,13 @@ static int camss_register_entities(struct camss *camss)
> for (i--; i >= 0; i--)
> msm_csid_unregister_entity(&camss->csid[i]);
>
> + i = camss->res->tpg_num;
> +err_reg_tpg:
> + if (camss->tpg) {
> + for (i--; i >= 0; i--)
> + msm_tpg_unregister_entity(&camss->tpg[i]);
> + }
> +
> i = camss->res->csiphy_num;
> err_reg_csiphy:
> for (i--; i >= 0; i--)
> @@ -4757,6 +4807,11 @@ static void camss_unregister_entities(struct camss *camss)
> for (i = 0; i < camss->res->csiphy_num; i++)
> msm_csiphy_unregister_entity(&camss->csiphy[i]);
>
> + if (camss->tpg) {
> + for (i = 0; i < camss->res->tpg_num; i++)
> + msm_tpg_unregister_entity(&camss->tpg[i]);
> + }
> +
> for (i = 0; i < camss->res->csid_num; i++)
> msm_csid_unregister_entity(&camss->csid[i]);
>
>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # Dell Inpsiron14p
next prev parent reply other threads:[~2026-04-01 11:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-17 10:05 [PATCH v10 0/3] media: qcom: camss: Add camss TPG support for multiple targets Wenmeng Liu
2026-03-17 10:05 ` [PATCH v10 1/3] media: qcom: camss: Add common TPG support Wenmeng Liu
2026-04-01 11:25 ` Bryan O'Donoghue
2026-03-17 10:05 ` [PATCH v10 2/3] media: qcom: camss: Add link support for TPG Wenmeng Liu
2026-04-01 11:26 ` Bryan O'Donoghue [this message]
2026-03-17 10:05 ` [PATCH v10 3/3] media: qcom: camss: tpg: Add TPG support for multiple targets Wenmeng Liu
2026-04-01 11:26 ` Bryan O'Donoghue
2026-04-01 9:02 ` [PATCH v10 0/3] media: qcom: camss: Add camss " Bryan O'Donoghue
2026-04-01 9:06 ` Wenmeng Liu
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=0e781f65-3b23-4e83-bad7-338d90c4a2b2@linaro.org \
--to=bryan.odonoghue@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=todor.too@gmail.com \
--cc=vladimir.zapolskiy@linaro.org \
--cc=wenmeng.liu@oss.qualcomm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®