Commit 853c064b authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson
Browse files

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: d8b21201 ("clk: qcom: Add support for MSM8974's multimedia clock controller (MMCC)")
Suggested-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested-by: default avatarLuca Weiss <luca@z3ntu.xyz>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230508153319.2371645-1-dmitry.baryshkov@linaro.org
parent a30e62bf

drivers/clk/qcom/mmcc-msm8974.c

+0 −19
Original line number Diff line number Diff line
@@ -2204,23 +2204,6 @@ static struct clk_branch ocmemcx_ocmemnoc_clk = { 
	},

};



static struct clk_branch oxili_ocmemgx_clk = {

	.halt_reg = 0x402c,

	.clkr = {

		.enable_reg = 0x402c,

		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "oxili_ocmemgx_clk",

			.parent_data = (const struct clk_parent_data[]){

				{ .fw_name = "gfx3d_clk_src", .name = "gfx3d_clk_src" },

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,

			.ops = &clk_branch2_ops,

		},

	},

};



static struct clk_branch ocmemnoc_clk = {

	.halt_reg = 0x50b4,

	.clkr = {
@@ -2512,7 +2495,6 @@ static struct clk_regmap *mmcc_msm8226_clocks[] = { 
	[MMSS_MMSSNOC_AXI_CLK] = &mmss_mmssnoc_axi_clk.clkr,

	[MMSS_S0_AXI_CLK] = &mmss_s0_axi_clk.clkr,

	[OCMEMCX_AHB_CLK] = &ocmemcx_ahb_clk.clkr,

	[OXILI_OCMEMGX_CLK] = &oxili_ocmemgx_clk.clkr,

	[OXILI_GFX3D_CLK] = &oxili_gfx3d_clk.clkr,

	[OXILICX_AHB_CLK] = &oxilicx_ahb_clk.clkr,

	[OXILICX_AXI_CLK] = &oxilicx_axi_clk.clkr,
@@ -2670,7 +2652,6 @@ static struct clk_regmap *mmcc_msm8974_clocks[] = { 
	[MMSS_S0_AXI_CLK] = &mmss_s0_axi_clk.clkr,

	[OCMEMCX_AHB_CLK] = &ocmemcx_ahb_clk.clkr,

	[OCMEMCX_OCMEMNOC_CLK] = &ocmemcx_ocmemnoc_clk.clkr,

	[OXILI_OCMEMGX_CLK] = &oxili_ocmemgx_clk.clkr,

	[OCMEMNOC_CLK] = &ocmemnoc_clk.clkr,

	[OXILI_GFX3D_CLK] = &oxili_gfx3d_clk.clkr,

	[OXILICX_AHB_CLK] = &oxilicx_ahb_clk.clkr,