lkml.org 
[lkml]   [2023]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH v6 01/15] drm/msm/adreno: adreno_gpu: Don't set OPP scaling clock w/ GMU
    Recently I contributed the switch to OPP API for all Adreno generations.
    I did however also skip over the fact that GPUs with a GMU don't specify
    a core clock of any kind in the GPU node. While that didn't break
    anything, it did introduce unwanted spam in the dmesg:

    adreno 5000000.gpu: error -ENOENT: _opp_set_clknames: Couldn't find clock with name: core_clk

    Guard the entire logic so that it's not used with GMU-equipped GPUs.

    Fixes: 9f251f934012 ("drm/msm/adreno: Use OPP for every GPU generation")
    Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
    ---
    drivers/gpu/drm/msm/adreno/adreno_gpu.c | 24 ++++++++++++++----------
    1 file changed, 14 insertions(+), 10 deletions(-)

    diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
    index bb38e728864d..6934cee07d42 100644
    --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c
    +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c
    @@ -1074,18 +1074,22 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev,
    u32 speedbin;
    int ret;

    - /*
    - * This can only be done before devm_pm_opp_of_add_table(), or
    - * dev_pm_opp_set_config() will WARN_ON()
    - */
    - if (IS_ERR(devm_clk_get(dev, "core"))) {
    + /* Only handle the core clock when GMU is not in use */
    + if (config->rev.core < 6) {
    /*
    - * If "core" is absent, go for the legacy clock name.
    - * If we got this far in probing, it's a given one of them exists.
    + * This can only be done before devm_pm_opp_of_add_table(), or
    + * dev_pm_opp_set_config() will WARN_ON()
    */
    - devm_pm_opp_set_clkname(dev, "core_clk");
    - } else
    - devm_pm_opp_set_clkname(dev, "core");
    + if (IS_ERR(devm_clk_get(dev, "core"))) {
    + /*
    + * If "core" is absent, go for the legacy clock name.
    + * If we got this far in probing, it's a given one of
    + * them exists.
    + */
    + devm_pm_opp_set_clkname(dev, "core_clk");
    + } else
    + devm_pm_opp_set_clkname(dev, "core");
    + }

    adreno_gpu->funcs = funcs;
    adreno_gpu->info = adreno_info(config->rev);
    --
    2.40.0

    \
     
     \ /
      Last update: 2023-04-01 13:56    [W:3.681 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site