Skip to contentSkip to conversation

drm/i915: Restrict usage of live status check

PATCH In review Shashank Sharma 5 participants 21 messages Mar 17, 2016 – Apr 21, 2016

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

PATCH 1/1 drm/i915: Restrict usage of live status check

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
 drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +14 -8
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 	enum drm_connector_status status;
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
 	unsigned int try;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
 	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
 				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
 	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-
 	intel_hdmi_unset_edid(connector);
 
 	if (intel_hdmi_set_edid(connector, live_status)) {
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#1 lore raw
Quoted 11 lines · Shashank Sharma

[ text/plain ]
This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
Fixes 237ed86c693d ("drm/i915: Check live status before reading edid")

Bugzilla: ?

Quoted 10 lines
---
 drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
index e2dab48..d24d18a 100644

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1400

Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 	enum drm_connector_status status;
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;

This is unnecessary.

Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
+	bool live_status = true;
 	unsigned int try;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
 	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1414

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +6 -4
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {

Replace dev with dev_priv. Both work, it's magic, but we prefer using dev_priv where possible.

Move try variable declaration here.

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1415

Quoted 1 line
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
+		for (try = 0; !live_status && try < 9; try++) {

You'll now ignore live_status on all platforms. (But please do not turn this into a do-while, keep it as a for loop.)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1421

Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +5 -0
+			if (try)
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
 				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");

Consider using onoff(live_status) instead of live_status ? "up" :
"down".

Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -3
 	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-
 	intel_hdmi_unset_edid(connector);
 
 	if (intel_hdmi_set_edid(connector, live_status)) {
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

Regards
Shashank

Quoted 13 lines · Jani Nikula
Quoted 11 lines · Shashank Sharma

[ text/plain ]
This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
Quoted 4 lines
Fixes 237ed86c693d ("drm/i915: Check live status before reading edid")

Bugzilla: ?

Let me dig for it ... Do you have a link ? If yes, please share.

Quoted 26 lines
Quoted 10 lines
---
  drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
  1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
index e2dab48..d24d18a 100644

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1400

Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +1 -1
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
  	enum drm_connector_status status;
  	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
  	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;

This is unnecessary.

Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
+	bool live_status = true;
  	unsigned int try;
 
  	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
  	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
Quoted 14 lines

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1414

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +6 -4
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {

Replace dev with dev_priv. Both work, it's magic, but we prefer using dev_priv where possible.

Interesting, will try that out.

Quoted 2 lines

Move try variable declaration here.

Got it.

Quoted 5 lines

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1415

Quoted 1 line
drivers/gpu/drm/i915/intel_hdmi.c +1 -0
+		for (try = 0; !live_status && try < 9; try++) {

You'll now ignore live_status on all platforms. (But please do not turn this into a do-while, keep it as a for loop.)

Quoted 10 lines

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1421

Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +5 -0
+			if (try)
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
  				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");

Consider using onoff(live_status) instead of live_status ? "up" :
"down".

Sounds cool, I dint know about onoff yet, will check.

Quoted 9 lines

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1426

Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -3
  	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-
  	intel_hdmi_unset_edid(connector);
 
  	if (intel_hdmi_set_edid(connector, live_status)) {

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

PATCH v2 1/1 drm/i915: Restrict usage of live status check

In reply to Jani Nikula

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes regression added by patch:

	'commit 237ed86c693d ("drm/i915: Check live status before reading edid")'

===
V2
===
Ville:
- Add live_status = true in the end of delay loop.

Jani:
- Initialize bool live_status with false;
- Change regression reference in the commit message.
- Use dev_priv instead of dev
- Move declaration of try at the loop

---
 drivers/gpu/drm/i915/intel_hdmi.c | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +24 -7
index b199ede..98f5ae0 100644
@@ -1398,22 +1398,39 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
 	bool live_status = false;
-	unsigned int try;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
 		      connector->base.id, connector->name);
 
 	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev_priv)->gen >= 7 && !IS_IVYBRIDGE(dev_priv)) {
+		unsigned int try;
+
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
 				hdmi_to_dig_port(intel_hdmi));
+		}
 	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
+	if (!live_status) {
+		/*
+		* TODO: Replace this with some magic code.
+		* Even after giving enough delay, live status is not up.
+		* Lets read EDID and decide if HDMI is available. We
+		* have to do this not to break old platforms, but ideally
+		* should read EDID only when live_status reg allows us.
+		*/
+		DRM_DEBUG_KMS("Live status down, making it up\n");
+		live_status = true;
+	}
 
 	intel_hdmi_unset_edid(connector);
 
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw
Quoted 63 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes regression added by patch:

	'commit 237ed86c693d ("drm/i915: Check live status before reading edid")'

===
V2
===
Ville:
- Add live_status = true in the end of delay loop.

Jani:
- Initialize bool live_status with false;
- Change regression reference in the commit message.
- Use dev_priv instead of dev
- Move declaration of try at the loop

---
 drivers/gpu/drm/i915/intel_hdmi.c | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +14 -7
index b199ede..98f5ae0 100644
@@ -1398,22 +1398,39 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
 	bool live_status = false;
-	unsigned int try;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
 		      connector->base.id, connector->name);
 
 	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev_priv)->gen >= 7 && !IS_IVYBRIDGE(dev_priv)) {
+		unsigned int try;
+
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
 				hdmi_to_dig_port(intel_hdmi));
