msm: kgsl: Fix circular dependency between KGSL and devfreq

If QCOM_SCM happens to not be selected we get into a funky little loop
between the devfreq governor and the KGSL driver since they depend on
each other.  Solve it by making KGSL always use QCOM_SCM (because it
does) and remove the dependency on QCOM_SCM from the governor and just
let it depend entirely on KGSL.

Change-Id: Ic0dedbadd703dcdb1e78a896585760132045cdf1
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
This commit is contained in:
Jordan Crouse
2019-03-27 16:49:09 -06:00
parent 6e9f8d3097
commit 2f61a834ec
2 changed files with 2 additions and 1 deletions

View File

@@ -133,7 +133,7 @@ comment "DEVFREQ Drivers"
config DEVFREQ_GOV_QCOM_ADRENO_TZ config DEVFREQ_GOV_QCOM_ADRENO_TZ
tristate "Qualcomm Technologies Inc Adreno Trustzone" tristate "Qualcomm Technologies Inc Adreno Trustzone"
depends on QCOM_KGSL && QCOM_SCM depends on QCOM_KGSL
help help
Trustzone based governor for the Adreno GPU. Sets Trustzone based governor for the Adreno GPU. Sets
the frequency using a "on-demand" algorithm. This the frequency using a "on-demand" algorithm. This

View File

@@ -5,6 +5,7 @@ config QCOM_KGSL
select GENERIC_ALLOCATOR select GENERIC_ALLOCATOR
select FW_LOADER select FW_LOADER
select PM_DEVFREQ select PM_DEVFREQ
select QCOM_SCM
select DEVFREQ_GOV_SIMPLE_ONDEMAND select DEVFREQ_GOV_SIMPLE_ONDEMAND
select DEVFREQ_GOV_PERFORMANCE select DEVFREQ_GOV_PERFORMANCE
select DEVFREQ_GOV_QCOM_ADRENO_TZ select DEVFREQ_GOV_QCOM_ADRENO_TZ