Merge "clk: qcom: mdss: skip DisplayPort PLL queries if GDSC is not enabled" (fb0fd749) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/clk/qcom/mdss/mdss-dp-pll-7nm-util.c

+7 −1

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
		*/

		#define pr_fmt(fmt) "[dp-pll] %s: " fmt, __func__
		@@ -144,6 +144,9 @@ int dp_mux_get_parent_7nm(void context, unsigned int reg, unsigned int val)
		return -EINVAL;
		}

		if (is_gdsc_disabled(dp_res))
		return 0;

		rc = mdss_pll_resource_enable(dp_res, true);
		if (rc) {
		pr_err("Failed to enable dp_res resources\n");
		@@ -636,6 +639,9 @@ unsigned long dp_vco_recalc_rate_7nm(struct clk_hw *hw,
		vco = to_dp_vco_hw(hw);
		dp_res = vco->priv;

		if (is_gdsc_disabled(dp_res))
		return 0;

		rc = mdss_pll_resource_enable(dp_res, true);
		if (rc) {
		pr_err("Failed to enable mdss DP pll=%d\n", dp_res->index);