drivers/media/platform/qcom/venus/pm_helpers.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
Since the device trees for both HFI_VERSION_1XX and HFI_VERSION_3XX
do not include an opp-table and have not configured opp-pmdomain, they
still need to use the frequencies defined in the driver's freq_tbl.
Both core_power_v1 and core_power_v4 functions require core_clks_enable
function during POWER_ON. Therefore, in the core_clks_enable function,
if calling dev_pm_opp_find_freq_ceil to obtain the frequency fails,
it needs to fall back to the freq_tbl to retrieve the frequency.
Fixes: b179234b5e59 ("media: venus: pm_helpers: use opp-table for the frequency")
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Vikash Garodia <quic_vgarodia@quicinc.com>
Closes: https://lore.kernel.org/linux-media/CA+G9fYu5=3n84VY+vTbCAcfFKOq7Us5vgBZgpypY4MveM=eVwg@mail.gmail.com
Signed-off-by: Renjiang Han <quic_renjiang@quicinc.com>
---
Since device trees for both HFI_VERSION_1XX and HFI_VERSION_3XX do not
contain an opp-table and have not configured opp-pmdomain, they still
need to use the frequencies defined in the driver's freq_tbl.
Therefore, if calling dev_pm_opp_find_freq_ceil to obtain the frequency
fails in the core_clks_enable, it needs to fall back to the freq_tbl to
retrieve the frequency.
Validated this series on QCS615 and msm8916.
---
Changes in v3:
- 1. Fix patch conflict issue.
- Link to v2: https://lore.kernel.org/r/20250724-fallback_of_opp_table-v2-1-2fc61f2407dc@quicinc.com
Changes in v2:
- 1. Update the returned error value as per the feedback.
- Link to v1: https://lore.kernel.org/r/20250723-fallback_of_opp_table-v1-1-20a6277fdded@quicinc.com
---
drivers/media/platform/qcom/venus/pm_helpers.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c
index 88618378129a086274b61be5b23410783b92ca26..f0269524ac70eb72384a06aa6a215e2046abf5c2 100644
--- a/drivers/media/platform/qcom/venus/pm_helpers.c
+++ b/drivers/media/platform/qcom/venus/pm_helpers.c
@@ -40,6 +40,8 @@ static int core_clks_get(struct venus_core *core)
static int core_clks_enable(struct venus_core *core)
{
+ const struct freq_tbl *freq_tbl = core->res->freq_tbl;
+ unsigned int freq_tbl_size = core->res->freq_tbl_size;
const struct venus_resources *res = core->res;
struct device *dev = core->dev;
unsigned long freq = 0;
@@ -48,8 +50,13 @@ static int core_clks_enable(struct venus_core *core)
int ret;
opp = dev_pm_opp_find_freq_ceil(dev, &freq);
- if (!IS_ERR(opp))
+ if (IS_ERR(opp)) {
+ if (!freq_tbl)
+ return -ENODEV;
+ freq = freq_tbl[freq_tbl_size - 1].freq;
+ } else {
dev_pm_opp_put(opp);
+ }
for (i = 0; i < res->clks_num; i++) {
if (IS_V6(core) || (IS_V4(core) && is_lite(core))) {
---
base-commit: ae2d20002576d2893ecaff25db3d7ef9190ac0b6
change-id: 20250918-fallback_of_opp_table-bfae64cca1a0
Best regards,
--
Renjiang Han <quic_renjiang@quicinc.com>
On 18/09/2025 13:01, Renjiang Han wrote: > Since the device trees for both HFI_VERSION_1XX and HFI_VERSION_3XX > do not include an opp-table and have not configured opp-pmdomain, they > still need to use the frequencies defined in the driver's freq_tbl. > > Both core_power_v1 and core_power_v4 functions require core_clks_enable > function during POWER_ON. Therefore, in the core_clks_enable function, > if calling dev_pm_opp_find_freq_ceil to obtain the frequency fails, > it needs to fall back to the freq_tbl to retrieve the frequency. > > Fixes: b179234b5e59 ("media: venus: pm_helpers: use opp-table for the frequency") > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> > Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Reviewed-by: Vikash Garodia <quic_vgarodia@quicinc.com> > Closes: https://lore.kernel.org/linux-media/CA+G9fYu5=3n84VY+vTbCAcfFKOq7Us5vgBZgpypY4MveM=eVwg@mail.gmail.com > Signed-off-by: Renjiang Han <quic_renjiang@quicinc.com> > --- > Since device trees for both HFI_VERSION_1XX and HFI_VERSION_3XX do not > contain an opp-table and have not configured opp-pmdomain, they still > need to use the frequencies defined in the driver's freq_tbl. > > Therefore, if calling dev_pm_opp_find_freq_ceil to obtain the frequency > fails in the core_clks_enable, it needs to fall back to the freq_tbl to > retrieve the frequency. > > Validated this series on QCS615 and msm8916. > --- > Changes in v3: > - 1. Fix patch conflict issue. > - Link to v2: https://lore.kernel.org/r/20250724-fallback_of_opp_table-v2-1-2fc61f2407dc@quicinc.com > > Changes in v2: > - 1. Update the returned error value as per the feedback. > - Link to v1: https://lore.kernel.org/r/20250723-fallback_of_opp_table-v1-1-20a6277fdded@quicinc.com > --- > drivers/media/platform/qcom/venus/pm_helpers.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/qcom/venus/pm_helpers.c b/drivers/media/platform/qcom/venus/pm_helpers.c > index 88618378129a086274b61be5b23410783b92ca26..f0269524ac70eb72384a06aa6a215e2046abf5c2 100644 > --- a/drivers/media/platform/qcom/venus/pm_helpers.c > +++ b/drivers/media/platform/qcom/venus/pm_helpers.c > @@ -40,6 +40,8 @@ static int core_clks_get(struct venus_core *core) > > static int core_clks_enable(struct venus_core *core) > { > + const struct freq_tbl *freq_tbl = core->res->freq_tbl; > + unsigned int freq_tbl_size = core->res->freq_tbl_size; > const struct venus_resources *res = core->res; > struct device *dev = core->dev; > unsigned long freq = 0; > @@ -48,8 +50,13 @@ static int core_clks_enable(struct venus_core *core) > int ret; > > opp = dev_pm_opp_find_freq_ceil(dev, &freq); > - if (!IS_ERR(opp)) > + if (IS_ERR(opp)) { > + if (!freq_tbl) > + return -ENODEV; > + freq = freq_tbl[freq_tbl_size - 1].freq; > + } else { > dev_pm_opp_put(opp); > + } > > for (i = 0; i < res->clks_num; i++) { > if (IS_V6(core) || (IS_V4(core) && is_lite(core))) { > > --- > base-commit: ae2d20002576d2893ecaff25db3d7ef9190ac0b6 > change-id: 20250918-fallback_of_opp_table-bfae64cca1a0 > > Best regards, > -- > Renjiang Han <quic_renjiang@quicinc.com> > Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
© 2016 - 2025 Red Hat, Inc.