Skip to contentSkip to conversation

drm/msm/hdmi: enable regulators before clocks to avoid warnings

PATCH In review Jilai Wang 2 participants 2 messages Nov 26, 2014 – Dec 1, 2014

Subsystems (3)
DRM drivers Arm Qualcomm mailing list DRM driver for Qualcomm display hardware
lore
Share & tools
lore

Jilai Wang

author
#0 lore raw

PATCH 2/4 drm/msm/hdmi: enable regulators before clocks to avoid warnings

HPD regulators need to be enabled before clocks, otherwise clock driver will report warning.

Change-Id Ieca41722ae3b15873e6290649a21bbd13e1a4278
Signed-off-by Jilai Wang <[email protected]>
---
 drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 45 +++++++++++++------------------
 1 file changed, 18 insertions(+), 27 deletions(-)
drivers/gpu/drm/msm/hdmi/hdmi_connector.c +18 -27
index 92fddd8..caa1301 100644
@@ -141,6 +141,15 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector)
 	uint32_t hpd_ctrl;
 	int i, ret;
 
+	for (i = 0; i < config->hpd_reg_cnt; i++) {
+		ret = regulator_enable(hdmi->hpd_regs[i]);
+		if (ret) {
+			dev_err(dev->dev, "failed to enable hpd regulator: %s (%d)\n",
+					config->hpd_reg_names[i], ret);
+			goto fail;
+		}
+	}
+
 	ret = gpio_config(hdmi, true);
 	if (ret) {
 		dev_err(dev->dev, "failed to configure GPIOs: %d\n", ret);

@@ -164,15 +173,6 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector)
 		}
 	}
 
-	for (i = 0; i < config->hpd_reg_cnt; i++) {
-		ret = regulator_enable(hdmi->hpd_regs[i]);
-		if (ret) {
-			dev_err(dev->dev, "failed to enable hpd regulator: %s (%d)\n",
-					config->hpd_reg_names[i], ret);
-			goto fail;
-		}
-	}
-
 	hdmi_set_mode(hdmi, false);
 	phy->funcs->reset(phy);
 	hdmi_set_mode(hdmi, true);

@@ -200,7 +200,7 @@ fail:
 	return ret;
 }
 
-static int hdp_disable(struct hdmi_connector *hdmi_connector)
+static void hdp_disable(struct hdmi_connector *hdmi_connector)
 {
 	struct hdmi *hdmi = hdmi_connector->hdmi;
 	const struct hdmi_platform_config *config = hdmi->config;

@@ -212,28 +212,19 @@ static int hdp_disable(struct hdmi_connector *hdmi_connector)
 
 	hdmi_set_mode(hdmi, false);
 
-	for (i = 0; i < config->hpd_reg_cnt; i++) {
-		ret = regulator_disable(hdmi->hpd_regs[i]);
-		if (ret) {
-			dev_err(dev->dev, "failed to disable hpd regulator: %s (%d)\n",
-					config->hpd_reg_names[i], ret);
-			goto fail;
-		}
-	}
-
 	for (i = 0; i < config->hpd_clk_cnt; i++)
 		clk_disable_unprepare(hdmi->hpd_clks[i]);
 
 	ret = gpio_config(hdmi, false);
-	if (ret) {
-		dev_err(dev->dev, "failed to unconfigure GPIOs: %d\n", ret);
-		goto fail;
-	}
-
-	return 0;
+	if (ret)
+		dev_warn(dev->dev, "failed to unconfigure GPIOs: %d\n", ret);
 
-fail:
-	return ret;
+	for (i = 0; i < config->hpd_reg_cnt; i++) {
+		ret = regulator_disable(hdmi->hpd_regs[i]);
+		if (ret)
+			dev_warn(dev->dev, "failed to disable hpd regulator: %s (%d)\n",
+					config->hpd_reg_names[i], ret);
+	}
 }
 
 static void
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#1 lore raw

Hi Jilai,

Quoted 4 lines · Jilai Wang

HPD regulators need to be enabled before clocks, otherwise clock driver will report warning.

Change-Id: Ieca41722ae3b15873e6290649a21bbd13e1a4278

Nit: The upstream preference is to omit Change-Id lines. You should be able to move .git/hooks/commit-msg to an alternate location and amend the patch to remove it. Upstream checkpatch should warn about this--let me know if it's not working properly.

Regards,
Chris

Signature · 3 lines
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project