From: Konrad Dybcio <konrad.dybcio@linaro.org>
To: Stanimir Varbanov <stanimir.k.varbanov@gmail.com>,
Vikash Garodia <quic_vgarodia@quicinc.com>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>
Cc: Marijn Suijten <marijn.suijten@somainline.org>,
Konrad Dybcio <konradybcio@kernel.org>,
linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Konrad Dybcio <konrad.dybcio@linaro.org>
Subject: [PATCH 4/6] media: platform: venus: Add optional LLCC path
Date: Fri, 04 Aug 2023 22:09:11 +0200 [thread overview]
Message-ID: <20230731-topic-8280_venus-v1-4-8c8bbe1983a5@linaro.org> (raw)
In-Reply-To: <20230731-topic-8280_venus-v1-0-8c8bbe1983a5@linaro.org>
Some newer SoCs (such as SM8350) have a third interconnect path. Add
it and make it optional.
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
---
drivers/media/platform/qcom/venus/core.c | 19 +++++++++++++++++++
drivers/media/platform/qcom/venus/core.h | 3 +++
drivers/media/platform/qcom/venus/pm_helpers.c | 3 +++
3 files changed, 25 insertions(+)
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 0af45faec247..db363061748f 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -302,6 +302,15 @@ static int venus_probe(struct platform_device *pdev)
if (IS_ERR(core->cpucfg_path))
return PTR_ERR(core->cpucfg_path);
+ core->llcc_path = devm_of_icc_get(dev, "video-llcc");
+ if (IS_ERR(core->llcc_path)) {
+ /* LLCC path is optional */
+ if (PTR_ERR(core->llcc_path) == -ENODATA)
+ core->llcc_path = NULL;
+ else
+ return PTR_ERR(core->llcc_path);
+ }
+
core->irq = platform_get_irq(pdev, 0);
if (core->irq < 0)
return core->irq;
@@ -479,12 +488,18 @@ static __maybe_unused int venus_runtime_suspend(struct device *dev)
if (ret)
goto err_cpucfg_path;
+ ret = icc_set_bw(core->llcc_path, 0, 0);
+ if (ret)
+ goto err_llcc_path;
+
ret = icc_set_bw(core->video_path, 0, 0);
if (ret)
goto err_video_path;
return ret;
+err_llcc_path:
+ icc_set_bw(core->video_path, kbps_to_icc(20000), 0);
err_video_path:
icc_set_bw(core->cpucfg_path, kbps_to_icc(1000), 0);
err_cpucfg_path:
@@ -504,6 +519,10 @@ static __maybe_unused int venus_runtime_resume(struct device *dev)
if (ret)
return ret;
+ ret = icc_set_bw(core->llcc_path, kbps_to_icc(20000), 0);
+ if (ret)
+ return ret;
+
ret = icc_set_bw(core->cpucfg_path, kbps_to_icc(1000), 0);
if (ret)
return ret;
diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 2999c24392f5..45ed1551c2db 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -65,6 +65,7 @@ struct venus_resources {
unsigned int bw_tbl_enc_size;
const struct bw_tbl *bw_tbl_dec;
unsigned int bw_tbl_dec_size;
+ bool has_llcc_path;
const struct reg_val *reg_tbl;
unsigned int reg_tbl_size;
const struct hfi_ubwc_config *ubwc_conf;
@@ -134,6 +135,7 @@ struct venus_format {
* @vcodec1_clks: an array of vcodec1 struct clk pointers
* @video_path: an interconnect handle to video to/from memory path
* @cpucfg_path: an interconnect handle to cpu configuration path
+ * @llcc_path: an interconnect handle to video to/from llcc path
* @has_opp_table: does OPP table exist
* @pmdomains: an array of pmdomains struct device pointers
* @opp_dl_venus: an device-link for device OPP
@@ -186,6 +188,7 @@ struct venus_core {
struct clk *vcodec1_clks[VIDC_VCODEC_CLKS_NUM_MAX];
struct icc_path *video_path;
struct icc_path *cpucfg_path;
+ struct icc_path *llcc_path;
bool has_opp_table;
struct device *pmdomains[VIDC_PMDOMAINS_NUM_MAX];
struct device_link *opp_dl_venus;
diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c
index 48c9084bb4db..79392ff8fa06 100644
--- a/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@ -237,6 +237,9 @@ static int load_scale_bw(struct venus_core *core)
dev_dbg(core->dev, VDBGL "total: avg_bw: %u, peak_bw: %u\n",
total_avg, total_peak);
+ if (core->res->has_llcc_path)
+ icc_set_bw(core->llcc_path, total_avg, total_peak);
+
return icc_set_bw(core->video_path, total_avg, total_peak);
}
--
2.41.0
next prev parent reply other threads:[~2023-08-04 20:09 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 20:09 [PATCH 0/6] SM8350 and SC8280XP venus support Konrad Dybcio
2023-08-04 20:09 ` [PATCH 1/6] media: dt-bindings: Document SC8280XP/SM8350 Venus Konrad Dybcio
2023-08-05 19:29 ` Krzysztof Kozlowski
2023-08-07 12:41 ` Konrad Dybcio
2023-08-07 14:04 ` Krzysztof Kozlowski
2023-08-07 15:02 ` Konrad Dybcio
2023-08-07 15:21 ` Krzysztof Kozlowski
2023-08-07 18:44 ` Bryan O'Donoghue
2023-08-07 18:45 ` Konrad Dybcio
2023-08-07 18:49 ` Bryan O'Donoghue
2023-08-07 18:55 ` Konrad Dybcio
2023-08-07 19:05 ` Bryan O'Donoghue
2023-08-09 12:15 ` Konrad Dybcio
2023-08-09 12:57 ` Bryan O'Donoghue
2023-08-04 20:09 ` [PATCH 2/6] media: venus: core: Remove trailing commas from of match entries Konrad Dybcio
2023-08-04 21:05 ` Bryan O'Donoghue
2023-08-04 20:09 ` [PATCH 3/6] media: venus: hfi_venus: Support only updating certain bits with presets Konrad Dybcio
2023-08-04 20:50 ` Bryan O'Donoghue
2023-08-04 20:51 ` Bryan O'Donoghue
2023-08-04 20:09 ` Konrad Dybcio [this message]
2023-08-04 21:04 ` [PATCH 4/6] media: platform: venus: Add optional LLCC path Bryan O'Donoghue
2023-08-04 21:06 ` Bryan O'Donoghue
2023-08-26 13:47 ` Konrad Dybcio
2023-08-26 13:38 ` Konrad Dybcio
2023-08-07 10:43 ` Johan Hovold
2023-08-07 13:04 ` Konrad Dybcio
2023-08-04 20:09 ` [PATCH 5/6] media: venus: core: Add SM8350 resource struct Konrad Dybcio
2023-08-04 21:08 ` Bryan O'Donoghue
2023-08-04 21:17 ` Konrad Dybcio
2023-08-04 20:09 ` [PATCH 6/6] media: venus: core: Add SC8280XP " Konrad Dybcio
2023-08-04 21:10 ` Bryan O'Donoghue
2023-08-04 21:10 ` Konrad Dybcio
2023-08-04 21:12 ` Bryan O'Donoghue
2023-08-04 21:17 ` Konrad Dybcio
2023-08-05 12:11 ` Bryan O'Donoghue
2024-01-22 15:13 ` 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=20230731-topic-8280_venus-v1-4-8c8bbe1983a5@linaro.org \
--to=konrad.dybcio@linaro.org \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=bryan.odonoghue@linaro.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=konradybcio@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=marijn.suijten@somainline.org \
--cc=mchehab@kernel.org \
--cc=quic_vgarodia@quicinc.com \
--cc=robh+dt@kernel.org \
--cc=stanimir.k.varbanov@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 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®