Skip to contentSkip to conversation

drm/msm/dp: promote irq_hpd handle to handle link trainign correctly

PATCH In review Kuogee Hsieh 3 participants 4 messages Oct 30, 2020 – Nov 3, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/msm/dp: promote irq_hpd handle to handle link trainign correctly

Some dongles, such as Apple, required link training done at irq_hpd request instead of plugin request. This patch promote irq_hpd hanlder to handle link training and setup hpd_state correctly.

---
 drivers/gpu/drm/msm/dp/dp_display.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +18 -2
index 13b66266cd69..55627530957c 100644
@@ -469,7 +469,9 @@ static int dp_display_handle_irq_hpd(struct dp_display_private *dp)
 static int dp_display_usbpd_attention_cb(struct device *dev)
 {
 	int rc = 0;
+	u32 sink_request;
 	struct dp_display_private *dp;
+	struct dp_usbpd *hpd;
 
 	if (!dev) {
 		DRM_ERROR("invalid dev\n");
@@ -483,10 +485,24 @@ static int dp_display_usbpd_attention_cb(struct device *dev)
 		return -ENODEV;
 	}
 
+	hpd = dp->usbpd;
+
 	/* check for any test request issued by sink */
 	rc = dp_link_process_request(dp->link);
-	if (!rc)
-		dp_display_handle_irq_hpd(dp);
+	if (!rc) {
+		sink_request = dp->link->sink_request;
+		if (sink_request & DS_PORT_STATUS_CHANGED) {
+			dp->hpd_state = ST_CONNECT_PENDING;
+			hpd->hpd_high = 1;
+		}
+
+		rc = dp_display_handle_irq_hpd(dp);
+
+		if (rc && sink_request & DS_PORT_STATUS_CHANGED) {
+			hpd->hpd_high = 0;
+			dp->hpd_state = ST_DISCONNECTED;
+		}
+	}
 
 	return rc;
 }

base-commit: 0e162b10644605428cd2596c12f8ed410cf9d2d9

Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#1 lore raw

Subject has a typo in "training".

Quoting Kuogee Hsieh (2020-10-30 16:23:24)

Quoted 1 line

Some dongles, such as Apple, required link training done at irq_hpd

s/required/require/

Quoted 1 line

request instead of plugin request. This patch promote irq_hpd hanlder

s/hanlder/handler/

Quoted 4 lines

to handle link training and setup hpd_state correctly.

---

Any Fixes tag?

Quoted 17 lines
 drivers/gpu/drm/msm/dp/dp_display.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +2 -2
index 13b66266cd69..55627530957c 100644
@@ -483,10 +485,24 @@ static int dp_display_usbpd_attention_cb(struct device *dev)
                return -ENODEV;
        }
 
+       hpd = dp->usbpd;
+
        /* check for any test request issued by sink */
        rc = dp_link_process_request(dp->link);
-       if (!rc)
-               dp_display_handle_irq_hpd(dp);

drivers/gpu/drm/msm/dp/dp_display.c static int dp_display_usbpd_attention_cb(struct device *dev) · line 501

Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_display.c +10 -0
+       if (!rc) {
+               sink_request = dp->link->sink_request;
+               if (sink_request & DS_PORT_STATUS_CHANGED) {
+                       dp->hpd_state = ST_CONNECT_PENDING;
+                       hpd->hpd_high = 1;
+               }
+
+               rc = dp_display_handle_irq_hpd(dp);
+
+               if (rc && sink_request & DS_PORT_STATUS_CHANGED) {

Can you add parenthesis around this?

		if (rc && (sink_request & DS_PORT_STATUS_CHANGED)) {

I honestly don't know what's going on in this patch. It talks about making link training happen during irq hpd handler but this is the attention handler and we're checking port status changed? This is related? The code is really not clear.

Quoted 9 lines
drivers/gpu/drm/msm/dp/dp_display.c +4 -0
+                       hpd->hpd_high = 0;
+                       dp->hpd_state = ST_DISCONNECTED;
+               }
+       }
 
        return rc;
 }

base-commit: 0e162b10644605428cd2596c12f8ed410cf9d2d9

What commit is this?

#2 lore raw
Quoted 62 lines · Stephen Boyd

Subject has a typo in "training".

Quoting Kuogee Hsieh (2020-10-30 16:23:24)

Quoted 1 line

Some dongles, such as Apple, required link training done at irq_hpd

s/required/require/

Quoted 1 line

request instead of plugin request. This patch promote irq_hpd hanlder

s/hanlder/handler/

Quoted 4 lines

to handle link training and setup hpd_state correctly.

