From: Rajendra Nayak <rnayak@codeaurora.org>
To: Stanimir Varbanov <stanimir.varbanov@linaro.org>,
bjorn.andersson@linaro.org, agross@kernel.org,
robdclark@gmail.com, robdclark@chromium.org
Cc: viresh.kumar@linaro.org, sboyd@kernel.org, mka@chromium.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org
Subject: Re: [PATCH v6 5/6] media: venus: core: Add support for opp tables/perf voting
Date: Mon, 29 Jun 2020 16:19:08 +0530 [thread overview]
Message-ID: <fbb3bdd7-523b-a5fa-cde1-c61e7691e7f9@codeaurora.org> (raw)
In-Reply-To: <e0f856ec-e391-9b1d-baa3-7dda20cb853a@linaro.org>
On 6/18/2020 8:24 PM, Stanimir Varbanov wrote:
> Hi Rajendra,
>
> On 6/15/20 3:02 PM, Rajendra Nayak wrote:
>> Add support to add OPP tables and perf voting on the OPP powerdomain.
>> This is needed so venus votes on the corresponding performance state
>> for the OPP powerdomain along with setting the core clock rate.
>>
>> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
>> Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
>> Cc: Stanimir Varbanov <stanimir.varbanov@linaro.org>
>> Cc: linux-media@vger.kernel.org
>> ---
>> No functional change in v6, rebased over 5.8-rc1
>> Bindings update to add optional PD https://lore.kernel.org/patchwork/patch/1241077/
>>
>> drivers/media/platform/qcom/venus/core.c | 43 +++++++++++++++++---
>> drivers/media/platform/qcom/venus/core.h | 5 +++
>> drivers/media/platform/qcom/venus/pm_helpers.c | 54 ++++++++++++++++++++++++--
>> 3 files changed, 92 insertions(+), 10 deletions(-)
>>
>
> <cut>
>
>>
>> @@ -740,13 +740,16 @@ static int venc_power_v4(struct device *dev, int on)
>>
>> static int vcodec_domains_get(struct device *dev)
>> {
>> + int ret;
>> + struct opp_table *opp_table;
>> + struct device **opp_virt_dev;
>> struct venus_core *core = dev_get_drvdata(dev);
>> const struct venus_resources *res = core->res;
>> struct device *pd;
>> unsigned int i;
>>
>> if (!res->vcodec_pmdomains_num)
>> - return -ENODEV;
>> + goto skip_pmdomains;
>>
>> for (i = 0; i < res->vcodec_pmdomains_num; i++) {
>> pd = dev_pm_domain_attach_by_name(dev,
>> @@ -763,7 +766,41 @@ static int vcodec_domains_get(struct device *dev)
>> if (!core->pd_dl_venus)
>> return -ENODEV;
>>
>> +skip_pmdomains:
>> + if (!core->has_opp_table)
>> + return 0;
>> +
>> + /* Attach the power domain for setting performance state */
>> + opp_table = dev_pm_opp_attach_genpd(dev, res->opp_pmdomain, &opp_virt_dev);
>> + if (IS_ERR(opp_table)) {
>> + ret = PTR_ERR(opp_table);
>> + goto opp_attach_err;
>> + }
>> +
>> + core->opp_pmdomain = *opp_virt_dev;
>> + core->opp_dl_venus = device_link_add(dev, core->opp_pmdomain,
>> + DL_FLAG_RPM_ACTIVE |
>> + DL_FLAG_PM_RUNTIME |
>> + DL_FLAG_STATELESS);
>> + if (!core->opp_dl_venus) {
>> + ret = -ENODEV;
>> + goto opp_dl_add_err;
>> + }
>> +
>> return 0;
>> +
>> +opp_dl_add_err:
>> + dev_pm_domain_detach(core->opp_pmdomain, true);
>> +opp_attach_err:
>> + if (core->pd_dl_venus) {
>> + device_link_del(core->pd_dl_venus);
>> + for (i = 0; i < res->vcodec_pmdomains_num; i++) {
>> + if (IS_ERR_OR_NULL(core->pmdomains[i]))
>> + continue;
>> + dev_pm_domain_detach(core->pmdomains[i], true);
>> + }
>> + }
>> + return ret;
>> }
>>
>> static void vcodec_domains_put(struct device *dev)
>> @@ -773,7 +810,7 @@ static void vcodec_domains_put(struct device *dev)
>> unsigned int i;
>>
>> if (!res->vcodec_pmdomains_num)
>> - return;
>> + goto skip_pmdomains;
>>
>> if (core->pd_dl_venus)
>> device_link_del(core->pd_dl_venus);
>> @@ -783,6 +820,15 @@ static void vcodec_domains_put(struct device *dev)
>> continue;
>> dev_pm_domain_detach(core->pmdomains[i], true);
>> }
>> +
>> +skip_pmdomains:
>> + if (!res->opp_pmdomain)
>> + return;
>> +
>> + if (core->opp_dl_venus)
>> + device_link_del(core->opp_dl_venus);
>> +
>> + dev_pm_domain_detach(core->opp_pmdomain, true);
>
> Without corresponding changes in venus DT node we call pm_domain_detach
> with core->opp_pmdomain = NULL which triggers NULL pointer dereference.
>
> I guess you should check:
>
> if (core->has_opp_table)
> dev_pm_domain_detach(core->opp_pmdomain, true);
>
> or
>
> if (core->opp_pmdomain)
> dev_pm_domain_detach(core->opp_pmdomain, true);
>
>
> ... not sure which one is more appropriate or both are.
Thanks, I'll fix that up when I repost. Sorry I was out for a while so
haven't been able to reproduce the rpmh timeout issue you reported.
Will spend some time on it this week and see if I can reproduce it.
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2020-06-29 21:36 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-15 12:02 [PATCH v6 0/6] DVFS for IO devices on sdm845 and sc7180 Rajendra Nayak
2020-06-15 12:02 ` [PATCH v6 1/6] tty: serial: qcom_geni_serial: Use OPP API to set clk/perf state Rajendra Nayak
2020-06-25 5:08 ` Bjorn Andersson
2020-06-30 12:16 ` Rajendra Nayak
2020-06-29 23:17 ` Stephen Boyd
2020-06-30 3:01 ` Rajendra Nayak
2020-06-30 3:05 ` Viresh Kumar
2020-07-21 8:43 ` Stephen Boyd
2020-07-22 5:24 ` Viresh Kumar
2020-08-20 10:45 ` Viresh Kumar
2020-06-15 12:02 ` [PATCH v6 2/6] spi: spi-geni-qcom: " Rajendra Nayak
2020-06-15 12:02 ` [PATCH v6 3/6] drm/msm/dpu: " Rajendra Nayak
2020-06-15 12:02 ` [PATCH v6 4/6] drm/msm: dsi: " Rajendra Nayak
2020-06-15 12:02 ` [PATCH v6 5/6] media: venus: core: Add support for opp tables/perf voting Rajendra Nayak
2020-06-18 14:54 ` Stanimir Varbanov
2020-06-29 10:49 ` Rajendra Nayak [this message]
2020-06-15 12:02 ` [PATCH v6 6/6] spi: spi-qcom-qspi: Use OPP API to set clk/perf state Rajendra Nayak
2020-06-24 17:09 ` Matthias Kaehlcke
2020-06-24 17:15 ` Mark Brown
2020-06-24 17:39 ` Matthias Kaehlcke
2020-06-24 17:44 ` Mark Brown
2020-06-24 17:55 ` Matthias Kaehlcke
2020-06-24 18:00 ` Mark Brown
2020-06-24 18:12 ` Matthias Kaehlcke
2020-06-24 18:15 ` Mark Brown
2020-06-25 15:25 ` Matthias Kaehlcke
2020-06-29 11:30 ` Rajendra Nayak
2020-06-17 22:15 ` [PATCH v6 0/6] DVFS for IO devices on sdm845 and sc7180 Matthias Kaehlcke
2020-06-18 4:47 ` Rajendra Nayak
2020-06-18 8:20 ` Stanimir Varbanov
2020-06-18 12:11 ` Rajendra Nayak
2020-06-18 12:25 ` Stanimir Varbanov
2020-07-01 11:28 ` Rajendra Nayak
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=fbb3bdd7-523b-a5fa-cde1-c61e7691e7f9@codeaurora.org \
--to=rnayak@codeaurora.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mka@chromium.org \
--cc=robdclark@chromium.org \
--cc=robdclark@gmail.com \
--cc=sboyd@kernel.org \
--cc=stanimir.varbanov@linaro.org \
--cc=viresh.kumar@linaro.org \
/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;
as well as URLs for NNTP newsgroup(s).