dt-bindings: msm: disp: Add Display Port HPD GPIO bindings

index 3440566..31d53be 100644
@@ -765,6 +765,23 @@ static void dpu_irq_preinstall(struct msm_kms *kms)
 	dpu_core_irq_preinstall(dpu_kms);
 }
 
+static int dpu_irq_postinstall(struct msm_kms *kms)
+{
+	struct msm_drm_private *priv;
+	struct dpu_kms *dpu_kms = to_dpu_kms(kms);
+
+	if (!dpu_kms || !dpu_kms->dev)
+		return -EINVAL;
+
+	priv = dpu_kms->dev->dev_private;
+	if (!priv)
+		return -EINVAL;
+
+	msm_dp_irq_postinstall(priv->dp);
+
+	return 0;
+}
+
 static void dpu_irq_uninstall(struct msm_kms *kms)
 {
 	struct dpu_kms *dpu_kms = to_dpu_kms(kms);

@@ -775,6 +792,7 @@ static void dpu_irq_uninstall(struct msm_kms *kms)
 static const struct msm_kms_funcs kms_funcs = {
 	.hw_init         = dpu_kms_hw_init,
 	.irq_preinstall  = dpu_irq_preinstall,
+	.irq_postinstall = dpu_irq_postinstall,
 	.irq_uninstall   = dpu_irq_uninstall,
 	.irq             = dpu_irq,
 	.enable_commit   = dpu_kms_enable_commit,

87 lines not on this page · raw message

index 86b82d4..23d1cec 100644
@@ -60,7 +60,10 @@ void dp_catalog_ctrl_config_msa(struct dp_catalog *dp_catalog, u32 rate,
 void dp_catalog_ctrl_usb_reset(struct dp_catalog *dp_catalog, bool flip);
 bool dp_catalog_ctrl_mainlink_ready(struct dp_catalog *dp_catalog);
 void dp_catalog_ctrl_enable_irq(struct dp_catalog *dp_catalog, bool enable);
-void dp_catalog_ctrl_hpd_config(struct dp_catalog *dp_catalog, bool enable);
+void dp_catalog_hpd_config_intr(struct dp_catalog *dp_catalog,
+			u32 intr_mask, bool en);
+void dp_catalog_ctrl_hpd_config(struct dp_catalog *dp_catalog);
+u32 dp_catalog_hpd_get_intr_status(struct dp_catalog *dp_catalog);
 void dp_catalog_ctrl_phy_reset(struct dp_catalog *dp_catalog);
 void dp_catalog_ctrl_phy_lane_cfg(struct dp_catalog *dp_catalog, bool flipped,
 				u8 lane_cnt);

index aaa7bc8..fa15d65 100644
@@ -1568,7 +1568,6 @@ int dp_ctrl_on(struct dp_ctrl *dp_ctrl)
 	rate = ctrl->panel->link_info.rate;
 
 	dp_power_clk_enable(ctrl->power, DP_CORE_PM, true);
-	dp_catalog_ctrl_hpd_config(ctrl->catalog, true);
 
 	if (ctrl->link->sink_request & DP_TEST_LINK_PHY_TEST_PATTERN) {
 		DRM_DEBUG_DP("using phy test link parameters\n");

170 lines not on this page · raw message

index c0178524..d06a0b7 100644
@@ -10,6 +10,9 @@
 
 #include <linux/types.h>
 #include <linux/device.h>
+#include <linux/of_gpio.h>
+
+#include "dp_parser.h"
 
 enum plug_orientation {
 	ORIENTATION_NONE,

index dbf64ee..08c1abe 100644
@@ -241,6 +241,19 @@ static int dp_parser_pinctrl(struct dp_parser *parser)
 		return -EINVAL;
 	}
 
+	if (parser->hpd_gpio) {
+		pinctrl->state_hpd_active = pinctrl_lookup_state(pinctrl->pin,
+					"mdss_dp_hpd_ctrl");
+		if (IS_ERR_OR_NULL(pinctrl->state_hpd_active)) {
+			DRM_ERROR("failed to get dp hpd pinctrl state %d\n",
+				PTR_ERR_OR_ZERO(pinctrl->state_hpd_active));
+			return -EINVAL;
+		}
+
+		return pinctrl_select_state(pinctrl->pin,
+				 pinctrl->state_hpd_active);
+	}
+
 	pinctrl->state_active = pinctrl_lookup_state(pinctrl->pin,
 					"mdss_dp_active");
 	if (IS_ERR(pinctrl->state_active)) {

@@ -265,6 +278,15 @@ static int dp_parser_gpio(struct dp_parser *parser)
 	struct device *dev = &parser->pdev->dev;
 	struct device_node *of_node = dev->of_node;
 
+	if (of_find_property(of_node, "qcom,dp-hpd-gpio", NULL)) {
+		parser->hpd_gpio = of_get_named_gpio(of_node,
+					"qcom,dp-hpd-gpio", 0);
+		parser->usbplug_cc_gpio = -EINVAL;
+		parser->aux_en_gpio = -EINVAL;
+		parser->aux_sel_gpio = -EINVAL;
+		return 0;
+	}
+
 	parser->usbplug_cc_gpio = of_get_named_gpio(of_node,
 					"usbplug-cc-gpio", 0);
 	if (!gpio_is_valid(parser->usbplug_cc_gpio)) {

@@ -455,6 +477,12 @@ static int dp_parser_parse(struct dp_parser *parser)
 	}
 
 	rc = dp_parser_pinctrl(parser);
+
+	if (rc)
+		parser->hpd_gpio = -EINVAL;
+	else if (parser->hpd_gpio >= 0)
+		parser->combo_phy_en = false;
+
 	return rc;
 }
 

index 1539866..f9c572e 100644
@@ -187,9 +187,10 @@ struct dp_parser {
 	struct platform_device *pdev;
 	struct dss_module_power mp[DP_MAX_PM];
 	struct dp_pinctrl pinctrl;
-	unsigned int aux_en_gpio;
-	unsigned int aux_sel_gpio;
-	unsigned int usbplug_cc_gpio;
+	int aux_en_gpio;
+	int aux_sel_gpio;
+	int usbplug_cc_gpio;
+	int hpd_gpio;
 	bool combo_phy_en;
 	struct dp_io io;
 	struct dp_display_data disp_data;

index 28c1682..fbc1874 100644
@@ -38,10 +38,22 @@
 #define DP_DP_IRQ_HPD_INT_MASK			(0x00000002)
 #define DP_DP_HPD_REPLUG_INT_MASK		(0x00000004)
 #define DP_DP_HPD_UNPLUG_INT_MASK		(0x00000008)
+#define DP_DP_HPD_INT_MASK			(DP_DP_HPD_PLUG_INT_MASK | \
+						DP_DP_IRQ_HPD_INT_MASK | \
+						DP_DP_HPD_REPLUG_INT_MASK | \
+						DP_DP_HPD_UNPLUG_INT_MASK)
+#define DP_DP_HPD_STATE_STATUS_CONNECTED	(0x40000000)
+#define DP_DP_HPD_STATE_STATUS_PENDING		(0x20000000)
+#define DP_DP_HPD_STATE_STATUS_DISCONNECTED	(0x00000000)
+#define DP_DP_HPD_STATE_STATUS_MASK		(0xE0000000)
 
 #define REG_DP_DP_HPD_REFTIMER			(0x00000018)
+#define DP_DP_HPD_REFTIMER_ENABLE		(1 << 16)
+
 #define REG_DP_DP_HPD_EVENT_TIME_0		(0x0000001C)
 #define REG_DP_DP_HPD_EVENT_TIME_1		(0x00000020)
+#define DP_DP_HPD_EVENT_TIME_0_VAL		(0x3E800FA)
+#define DP_DP_HPD_EVENT_TIME_1_VAL		(0x1F407D0)
 
 #define REG_DP_AUX_CTRL				(0x00000030)
 #define DP_AUX_CTRL_ENABLE			(0x00000001)

index d72694c..15a33b2 100644
@@ -387,6 +387,7 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
 void msm_dp_display_mode_set(struct msm_dp *dp, struct drm_encoder *encoder,
 				struct drm_display_mode *mode,
 				struct drm_display_mode *adjusted_mode);
+void msm_dp_irq_postinstall(struct msm_dp *dp_display);
 
 #else
 static inline int __init msm_dp_register(void)

@@ -418,6 +419,11 @@ static inline void msm_dp_display_mode_set(struct msm_dp *dp,
 				struct drm_display_mode *adjusted_mode)
 {
 }
+
+static void msm_dp_irq_postinstall(struct msm_dp *dp_display)
+{
+}
+
 #endif
 
 void __init msm_mdp_register(void);