From: Yuanjie Yang <[email protected]> Enable power will use max_freq to set opp, so remove redundant opp setting, and use max_freq to replace max_core_clk_rate.
Signed-off-by: Yuanjie Yang <[email protected]> --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index c31488335f2b..973fec1c328c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1233,9 +1233,9 @@ static int dpu_kms_hw_init(struct msm_kms *kms) dpu_kms->hw_vbif[vbif->id] = hw; } - /* TODO: use the same max_freq as in dpu_kms_hw_init */ - max_core_clk_rate = dpu_kms_get_clk_rate(dpu_kms, "core"); - if (!max_core_clk_rate) { + if (dpu_kms->max_freq != ULONG_MAX) { + max_core_clk_rate = dpu_kms->max_freq; + } else { DPU_DEBUG("max core clk rate not determined, using default\n"); max_core_clk_rate = DPU_PERF_DEFAULT_MAX_CORE_CLK_RATE; } @@ -1317,8 +1317,6 @@ static int dpu_kms_init(struct drm_device *ddev) if (!IS_ERR(opp)) dev_pm_opp_put(opp); - dev_pm_opp_set_rate(dev, max_freq); - ret = msm_kms_init(&dpu_kms->base, &kms_funcs); if (ret) { DPU_ERROR("failed to init kms, ret=%d\n", ret); -- 2.34.1