---

Any Fixes tag?

Quoted 17 lines
 drivers/gpu/drm/msm/dp/dp_display.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +2 -2
index 13b66266cd69..55627530957c 100644
@@ -483,10 +485,24 @@ static int dp_display_usbpd_attention_cb(struct device *dev)
                return -ENODEV;
        }
 
+       hpd = dp->usbpd;
+
        /* check for any test request issued by sink */
        rc = dp_link_process_request(dp->link);
-       if (!rc)
-               dp_display_handle_irq_hpd(dp);

drivers/gpu/drm/msm/dp/dp_display.c static int dp_display_usbpd_attention_cb(struct device *dev) · line 501

Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_display.c +10 -0
+       if (!rc) {
+               sink_request = dp->link->sink_request;
+               if (sink_request & DS_PORT_STATUS_CHANGED) {
+                       dp->hpd_state = ST_CONNECT_PENDING;
+                       hpd->hpd_high = 1;
+               }
+
+               rc = dp_display_handle_irq_hpd(dp);
+
+               if (rc && sink_request & DS_PORT_STATUS_CHANGED) {

Can you add parenthesis around this?

                if (rc && (sink_request & DS_PORT_STATUS_CHANGED)) {

I honestly don't know what's going on in this patch. It talks about making link training happen during irq hpd handler but this is the attention handler and we're checking port status changed? This is related? The code is really not clear.

Quoted 5 lines
drivers/gpu/drm/msm/dp/dp_display.c +4 -0
+                       hpd->hpd_high = 0;
+                       dp->hpd_state = ST_DISCONNECTED;
+               }
+       }
 
Quoted 6 lines
Quoted 4 lines
drivers/gpu/drm/msm/dp/dp_display.c +0 -0
        return rc;
 }

base-commit: 0e162b10644605428cd2596c12f8ed410cf9d2d9

What commit is this?

Note that I skipped over a few dp related patches yesterday while starting to pull things into msm-next-staging.

Kuogee, when you send the next version can you make sure it is based against v5.10-rc or msm-next-staging?

BR,
-R

#3 lore raw
In reply to Stephen Boyd
Quoted 49 lines · Stephen Boyd

Subject has a typo in "training".

Quoting Kuogee Hsieh (2020-10-30 16:23:24)

Quoted 1 line

Some dongles, such as Apple, required link training done at irq_hpd

s/required/require/

Quoted 1 line

request instead of plugin request. This patch promote irq_hpd hanlder

s/hanlder/handler/

Quoted 4 lines

to handle link training and setup hpd_state correctly.

---

Any Fixes tag?

Quoted 18 lines
 drivers/gpu/drm/msm/dp/dp_display.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dp/dp_display.c +2 -2
index 13b66266cd69..55627530957c 100644
@@ -483,10 +485,24 @@ static int dp_display_usbpd_attention_cb(struct 
 device *dev)
                return -ENODEV;
        }
 
+       hpd = dp->usbpd;
+
        /* check for any test request issued by sink */
        rc = dp_link_process_request(dp->link);
-       if (!rc)
-               dp_display_handle_irq_hpd(dp);

drivers/gpu/drm/msm/dp/dp_display.c static int dp_display_usbpd_attention_cb(struct · line 502

Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_display.c +10 -0
+       if (!rc) {
+               sink_request = dp->link->sink_request;
+               if (sink_request & DS_PORT_STATUS_CHANGED) {
+                       dp->hpd_state = ST_CONNECT_PENDING;
+                       hpd->hpd_high = 1;
+               }
+
+               rc = dp_display_handle_irq_hpd(dp);
+
+               if (rc && sink_request & DS_PORT_STATUS_CHANGED) {

Can you add parenthesis around this?

Quoted 7 lines
		if (rc && (sink_request & DS_PORT_STATUS_CHANGED)) {

I honestly don't know what's going on in this patch. It talks about making link training happen during irq hpd handler but this is the attention handler and we're checking port status changed? This is related? The code is really not clear.

irq_hpd request is generated by sinker to ask host attention that something has changed. POST_STATUS_CHNAGED bit set by sinker to indicated link had loss of sync. Therefore host need to restart link retaining to fix the link loss of sync problem.

Quoted 12 lines
Quoted 10 lines
drivers/gpu/drm/msm/dp/dp_display.c +4 -0
+                       hpd->hpd_high = 0;
+                       dp->hpd_state = ST_DISCONNECTED;
+               }
+       }
 
        return rc;

}

base-commit: 0e162b10644605428cd2596c12f8ed410cf9d2d9

What commit is this?