Merge "drm/msm/dsi-staging: skip regulator configuration for external bridge" (efcb9c17) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+13 −14

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
		* Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -4422,12 +4422,6 @@ int dsi_display_cont_splash_config(void *dsi_display)
		return -EINVAL;
		}

		/* Continuous splash not supported by external bridge */
		if (dsi_display_has_ext_bridge(display)) {
		display->is_cont_splash_enabled = false;
		return 0;
		}

		mutex_lock(&display->display_lock);

		/* Vote for gdsc required to read register address space */
		@@ -4470,14 +4464,19 @@ int dsi_display_cont_splash_config(void *dsi_display)
		goto clk_manager_update;
		}

		/* Vote on panel regulator will be removed during suspend path */
		rc = dsi_pwr_enable_regulator(&display->panel->power_info, true);
		/* For external bridge, regulators are managed by bridge driver */
		if (!dsi_display_has_ext_bridge(display)) {
		/* Vote on panel regulator will be removed
		* during suspend path
		*/
		rc = dsi_pwr_enable_regulator(&display->panel->power_info,
		true);
		if (rc) {
		pr_err("[%s] failed to enable vregs, rc=%d\n",
		display->panel->name, rc);
		goto clks_disabled;
		}

		}
		dsi_config_host_engine_state_for_cont_splash(display);
		mutex_unlock(&display->display_lock);