+		}
 	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
+	if (!live_status) {

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1433

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +10 -0
+		/*
+		* TODO: Replace this with some magic code.
+		* Even after giving enough delay, live status is not up.
+		* Lets read EDID and decide if HDMI is available. We
+		* have to do this not to break old platforms, but ideally
+		* should read EDID only when live_status reg allows us.
+		*/
+		DRM_DEBUG_KMS("Live status down, making it up\n");
+		live_status = true;
+	}

Hmm. This is still not what I suggested earlier. Was there some problem with my idea?

Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
 	intel_hdmi_unset_edid(connector);
 
Signature · 1 line
1.9.1
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw
Quoted 61 lines · Ville Syrjälä
Quoted 60 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes regression added by patch:

	'commit 237ed86c693d ("drm/i915: Check live status before reading edid")'

===
V2
===
Ville:
- Add live_status = true in the end of delay loop.

Jani:
- Initialize bool live_status with false;
- Change regression reference in the commit message.
- Use dev_priv instead of dev
- Move declaration of try at the loop

---
  drivers/gpu/drm/i915/intel_hdmi.c | 31 ++++++++++++++++++++++++-------
  1 file changed, 24 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +13 -5
index b199ede..98f5ae0 100644
@@ -1398,22 +1398,39 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
  	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
  	struct drm_i915_private *dev_priv = to_i915(connector->dev);
  	bool live_status = false;
-	unsigned int try;
 
  	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
  		      connector->base.id, connector->name);
 
  	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev_priv)->gen >= 7 && !IS_IVYBRIDGE(dev_priv)) {
+		unsigned int try;
+
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
  				hdmi_to_dig_port(intel_hdmi));
+		}
  	}
 
Quoted 17 lines

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1433

Quoted 13 lines
drivers/gpu/drm/i915/intel_hdmi.c +11 -2
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
+	if (!live_status) {
+		/*
+		* TODO: Replace this with some magic code.
+		* Even after giving enough delay, live status is not up.
+		* Lets read EDID and decide if HDMI is available. We
+		* have to do this not to break old platforms, but ideally
+		* should read EDID only when live_status reg allows us.
+		*/
+		DRM_DEBUG_KMS("Live status down, making it up\n");
+		live_status = true;
+	}

Hmm. This is still not what I suggested earlier. Was there some problem with my idea?

Not at all, in fact I thought I was doing just as you told. I guess I still missed something, please help me to understand what was that. our last discussion was:

