Merge tag 'drm-msm-fixes-2021-02-25' of https://gitlab.freedesktop.org/drm/msm into...

- pll fixes
- shutdown hook fix
- runtime resume fix
- clear_oob fix
- kms locking fix
- display aux retry fix

Signed-off-by: Dave Airlie <[email protected]>
From: Rob Clark <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvmiMKRms_NVavD=NA_jbuexZUcqqL35ke7umqpp-TxMw@mail.gmail.com

diff --combined drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index 71c917f909af7235fc9540f9923d65c1e9abd917,863047b98bf3197a215556b6dd4e8ccf7f1a9aa9..91cf46f840257f4901c07666fbe7b708d142512f
--- 1/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
--- 2/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@@ -134,7 -134,7 +134,7 @@@ void a6xx_gmu_set_freq(struct msm_gpu *
  
        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 +158,7 @@@
        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);
  }
  
@@@ -339,7 -339,7 +339,7 @@@ void a6xx_gmu_clear_oob(struct a6xx_gm
        else
                bit = a6xx_gmu_oob_bits[state].ack_new;
  
-       gmu_write(gmu, REG_A6XX_GMU_HOST2GMU_INTR_SET, bit);
+       gmu_write(gmu, REG_A6XX_GMU_HOST2GMU_INTR_SET, 1 << bit);
  }
  
  /* Enable CPU control of SPTP power power collapse */
@@@ -885,7 -885,7 +885,7 @@@ static void a6xx_gmu_set_initial_bw(str
        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 +1091,7 @@@ int a6xx_gmu_stop(struct a6xx_gpu *a6xx
                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)