diff --git a/gpu/tuna-gpu-pwrlevels.dtsi b/gpu/tuna-gpu-pwrlevels.dtsi index 278d4fca..8294ea31 100644 --- a/gpu/tuna-gpu-pwrlevels.dtsi +++ b/gpu/tuna-gpu-pwrlevels.dtsi @@ -19,9 +19,9 @@ qcom,gpu-freq = <1050000000>; qcom,level = ; - qcom,bus-freq = <9>; - qcom,bus-min = <9>; - qcom,bus-max = <9>; + qcom,bus-freq = <11>; + qcom,bus-min = <11>; + qcom,bus-max = <11>; }; /* Turbo */ @@ -30,9 +30,9 @@ qcom,gpu-freq = <937000000>; qcom,level = ; - qcom,bus-freq = <9>; - qcom,bus-min = <8>; - qcom,bus-max = <9>; + qcom,bus-freq = <10>; + qcom,bus-min = <9>; + qcom,bus-max = <10>; }; /* Nom_L1 */ @@ -41,7 +41,7 @@ qcom,gpu-freq = <873000000>; qcom,level = ; - qcom,bus-freq = <8>; + qcom,bus-freq = <9>; qcom,bus-min = <7>; qcom,bus-max = <9>; }; @@ -52,9 +52,9 @@ qcom,gpu-freq = <763000000>; qcom,level = ; - qcom,bus-freq = <7>; - qcom,bus-min = <6>; - qcom,bus-max = <8>; + qcom,bus-freq = <8>; + qcom,bus-min = <7>; + qcom,bus-max = <9>; }; /* SVS_L2 */ @@ -63,9 +63,9 @@ qcom,gpu-freq = <688000000>; qcom,level = ; - qcom,bus-freq = <7>; - qcom,bus-min = <5>; - qcom,bus-max = <8>; + qcom,bus-freq = <6>; + qcom,bus-min = <4>; + qcom,bus-max = <7>; }; /* SVS_L1 */ @@ -74,9 +74,9 @@ qcom,gpu-freq = <644000000>; qcom,level = ; - qcom,bus-freq = <7>; + qcom,bus-freq = <6>; qcom,bus-min = <4>; - qcom,bus-max = <8>; + qcom,bus-max = <7>; }; /* SVS */ @@ -87,7 +87,7 @@ qcom,bus-freq = <4>; qcom,bus-min = <2>; - qcom,bus-max = <7>; + qcom,bus-max = <6>; }; /* Low_SVS */ diff --git a/gpu/tuna-gpu.dtsi b/gpu/tuna-gpu.dtsi index 0034b508..c56c55ff 100644 --- a/gpu/tuna-gpu.dtsi +++ b/gpu/tuna-gpu.dtsi @@ -23,11 +23,15 @@ reg-names = "kgsl_3d0_reg_memory", "rscc", "cx_dbgc", "cx_misc", "qdss_gfx", "qdss_etr", "qdss_tmc"; - interrupts = <0 300 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "kgsl_3d0_irq"; + interrupts = <0 300 IRQ_TYPE_LEVEL_HIGH>, <0 80 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "kgsl_3d0_irq", "cx_host_irq"; - clocks = <&gcc GCC_GPU_GEMNOC_GFX_CLK>, <&gpucc GPU_CC_AHB_CLK>; - clock-names = "gcc_gpu_memnoc_gfx", "gpu_cc_ahb"; + clocks = <&gcc GCC_GPU_GEMNOC_GFX_CLK>, + <&gpucc GPU_CC_AHB_CLK>, + <&aoss_qmp QDSS_CLK>; + clock-names = "gcc_gpu_memnoc_gfx", + "gpu_cc_ahb", + "apb_pclk"; qcom,gpu-model = "Adreno825"; @@ -56,7 +60,7 @@ , /* NOM index=8 */ , /* TURBO index=9 */ , /* TURBO_L1 index=10 */ - ; /* TURBO_L3 index=11 */ + ; /* TURBO_L2 index=11 */ zap-shader { memory-region = <&gpu_microcode_mem>; @@ -111,7 +115,7 @@ compatible = "qcom,kgsl-smmu-v2"; reg = <0x3da0000 0x40000>; - vddcx-supply = <&gpu_cc_cx_gdsc>; + power-domains = <&gpucc GPU_CC_CX_GDSC>; gfx3d_user: gfx3d_user { compatible = "qcom,smmu-kgsl-cb"; @@ -144,10 +148,10 @@ <0 305 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hfi", "gmu"; - regulator-names = "vddcx", "vdd"; - - vddcx-supply = <&gpu_cc_cx_gdsc>; - vdd-supply = <&gx_clkctl_gx_gdsc>; + power-domains = <&gpucc GPU_CC_CX_GDSC>, + <&gpucc GPU_CC_CX_GMU_GDSC>, + <&gxclkctl GX_CLKCTL_GX_GDSC>; + power-domain-names = "cx", "gmu_cx", "gx"; clocks = <&gpucc GPU_CC_CX_GMU_CLK>, <&gpucc GPU_CC_CXO_CLK>,