tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

clk: qcom: mmcc-msm8974: remove oxili_ocmemgx_clk

After the internal discussions, it looks like this clock is managed by
RPM itself. Linux kernel should not touch it on its own, as this causes
disagreement with RPM. Shutting down this clock causes the OCMEM<->GPU
interface to stop working, resulting in GPU hangchecks/timeouts.

Fixes: d8b212014e69 ("clk: qcom: Add support for MSM8974's multimedia clock controller (MMCC)")
Suggested-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested-by: Luca Weiss <luca@z3ntu.xyz>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230508153319.2371645-1-dmitry.baryshkov@linaro.org

authored by

Dmitry Baryshkov and committed by
Bjorn Andersson 853c064b a30e62bf

-19
-19
drivers/clk/qcom/mmcc-msm8974.c
··· 2204 2204 }, 2205 2205 }; 2206 2206 2207 - static struct clk_branch oxili_ocmemgx_clk = { 2208 - .halt_reg = 0x402c, 2209 - .clkr = { 2210 - .enable_reg = 0x402c, 2211 - .enable_mask = BIT(0), 2212 - .hw.init = &(struct clk_init_data){ 2213 - .name = "oxili_ocmemgx_clk", 2214 - .parent_data = (const struct clk_parent_data[]){ 2215 - { .fw_name = "gfx3d_clk_src", .name = "gfx3d_clk_src" }, 2216 - }, 2217 - .num_parents = 1, 2218 - .flags = CLK_SET_RATE_PARENT, 2219 - .ops = &clk_branch2_ops, 2220 - }, 2221 - }, 2222 - }; 2223 - 2224 2207 static struct clk_branch ocmemnoc_clk = { 2225 2208 .halt_reg = 0x50b4, 2226 2209 .clkr = { ··· 2495 2512 [MMSS_MMSSNOC_AXI_CLK] = &mmss_mmssnoc_axi_clk.clkr, 2496 2513 [MMSS_S0_AXI_CLK] = &mmss_s0_axi_clk.clkr, 2497 2514 [OCMEMCX_AHB_CLK] = &ocmemcx_ahb_clk.clkr, 2498 - [OXILI_OCMEMGX_CLK] = &oxili_ocmemgx_clk.clkr, 2499 2515 [OXILI_GFX3D_CLK] = &oxili_gfx3d_clk.clkr, 2500 2516 [OXILICX_AHB_CLK] = &oxilicx_ahb_clk.clkr, 2501 2517 [OXILICX_AXI_CLK] = &oxilicx_axi_clk.clkr, ··· 2652 2670 [MMSS_S0_AXI_CLK] = &mmss_s0_axi_clk.clkr, 2653 2671 [OCMEMCX_AHB_CLK] = &ocmemcx_ahb_clk.clkr, 2654 2672 [OCMEMCX_OCMEMNOC_CLK] = &ocmemcx_ocmemnoc_clk.clkr, 2655 - [OXILI_OCMEMGX_CLK] = &oxili_ocmemgx_clk.clkr, 2656 2673 [OCMEMNOC_CLK] = &ocmemnoc_clk.clkr, 2657 2674 [OXILI_GFX3D_CLK] = &oxili_gfx3d_clk.clkr, 2658 2675 [OXILICX_AHB_CLK] = &oxilicx_ahb_clk.clkr,