Merge tag 'drm-next-2021-02-26' of git://anongit.freedesktop.org/drm/drm

[people/ms/linux.git] / drivers / gpu / drm / msm / adreno / a6xx_gmu.c

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index 9066e98eb8efc99faed434743cfade08cb949bbc..71c917f909af7235fc9540f9923d65c1e9abd917 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -134,7 +134,7 @@ void a6xx_gmu_set_freq(struct msm_gpu *gpu, struct dev_pm_opp *opp)
 
        if (!gmu->legacy) {
                a6xx_hfi_set_freq(gmu, perf_index);
-               dev_pm_opp_set_bw(&gpu->pdev->dev, opp);
+               dev_pm_opp_set_opp(&gpu->pdev->dev, opp);
                pm_runtime_put(gmu->dev);
                return;
        }
@@ -158,7 +158,7 @@ void a6xx_gmu_set_freq(struct msm_gpu *gpu, struct dev_pm_opp *opp)
        if (ret)
                dev_err(gmu->dev, "GMU set GPU frequency error: %d\n", ret);
 
-       dev_pm_opp_set_bw(&gpu->pdev->dev, opp);
+       dev_pm_opp_set_opp(&gpu->pdev->dev, opp);
        pm_runtime_put(gmu->dev);
 }
 
@@ -885,7 +885,7 @@ static void a6xx_gmu_set_initial_bw(struct msm_gpu *gpu, struct a6xx_gmu *gmu)
        if (IS_ERR_OR_NULL(gpu_opp))
                return;
 
-       dev_pm_opp_set_bw(&gpu->pdev->dev, gpu_opp);
+       dev_pm_opp_set_opp(&gpu->pdev->dev, gpu_opp);
        dev_pm_opp_put(gpu_opp);
 }
 
@@ -1091,7 +1091,7 @@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx_gpu)
                a6xx_gmu_shutdown(gmu);
 
        /* Remove the bus vote */
-       dev_pm_opp_set_bw(&gpu->pdev->dev, NULL);
+       dev_pm_opp_set_opp(&gpu->pdev->dev, NULL);
 
        /*
         * Make sure the GX domain is off before turning off the GMU (CX)