[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ad906baa-a93f-42c4-bbe5-968fa939c653@linaro.org>
Date: Thu, 28 Nov 2024 11:02:46 +0200
From: Vladimir Zapolskiy <vladimir.zapolskiy@...aro.org>
To: Bryan O'Donoghue <bryan.odonoghue@...aro.org>,
Stanimir Varbanov <stanimir.k.varbanov@...il.com>,
Vikash Garodia <quic_vgarodia@...cinc.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>, Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>, Conor Dooley <conor+dt@...nel.org>
Cc: quic_renjiang@...cinc.com, quic_vnagar@...cinc.com,
quic_dikshita@...cinc.com, konradybcio@...nel.org,
linux-media@...r.kernel.org, linux-arm-msm@...r.kernel.org,
linux-kernel@...r.kernel.org,
Stanimir Varbanov <stanimir.varbanov@...aro.org>, devicetree@...r.kernel.org
Subject: Re: [PATCH v2 1/3] media: venus: Add support for static video
encoder/decoder declarations
On 11/27/24 13:44, Bryan O'Donoghue wrote:
> Add resource structure data and probe() logic to support static
> declarations of encoder and decoder.
>
> Right now we rely on video encoder/decoder selection happening in the dtb
> but, this goes against the remit of device tree which is supposed to
> describe hardware, not select functional logic in Linux drivers.
>
> Provide two strings in the venus resource structure enc_nodename and
> dec_nodename.
>
> When set the venus driver will create an OF entry in-memory consistent
> with:
>
> dec_nodename {
> compat = "video-decoder";
> };
>
> and/or
>
> enc_nodename {
> compat = "video-encoder";
> };
>
> This will allow us to reuse the existing driver scheme of relying on compat
> names maintaining compatibility with old dtb files.
>
> dec_nodename can be "video-decoder" or "video0"
> enc_nodename can be "video-encoder" or "video1"
>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@...aro.org>
> ---
> drivers/media/platform/qcom/venus/core.c | 56 ++++++++++++++++++++++++++++++++
> drivers/media/platform/qcom/venus/core.h | 2 ++
> 2 files changed, 58 insertions(+)
>
> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
> index 4e26b18790537885a77d66c1917a4e7a146eaf57..17506d547a6172b89acb77879337750c22f993cf 100644
> --- a/drivers/media/platform/qcom/venus/core.c
> +++ b/drivers/media/platform/qcom/venus/core.c
> @@ -286,6 +286,36 @@ static irqreturn_t venus_isr_thread(int irq, void *dev_id)
> return ret;
> }
>
> +static int venus_add_video_core(struct device *dev, struct of_changeset *ocs,
> + const char *node_name, const char *compat)
> +{
> + struct device_node *np, *enp;
> + int ret;
> +
> + if (!node_name)
> + return 0;
> +
> + enp = of_find_node_by_name(dev->of_node, node_name);
> + if (enp) {
> + of_node_put(enp);
> + return 0;
> + }
> +
> + np = of_changeset_create_node(ocs, dev->of_node, node_name);
> + if (!np) {
> + dev_err(dev, "Unable to create new node\n");
> + return -ENODEV;
Leaked reference to np.
> + }
> +
> + ret = of_changeset_add_prop_string(ocs, np, "compatible", compat);
> + if (ret)
> + dev_err(dev, "unable to add %s\n", compat);
> +
> + of_node_put(np);
> +
> + return ret;
> +}
> +
> static int venus_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -365,6 +395,32 @@ static int venus_probe(struct platform_device *pdev)
> if (ret < 0)
> goto err_runtime_disable;
>
> + if (core->res->dec_nodename || core->res->enc_nodename) {
> + struct of_changeset *ocs;
> +
> + ocs = devm_kmalloc(dev, sizeof(*ocs), GFP_KERNEL);
> + if (!ocs) {
> + ret = -ENOMEM;
> + goto err_runtime_disable;
> + }
> +
> + of_changeset_init(ocs);
> +
> + ret = venus_add_video_core(dev, ocs, core->res->dec_nodename, "venus-decoder");
> + if (ret)
> + goto err_runtime_disable;
> +
> + ret = venus_add_video_core(dev, ocs, core->res->enc_nodename, "venus-encoder");
> + if (ret)
> + goto err_runtime_disable;
> +
> + ret = of_changeset_apply(ocs);
> + if (ret) {
> + dev_err(dev, "applying changeset fail ret %d\n", ret);
> + goto err_runtime_disable;
> + }
> + }
> +
> ret = of_platform_populate(dev->of_node, NULL, NULL, dev);
> if (ret)
> goto err_runtime_disable;
> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
> index 27784fd7082c321222b23ca4b2902a04c49e19ca..4ce98a3ef186823a57ac40e2e8e42b08fafed575 100644
> --- a/drivers/media/platform/qcom/venus/core.h
> +++ b/drivers/media/platform/qcom/venus/core.h
> @@ -90,6 +90,8 @@ struct venus_resources {
> u32 cp_nonpixel_start;
> u32 cp_nonpixel_size;
> const char *fwname;
> + const char *enc_nodename;
> + const char *dec_nodename;
> };
>
> enum venus_fmt {
>
--
Best wishes,
Vladimir
Powered by blists - more mailing lists