Ville: Sample code:
if (don't trust live status)
live_status = true;

Shashank: Now, my question is, do you want to remove live_status check for VLV and other platforms too ? or this is good enough ?

Ville:
"No, I'm objecting to changing the entire code when you could just add two lines. Also my way has the extra benefit that we keep the live status check mostly working on these presumed "broken" platforms. So the only difference to the current situation is that we would still attempt the EDID read even if live_status came out as false, but thanks to the extra delay from the live status polling we would hopefully avoid spurious detection results since the EDID read gets delayed a bit"

Did you mean to add a kernel command-line flag type stuff for 'don't trust live status' or just gen_check was enough ?

Regards
Shashank

Quoted 6 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
  	intel_hdmi_unset_edid(connector);
 
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#6 lore raw

Hi Ville,
Please ignore my last email.

I think I finally got it what you exactly suggested. Please check another patch sent by me:
drm/i915: Fake HDMI live status

There are two versions of this patch:
v1: fake live_status = true for all platforms.
v2: fake live_status = true only for (< gen7 and IVB platforms).

please suggest which one will you prefer to go as a fix.

Regards
Shashank

Quoted 103 lines · Shashank
Quoted 64 lines · Ville Syrjälä
Quoted 63 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes regression added by patch:
'commit 237ed86c693d ("drm/i915: Check live status before reading
edid")'

===
V2
===
Ville:
- Add live_status = true in the end of delay loop.

Jani:
- Initialize bool live_status with false;
- Change regression reference in the commit message.
- Use dev_priv instead of dev
- Move declaration of try at the loop

---
  drivers/gpu/drm/i915/intel_hdmi.c | 31 ++++++++++++++++++++++++-------
  1 file changed, 24 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +13 -5
index b199ede..98f5ae0 100644
@@ -1398,22 +1398,39 @@ intel_hdmi_detect(struct drm_connector
 *connector, bool force)
      struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
      struct drm_i915_private *dev_priv = to_i915(connector->dev);
      bool live_status = false;
-    unsigned int try;
 
      DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
                connector->base.id, connector->name);
 
      intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-    for (try = 0; !live_status && try < 9; try++) {
-        if (try)
-            msleep(10);
-        live_status = intel_digital_port_connected(dev_priv,
+    /*
+    * Live status check for HDMI detection is not very
+    * reliable on older platforms. So insist the live
+    * status check for EDID read from VLV onwards.
+    */
+    if (INTEL_INFO(dev_priv)->gen >= 7 && !IS_IVYBRIDGE(dev_priv)) {
+        unsigned int try;
+
+        for (try = 0; !live_status && try < 9; try++) {
+            if (try)
+                msleep(10);
+            live_status = intel_digital_port_connected(dev_priv,
                  hdmi_to_dig_port(intel_hdmi));
+        }
      }
 
Quoted 17 lines

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1433

Quoted 13 lines
drivers/gpu/drm/i915/intel_hdmi.c +11 -2
-    if (!live_status)
-        DRM_DEBUG_KMS("Live status not up!");
+    if (!live_status) {
+        /*
+        * TODO: Replace this with some magic code.
+        * Even after giving enough delay, live status is not up.
+        * Lets read EDID and decide if HDMI is available. We
+        * have to do this not to break old platforms, but ideally
+        * should read EDID only when live_status reg allows us.
+        */
+        DRM_DEBUG_KMS("Live status down, making it up\n");
+        live_status = true;
+    }

Hmm. This is still not what I suggested earlier. Was there some problem with my idea?

Not at all, in fact I thought I was doing just as you told. I guess I still missed something, please help me to understand what was that. our last discussion was:

Ville: Sample code:
if (don't trust live status)
live_status = true;

Shashank: Now, my question is, do you want to remove live_status check for VLV and other platforms too ? or this is good enough ?

Ville:
"No, I'm objecting to changing the entire code when you could just add two lines. Also my way has the extra benefit that we keep the live status check mostly working on these presumed "broken" platforms. So the only difference to the current situation is that we would still attempt the EDID read even if live_status came out as false, but thanks to the extra delay from the live status polling we would hopefully avoid spurious detection results since the EDID read gets delayed a bit"

Quoted 11 lines

Did you mean to add a kernel command-line flag type stuff for 'don't trust live status' or just gen_check was enough ?

Regards
Shashank

Quoted 6 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
      intel_hdmi_unset_edid(connector);
 
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw
In reply to Shashank Sharma
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
 drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 	enum drm_connector_status status;
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
 	unsigned int try;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
 	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
 				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
 	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

+ if (...)
+ live_status = true;

Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -0
 	intel_hdmi_unset_edid(connector);
 
 	if (intel_hdmi_set_edid(connector, live_status)) {
Signature · 1 line
1.9.1
Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

Regards
Shashank

Quoted 61 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
  drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
  1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
  	enum drm_connector_status status;
  	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
  	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
  	unsigned int try;
 
  	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
  	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
  				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
  	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Review

Quoted 2 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

Quoted 6 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
  	intel_hdmi_unset_edid(connector);
 
  	if (intel_hdmi_set_edid(connector, live_status)) {
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw
Quoted 64 lines · Shashank

Regards
Shashank

Quoted 60 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
 drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 	enum drm_connector_status status;
 	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
 	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
 	unsigned int try;
 
 	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
 	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
 				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
 	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

The question is what is the safest approach for stable@ and for that just doing as we historically did and ignore live_status makes the most sense. Once the regressions have been rectified, then you can decide how best to approach -next.
-Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw
In reply to Sharma, Shashank
Quoted 64 lines · Shashank

Regards
Shashank

Quoted 60 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
  drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
  1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
  	enum drm_connector_status status;
  	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
  	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
  	unsigned int try;
 
  	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
  	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
  				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
  	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

My two liner would keep the check.

Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
  	intel_hdmi_unset_edid(connector);
 
  	if (intel_hdmi_set_edid(connector, live_status)) {
--

1.9.1

Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#11 lore raw

Regards
Shashank

Quoted 73 lines · Ville Syrjälä
Quoted 64 lines · Shashank

Regards
Shashank

Quoted 60 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
   drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
   1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
   	enum drm_connector_status status;
   	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
   	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
   	unsigned int try;
 
   	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
   	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
   				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
   	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

Quoted 2 lines

My two liner would keep the check.

Sorry, I might have not understood you properly.
Do you mean:

	if (INTEL_INFO(dev)->gen < 7 && IS_IVYBRIDGE(dev)) {
		live_status = true;
	} else {
		do the same looping for retry;
	}
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
   	intel_hdmi_unset_edid(connector);
 
   	if (intel_hdmi_set_edid(connector, live_status)) {
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#12 lore raw
Quoted 79 lines · Shashank

Regards
Shashank

Quoted 73 lines · Ville Syrjälä
Quoted 64 lines · Shashank

Regards
Shashank

Quoted 60 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
   drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
   1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
   	enum drm_connector_status status;
   	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
   	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
   	unsigned int try;
 
   	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
   	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
   				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
   	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

Quoted 2 lines

My two liner would keep the check.

Quoted 7 lines

Sorry, I might have not understood you properly.
Do you mean:

	if (INTEL_INFO(dev)->gen < 7 && IS_IVYBRIDGE(dev)) {
		live_status = true;
	} else {
		do the same looping for retry;
	}

No, I mean

{
	...
	do loop;

	if (!live_status)
		DRM_DEBUG_KMS("Live status not up!");

+ if (don't trust live status)

+		live_status = true;
	
	intel_hdmi_unset_edid();
	
	if (intel_hdmi_set_edid(live_status)) {
	...
}
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
   	intel_hdmi_unset_edid(connector);
 
   	if (intel_hdmi_set_edid(connector, live_status)) {
--

1.9.1

Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#13 lore raw

Hey Chris,
I added comments for both Ville and you, please help me to understand this.

Regards
Shashank

Quoted 100 lines · Ville Syrjälä
Quoted 79 lines · Shashank

Regards
Shashank

Quoted 73 lines · Ville Syrjälä
Quoted 64 lines · Shashank

Regards
Shashank

Quoted 60 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
    drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
    1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
    	enum drm_connector_status status;
    	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
    	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
    	unsigned int try;
 
    	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
    	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
    				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
    	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

Quoted 2 lines

My two liner would keep the check.

Quoted 7 lines

Sorry, I might have not understood you properly.
Do you mean:

	if (INTEL_INFO(dev)->gen < 7 && IS_IVYBRIDGE(dev)) {
		live_status = true;
	} else {
		do the same looping for retry;
	}

No, I mean

{
	...
	do loop;

	if (!live_status)
		DRM_DEBUG_KMS("Live status not up!");
(quoted diff) +2 -0
+	if (don't trust live status)
+		live_status = true;
Quoted 7 lines
	intel_hdmi_unset_edid();
	
	if (intel_hdmi_set_edid(live_status)) {
	...
}

In fact, this is what I have done.
If you see the change in this patch,

	/* Lets make live status true for < VLV platforms */
	bool live_status = true;

	blah....
	blah....

	/* Check live status only for newer platforms */
	if (this is VLV or later platforms) {
		live_status = read_real_live_status();
	}
	intel_hdmi_unset_edid();
	intel_hdmi_set_edid(live_status);

Now, my question is, do you want to remove live_status check for VLV and other platforms too ? or this is good enough ?

Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
    	intel_hdmi_unset_edid(connector);
 
    	if (intel_hdmi_set_edid(connector, live_status)) {
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#14 lore raw
Quoted 129 lines · Shashank

Hey Chris,
I added comments for both Ville and you, please help me to understand this.

Regards
Shashank

Quoted 100 lines · Ville Syrjälä
Quoted 79 lines · Shashank

Regards
Shashank

Quoted 73 lines · Ville Syrjälä
Quoted 64 lines · Shashank

Regards
Shashank

Quoted 60 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
    drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
    1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
    	enum drm_connector_status status;
    	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
    	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
    	unsigned int try;
 
    	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
    	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
    				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
    	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

Quoted 2 lines

My two liner would keep the check.

Quoted 7 lines

Sorry, I might have not understood you properly.
Do you mean:

	if (INTEL_INFO(dev)->gen < 7 && IS_IVYBRIDGE(dev)) {
		live_status = true;
	} else {
		do the same looping for retry;
	}

No, I mean

{
	...
	do loop;

	if (!live_status)
		DRM_DEBUG_KMS("Live status not up!");
(quoted diff) +2 -0
+	if (don't trust live status)
+		live_status = true;
Quoted 7 lines
	intel_hdmi_unset_edid();
	
	if (intel_hdmi_set_edid(live_status)) {
	...
}

In fact, this is what I have done.
If you see the change in this patch,

	/* Lets make live status true for < VLV platforms */
	bool live_status = true;

	blah....
	blah....

	/* Check live status only for newer platforms */
	if (this is VLV or later platforms) {
		live_status = read_real_live_status();
	}
	intel_hdmi_unset_edid();
	intel_hdmi_set_edid(live_status);
Quoted 2 lines

Now, my question is, do you want to remove live_status check for VLV and other platforms too ? or this is good enough ?

No, I'm objecting to changing the entire code when you could just add two lines. Also my way has the extra benefit that we keep the live status check mostly working on these presumed "broken" platforms.

So the only difference to the current situation is that we would still attempt the EDID read even if live_status came out as false, but thanks to the extra delay from the live status polling we would hopefully avoid spurious detection results since the EDID read gets delayed a bit.

Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
    	intel_hdmi_unset_edid(connector);
 
    	if (intel_hdmi_set_edid(connector, live_status)) {
--

1.9.1

Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#15 lore raw

Regards
Shashank

Quoted 133 lines · Ville Syrjälä
Quoted 129 lines · Shashank

Hey Chris,
I added comments for both Ville and you, please help me to understand this.

Regards
Shashank

Quoted 100 lines · Ville Syrjälä
Quoted 79 lines · Shashank

Regards
Shashank

Quoted 73 lines · Ville Syrjälä
Quoted 64 lines · Shashank

Regards
Shashank

Quoted 60 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
     drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
     1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
     	enum drm_connector_status status;
     	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
     	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
     	unsigned int try;
 
     	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
     	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
     				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
     	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

Quoted 2 lines

My two liner would keep the check.

Quoted 7 lines

Sorry, I might have not understood you properly.
Do you mean:

	if (INTEL_INFO(dev)->gen < 7 && IS_IVYBRIDGE(dev)) {
		live_status = true;
	} else {
		do the same looping for retry;
	}

No, I mean

{
	...
	do loop;

	if (!live_status)
		DRM_DEBUG_KMS("Live status not up!");
(quoted diff) +2 -0
+	if (don't trust live status)
+		live_status = true;
Quoted 7 lines
	intel_hdmi_unset_edid();
	
	if (intel_hdmi_set_edid(live_status)) {
	...
}

In fact, this is what I have done.
If you see the change in this patch,

	/* Lets make live status true for < VLV platforms */
	bool live_status = true;

	blah....
	blah....

	/* Check live status only for newer platforms */
	if (this is VLV or later platforms) {
		live_status = read_real_live_status();
	}
	intel_hdmi_unset_edid();
	intel_hdmi_set_edid(live_status);
Quoted 2 lines

Now, my question is, do you want to remove live_status check for VLV and other platforms too ? or this is good enough ?

Quoted 9 lines

No, I'm objecting to changing the entire code when you could just add two lines. Also my way has the extra benefit that we keep the live status check mostly working on these presumed "broken" platforms.

So the only difference to the current situation is that we would still attempt the EDID read even if live_status came out as false, but thanks to the extra delay from the live status polling we would hopefully avoid spurious detection results since the EDID read gets delayed a bit.

Ok, thanks for this suggestion. I will do the change.
I was thinking of adding a warning, if we are going to read the EDID without live status being set, sounds ok ?

Quoted 11 lines
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
     	intel_hdmi_unset_edid(connector);
 
     	if (intel_hdmi_set_edid(connector, live_status)) {
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#16 lore raw
Quoted 141 lines · Shashank

Regards
Shashank

Quoted 137 lines · Ville Syrjälä
Quoted 129 lines · Shashank

Hey Chris,
I added comments for both Ville and you, please help me to understand this.

Regards
Shashank

Quoted 100 lines · Ville Syrjälä
Quoted 79 lines · Shashank

Regards
Shashank

Quoted 73 lines · Ville Syrjälä
Quoted 64 lines · Shashank

Regards
Shashank

Quoted 60 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
     drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
     1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
     	enum drm_connector_status status;
     	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
     	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
     	unsigned int try;
 
     	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
     	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
     				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
     	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

Quoted 2 lines

My two liner would keep the check.

Quoted 7 lines

Sorry, I might have not understood you properly.
Do you mean:

	if (INTEL_INFO(dev)->gen < 7 && IS_IVYBRIDGE(dev)) {
		live_status = true;
	} else {
		do the same looping for retry;
	}

No, I mean

{
	...
	do loop;

	if (!live_status)
		DRM_DEBUG_KMS("Live status not up!");
(quoted diff) +2 -0
+	if (don't trust live status)
+		live_status = true;
Quoted 7 lines
	intel_hdmi_unset_edid();
	
	if (intel_hdmi_set_edid(live_status)) {
	...
}

In fact, this is what I have done.
If you see the change in this patch,

	/* Lets make live status true for < VLV platforms */
	bool live_status = true;

	blah....
	blah....

	/* Check live status only for newer platforms */
	if (this is VLV or later platforms) {
		live_status = read_real_live_status();
	}
	intel_hdmi_unset_edid();
	intel_hdmi_set_edid(live_status);
Quoted 2 lines

Now, my question is, do you want to remove live_status check for VLV and other platforms too ? or this is good enough ?

No, I'm objecting to changing the entire code when you could just add two lines. Also my way has the extra benefit that we keep the live status check mostly working on these presumed "broken" platforms.

Quoted 8 lines
Quoted 5 lines

So the only difference to the current situation is that we would still attempt the EDID read even if live_status came out as false, but thanks to the extra delay from the live status polling we would hopefully avoid spurious detection results since the EDID read gets delayed a bit.

Ok, thanks for this suggestion. I will do the change.
I was thinking of adding a warning, if we are going to read the EDID without live status being set, sounds ok ?

Yeah, adding a debug message might be prudent.

Quoted 12 lines
Quoted 12 lines
Quoted 11 lines
Quoted 11 lines
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
     	intel_hdmi_unset_edid(connector);
 
     	if (intel_hdmi_set_edid(connector, live_status)) {
--

1.9.1

Signature · 6 lines
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#17 lore raw
In reply to Sharma, Shashank
Quoted 110 lines · Shashank

[ text/plain ]
Hey Chris,
I added comments for both Ville and you, please help me to understand this.

Regards
Shashank

Quoted 102 lines · Ville Syrjälä
Quoted 79 lines · Shashank

Regards
Shashank

Quoted 73 lines · Ville Syrjälä
Quoted 64 lines · Shashank

Regards
Shashank

Quoted 60 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
    drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
    1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
    	enum drm_connector_status status;
    	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
    	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
    	unsigned int try;
 
    	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
    	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
    				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
    	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

Quoted 2 lines

My two liner would keep the check.

Quoted 7 lines

Sorry, I might have not understood you properly.
Do you mean:

	if (INTEL_INFO(dev)->gen < 7 && IS_IVYBRIDGE(dev)) {
		live_status = true;
	} else {
		do the same looping for retry;
	}

No, I mean

{
	...
	do loop;

	if (!live_status)
		DRM_DEBUG_KMS("Live status not up!");
(quoted diff) +2 -0
+	if (don't trust live status)
+		live_status = true;
	
	intel_hdmi_unset_edid();
Quoted 7 lines
Quoted 5 lines
	if (intel_hdmi_set_edid(live_status)) {
	...
}

In fact, this is what I have done.
If you see the change in this patch,

Actually, not. You set live_status to true in the beginning, and your loop condition has !live_status, i.e. you won't check live status even once on any platform. Which is what I said in my review.

BR,
Jani.

Quoted 25 lines
	/* Lets make live status true for < VLV platforms */
	bool live_status = true;

	blah....
	blah....

	/* Check live status only for newer platforms */
	if (this is VLV or later platforms) {
		live_status = read_real_live_status();
	}
	intel_hdmi_unset_edid();
	intel_hdmi_set_edid(live_status);

Now, my question is, do you want to remove live_status check for VLV and other platforms too ? or this is good enough ?

Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
    	intel_hdmi_unset_edid(connector);
 
    	if (intel_hdmi_set_edid(connector, live_status)) {
--

1.9.1

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#18 lore raw

Regards
Shashank

Quoted 119 lines · Jani Nikula
Quoted 110 lines · Shashank

[ text/plain ]
Hey Chris,
I added comments for both Ville and you, please help me to understand this.

Regards
Shashank

Quoted 102 lines · Ville Syrjälä
Quoted 79 lines · Shashank

Regards
Shashank

Quoted 73 lines · Ville Syrjälä
Quoted 64 lines · Shashank

Regards
Shashank

Quoted 60 lines · Ville Syrjälä
Quoted 45 lines · Shashank Sharma

This patch restricts usage of live status check for HDMI detection. While testing certain (monitor + cable) combinations with various intel platforms, it seems that live status register is not reliable on some older devices. So limit the live_status check from VLV onwards.

This fixes a regression introduced in:

	commit: 237ed86 "drm/i915: Check live status"
	Author: Sonika Jindal <[email protected]>
	Date:   Tue Sep 15 09:44:20 2015 +0530
---
     drivers/gpu/drm/i915/intel_hdmi.c | 22 ++++++++++++++--------
     1 file changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_hdmi.c +10 -5
index e2dab48..d24d18a 100644
@@ -1397,7 +1397,8 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
     	enum drm_connector_status status;
     	struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector);
     	struct drm_i915_private *dev_priv = to_i915(connector->dev);
-	bool live_status = false;
+	struct drm_device *dev = connector->dev;
+	bool live_status = true;
     	unsigned int try;
 
     	DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
@@ -1405,16 +1406,21 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 
     	intel_display_power_get(dev_priv, POWER_DOMAIN_GMBUS);
 
-	for (try = 0; !live_status && try < 9; try++) {
-		if (try)
-			msleep(10);
-		live_status = intel_digital_port_connected(dev_priv,
+	/*
+	* Live status check for HDMI detection is not very
+	* reliable on older platforms. So insist the live
+	* status check for EDID read from VLV onwards.
+	*/
+	if (INTEL_INFO(dev)->gen >= 7 && !IS_IVYBRIDGE(dev)) {
+		for (try = 0; !live_status && try < 9; try++) {
+			if (try)

drivers/gpu/drm/i915/intel_hdmi.c intel_hdmi_detect(struct drm_connector *connector, bool force) · line 1417

Quoted 10 lines
drivers/gpu/drm/i915/intel_hdmi.c +4 -3
+				msleep(10);
+			live_status = intel_digital_port_connected(dev_priv,
     				hdmi_to_dig_port(intel_hdmi));
+		}
+		DRM_DEBUG_KMS("Live status %s\n", live_status ? "up" : "down");
     	}
 
-	if (!live_status)
-		DRM_DEBUG_KMS("Live status not up!");
-

As I said before, I think this whole thing could be solved with a simple two-liner here:

Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +2 -0
+	if (...)
+		live_status = true;

Yes I remember, and I replied on that already that why we would like to keep the live status check. In fact I would be ok to remove this check if you can suggest some other way of making this work for other operating systems/sw platforms.

Quoted 2 lines

My two liner would keep the check.

Quoted 7 lines

Sorry, I might have not understood you properly.
Do you mean:

	if (INTEL_INFO(dev)->gen < 7 && IS_IVYBRIDGE(dev)) {
		live_status = true;
	} else {
		do the same looping for retry;
	}

No, I mean

{
	...
	do loop;

	if (!live_status)
		DRM_DEBUG_KMS("Live status not up!");
(quoted diff) +2 -0
+	if (don't trust live status)
+		live_status = true;
	
	intel_hdmi_unset_edid();
Quoted 7 lines
Quoted 5 lines
	if (intel_hdmi_set_edid(live_status)) {
	...
}

In fact, this is what I have done.
If you see the change in this patch,

Quoted 6 lines

Actually, not. You set live_status to true in the beginning, and your loop condition has !live_status, i.e. you won't check live status even once on any platform. Which is what I said in my review.

BR,
Jani.

Ah.. damn. While splitting the patch into two, I missed this part. Thanks for pointing this out.

Quoted 19 lines
Quoted 19 lines

	/* Lets make live status true for < VLV platforms */
	bool live_status = true;

	blah....
	blah....

	/* Check live status only for newer platforms */
	if (this is VLV or later platforms) {
		live_status = read_real_live_status();
	}
	intel_hdmi_unset_edid();
	intel_hdmi_set_edid(live_status);

Now, my question is, do you want to remove live_status check for VLV and other platforms too ? or this is good enough ?

Quoted 1 line
Quoted 1 line
Quoted 9 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_hdmi.c +0 -1
     	intel_hdmi_unset_edid(connector);
 
     	if (intel_hdmi_set_edid(connector, live_status)) {
--

1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#19 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Restrict usage of live status check (rev3)

In reply to Shashank Sharma
== Series Details ==

== Series Details ==

Series: drm/i915: Restrict usage of live status check (rev3)
URL : https://patchwork.freedesktop.org/series/4297/
State : failure

== Summary ==

Series 4297v3 drm/i915: Restrict usage of live status check
http://patchwork.freedesktop.org/api/1.0/series/4297/revisions/3/mbox/

Test gem_ringfill:

        Subgroup basic-default-s3:
                dmesg-warn -> PASS       (skl-nuci5)
Test gem_storedw_loop:
        Subgroup basic-default:
                dmesg-warn -> PASS       (skl-nuci5)
Test gem_sync:
        Subgroup basic-vebox:
                dmesg-warn -> PASS       (skl-nuci5)
Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-b:
                pass       -> DMESG-WARN (snb-x220t)
        Subgroup read-crc-pipe-b-frame-sequence:
                dmesg-warn -> PASS       (snb-x220t)
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                fail       -> DMESG-FAIL (snb-x220t)
bdw-nuci7        total:194  pass:181  dwarn:1   dfail:0   fail:0   skip:12 
bdw-ultra        total:194  pass:172  dwarn:1   dfail:0   fail:0   skip:21 
byt-nuc          total:194  pass:155  dwarn:4   dfail:0   fail:0   skip:35 
ivb-t430s        total:194  pass:168  dwarn:1   dfail:0   fail:0   skip:25 
skl-i5k-2        total:194  pass:170  dwarn:1   dfail:0   fail:0   skip:23 
skl-i7k-2        total:194  pass:170  dwarn:1   dfail:0   fail:0   skip:23 
skl-nuci5        total:194  pass:182  dwarn:1   dfail:0   fail:0   skip:11 
snb-x220t        total:194  pass:158  dwarn:2   dfail:1   fail:0   skip:33 

Results at /archive/results/CI_IGT_test/Patchwork_1629/

10e913a48ca36790da9b58bed8729598ea79ebdb drm-intel-nightly: 2016y-03m-17d-13h-22m-41s UTC integration manifest d4dd91856267b81c8ac5bbaab7a24be5ac54a282 drm/i915: Restrict usage of live status check

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#20 lore raw

✓ Fi.CI.BAT: success for drm/i915: Restrict usage of live status check (rev4)

In reply to Shashank Sharma
== Series Details ==

== Series Details ==

Series: drm/i915: Restrict usage of live status check (rev4)
URL : https://patchwork.freedesktop.org/series/4297/
State : success

== Summary ==

Series 4297v4 drm/i915: Restrict usage of live status check
http://patchwork.freedesktop.org/api/1.0/series/4297/revisions/4/mbox/

bdw-nuci7        total:192  pass:180  dwarn:0   dfail:0   fail:0   skip:12 
bdw-ultra        total:192  pass:169  dwarn:0   dfail:0   fail:0   skip:23 
bsw-nuc-2        total:191  pass:152  dwarn:0   dfail:0   fail:0   skip:39 
byt-nuc          total:191  pass:153  dwarn:0   dfail:0   fail:0   skip:38 
hsw-brixbox      total:192  pass:168  dwarn:0   dfail:0   fail:0   skip:24 
hsw-gt2          total:192  pass:173  dwarn:0   dfail:0   fail:0   skip:19 
ilk-hp8440p      total:192  pass:135  dwarn:0   dfail:0   fail:0   skip:57 
ivb-t430s        total:192  pass:164  dwarn:0   dfail:0   fail:0   skip:28 
skl-i7k-2        total:192  pass:167  dwarn:0   dfail:0   fail:0   skip:25 
skl-nuci5        total:192  pass:181  dwarn:0   dfail:0   fail:0   skip:11 
snb-dellxps      total:192  pass:154  dwarn:0   dfail:0   fail:0   skip:38 
snb-x220t        total:192  pass:154  dwarn:0   dfail:0   fail:1   skip:37 

Results at /archive/results/CI_IGT_test/Patchwork_1957/

4dc4ce0da8c23182942ce0ecb96cdac57bb1bcd7 drm-intel-nightly: 2016y-04m-20d-16h-33m-39s UTC integration manifest 31430fd drm/i915: Restrict usage of live status check

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx