Skip to contentSkip to conversation

drm/i915/display/vrr: Reset VRR capable property on a long hpd

PATCH Superseded Manasi Navare 3 participants 5 messages Jan 12, 2022 – Jan 26, 2022

Subsystems (3)

v1 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/display/vrr: Reset VRR capable property on a long hpd

With some VRR panels, user can turn VRR ON/OFF on the fly from the panel settings. When VRR is turned OFF ,sends a long HPD to the driver clearing the Ignore MSA bit in the DPCD. Currently the driver parses that onevery HPD but fails to reset the corresponding VRR Capable Connector property.
Hence the userspace still sees this as VRR Capable panel which is incorrect.

Fix this by explicitly resetting the connector property.

---
 drivers/gpu/drm/i915/display/intel_dp.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_dp.c +10 -1
index df2a7d86aef0..4f1418f02b76 100644
@@ -4539,15 +4539,24 @@ static int intel_dp_get_modes(struct drm_connector *connector)
 {
 	struct intel_connector *intel_connector = to_intel_connector(connector);
 	struct edid *edid;
+	struct drm_i915_private *dev_priv = to_i915(connector->dev);
 	int num_modes = 0;
 
 	edid = intel_connector->detect_edid;
 	if (edid) {
 		num_modes = intel_connector_update_modes(connector, edid);
 
-		if (intel_vrr_is_capable(connector))
+		if (intel_vrr_is_capable(connector)) {
+			drm_dbg_kms(&dev_priv->drm, "VRR capable  = TRUE for [CONNECTOR:%d:%s]\n",
+				    connector->base.id, connector->name);
 			drm_connector_set_vrr_capable_property(connector,
 							       true);
+		} else {
+			drm_dbg_kms(&dev_priv->drm, "VRR capable = false for [CONNECTOR:%d:%s]\n",
+				    connector->base.id, connector->name);
+			drm_connector_set_vrr_capable_property(connector,
+							       false);
+		}
 	}
 
 	/* Also add fixed mode, which may or may not be present in EDID */
Signature · 1 line
2.19.1
#1 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display/vrr: Reset VRR capable property on a long hpd

== Series Details ==

== Series Details ==

Series: drm/i915/display/vrr: Reset VRR capable property on a long hpd
URL : https://patchwork.freedesktop.org/series/98801/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
519ba5ebf257 drm/i915/display/vrr: Reset VRR capable property on a long hpd
-:7: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#7: 
With some VRR panels, user can turn VRR ON/OFF on the fly from the panel settings.

total: 0 errors, 1 warnings, 0 checks, 25 lines checked

#2 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display/vrr: Reset VRR capable property on a long hpd

In reply to Manasi Navare
== Series Details ==

== Series Details ==

Series: drm/i915/display/vrr: Reset VRR capable property on a long hpd
URL : https://patchwork.freedesktop.org/series/98801/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_11075 -> Patchwork_21985
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/index.html

Participating hosts (44 -> 34)
------------------------------

Missing (10): fi-cml-u2 fi-icl-u2 fi-bsw-cyan fi-apl-guc fi-ilk-650 fi-kbl-7500u fi-cfl-8109u fi-pnv-d510 fi-bsw-kefka fi-skl-6600u

Known issues
------------

Here are the changes found in Patchwork_21985 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@hangcheck:
- bat-dg1-5: NOTRUN -> [DMESG-FAIL][1] ([i915#4494])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/bat-dg1-5/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@hugepages:
- bat-adlp-4: [PASS][2] -> [DMESG-WARN][3] ([i915#1888])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11075/bat-adlp-4/igt@i915_selftest@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/bat-adlp-4/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@late_gt_pm:
- fi-bsw-n3050: [PASS][4] -> [DMESG-FAIL][5] ([i915#2927] / [i915#3428])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11075/fi-bsw-n3050/igt@i915_selftest@live@late_gt_pm.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/fi-bsw-n3050/igt@i915_selftest@live@late_gt_pm.html

* igt@runner@aborted:
- fi-bdw-5557u: NOTRUN -> [FAIL][6] ([i915#2426] / [i915#4312])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/fi-bdw-5557u/igt@[email protected]
- fi-bsw-n3050: NOTRUN -> [FAIL][7] ([fdo#109271] / [i915#1436] / [i915#3428] / [i915#4312])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/fi-bsw-n3050/igt@[email protected]

#### Possible fixes ####

* igt@core_auth@basic-auth:
- {bat-jsl-2}: [DMESG-WARN][8] ([i915#4562]) -> [PASS][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11075/bat-jsl-2/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/bat-jsl-2/igt@[email protected]

* igt@gem_exec_suspend@basic-s3@smem:
- fi-bdw-5557u: [INCOMPLETE][10] ([i915#146]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11075/fi-bdw-5557u/igt@gem_exec_suspend@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/fi-bdw-5557u/igt@gem_exec_suspend@[email protected]

* igt@i915_selftest@live@gt_engines:
- bat-dg1-5: [INCOMPLETE][12] ([i915#4418]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11075/bat-dg1-5/igt@i915_selftest@live@gt_engines.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/bat-dg1-5/igt@i915_selftest@live@gt_engines.html

* igt@i915_selftest@live@hangcheck:
- {fi-ehl-2}: [DMESG-FAIL][14] -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11075/fi-ehl-2/igt@i915_selftest@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/fi-ehl-2/igt@i915_selftest@[email protected]

* igt@i915_selftest@live@hugepages:
- {bat-adlp-6}: [DMESG-WARN][16] ([i915#1888]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11075/bat-adlp-6/igt@i915_selftest@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/bat-adlp-6/igt@i915_selftest@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#146]: https://gitlab.freedesktop.org/drm/intel/issues/146
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2927]: https://gitlab.freedesktop.org/drm/intel/issues/2927
[i915#3428]: https://gitlab.freedesktop.org/drm/intel/issues/3428
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4418]: https://gitlab.freedesktop.org/drm/intel/issues/4418
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4562]: https://gitlab.freedesktop.org/drm/intel/issues/4562
[i915#4897]: https://gitlab.freedesktop.org/drm/intel/issues/4897

Build changes
-------------

* Linux: CI_DRM_11075 -> Patchwork_21985

CI-20190529: 20190529
CI_DRM_11075: 9b371f79eeb9a3867d2483e4038f22f89a854886 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6326: ec75f64fcbcf4aac58fbf1bf629e8f59b19db4ce @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21985: 519ba5ebf2570b540d6ffcbb311460e7d7b1eb1a @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

519ba5ebf257 drm/i915/display/vrr: Reset VRR capable property on a long hpd

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21985/index.html

maintainer
#3 lore raw
In reply to Manasi Navare
Quoted 18 lines · Manasi Navare

With some VRR panels, user can turn VRR ON/OFF on the fly from the panel settings. When VRR is turned OFF ,sends a long HPD to the driver clearing the Ignore MSA bit in the DPCD. Currently the driver parses that onevery HPD but fails to reset the corresponding VRR Capable Connector property.
Hence the userspace still sees this as VRR Capable panel which is incorrect.

Fix this by explicitly resetting the connector property.

---
 drivers/gpu/drm/i915/display/intel_dp.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_dp.c +0 -0
index df2a7d86aef0..4f1418f02b76 100644

drivers/gpu/drm/i915/display/intel_dp.c static int intel_dp_get_modes(struct drm_connector *connector) · line 4542

Quoted 4 lines
drivers/gpu/drm/i915/display/intel_dp.c +1 -0
@@ -4539,15 +4539,24 @@ static int intel_dp_get_modes(struct drm_connector *connector)
 {
 	struct intel_connector *intel_connector = to_intel_connector(connector);
 	struct edid *edid;
+	struct drm_i915_private *dev_priv = to_i915(connector->dev);

Please call it "i915" for new stuff.

Quoted 8 lines
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
 	int num_modes = 0;
 
 	edid = intel_connector->detect_edid;
 	if (edid) {
 		num_modes = intel_connector_update_modes(connector, edid);
 
-		if (intel_vrr_is_capable(connector))
+		if (intel_vrr_is_capable(connector)) {

drivers/gpu/drm/i915/display/intel_dp.c static int intel_dp_get_modes(struct drm_connector *connector) · line 4559

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp.c +8 -0
+			drm_dbg_kms(&dev_priv->drm, "VRR capable  = TRUE for [CONNECTOR:%d:%s]\n",
+				    connector->base.id, connector->name);
 			drm_connector_set_vrr_capable_property(connector,
 							       true);
+		} else {
+			drm_dbg_kms(&dev_priv->drm, "VRR capable = false for [CONNECTOR:%d:%s]\n",
+				    connector->base.id, connector->name);
+			drm_connector_set_vrr_capable_property(connector,
+							       false);
+		}

Please don't repeat yourself! Also, prefer having [CONNECTOR:%d:%s] at the beginning.

		bool capable = intel_vrr_is_capable(connector);

		drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] VRR capable: %s\n",
			    connector->base.id, connector->name, yesno(capable));
                drm_connector_set_vrr_capable_property(connector, capable);

BR,
Jani.

Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp.c +0 -0
 	}
 
 	/* Also add fixed mode, which may or may not be present in EDID */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
#4 lore raw
Quoted 14 lines · Jani Nikula
Quoted 13 lines · Manasi Navare

With some VRR panels, user can turn VRR ON/OFF on the fly from the panel settings. When VRR is turned OFF ,sends a long HPD to the driver clearing the Ignore MSA bit in the DPCD. Currently the driver parses that onevery HPD but fails to reset the corresponding VRR Capable Connector property.
Hence the userspace still sees this as VRR Capable panel which is incorrect.

Fix this by explicitly resetting the connector property.

---
 drivers/gpu/drm/i915/display/intel_dp.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
Quoted 11 lines

drivers/gpu/drm/i915/display/intel_dp.c static int intel_dp_get_modes(struct drm_connector *connector) · line 4542

Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp.c +1 -0
index df2a7d86aef0..4f1418f02b76 100644
@@ -4539,15 +4539,24 @@ static int intel_dp_get_modes(struct drm_connector *connector)
 {
 	struct intel_connector *intel_connector = to_intel_connector(connector);
 	struct edid *edid;
+	struct drm_i915_private *dev_priv = to_i915(connector->dev);

Please call it "i915" for new stuff.

Okay yes will change this to i915

Quoted 23 lines
Quoted 9 lines
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
 	int num_modes = 0;
 
 	edid = intel_connector->detect_edid;
 	if (edid) {
 		num_modes = intel_connector_update_modes(connector, edid);
 
-		if (intel_vrr_is_capable(connector))
+		if (intel_vrr_is_capable(connector)) {

drivers/gpu/drm/i915/display/intel_dp.c static int intel_dp_get_modes(struct drm_connector *connector) · line 4559

Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dp.c +8 -0
+			drm_dbg_kms(&dev_priv->drm, "VRR capable  = TRUE for [CONNECTOR:%d:%s]\n",
+				    connector->base.id, connector->name);
 			drm_connector_set_vrr_capable_property(connector,
 							       true);
+		} else {
+			drm_dbg_kms(&dev_priv->drm, "VRR capable = false for [CONNECTOR:%d:%s]\n",
+				    connector->base.id, connector->name);
+			drm_connector_set_vrr_capable_property(connector,
+							       false);
+		}

Please don't repeat yourself! Also, prefer having [CONNECTOR:%d:%s] at the beginning.

Quoted 5 lines
		bool capable = intel_vrr_is_capable(connector);

		drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] VRR capable: %s\n",
			    connector->base.id, connector->name, yesno(capable));
                drm_connector_set_vrr_capable_property(connector, capable);

Okay agree, thanks for the suggestion, will change in the v2 and resend

Regards
Manasi

Quoted 11 lines

BR,
Jani.

Quoted 3 lines
drivers/gpu/drm/i915/display/intel_dp.c +0 -0
 	}
 
 	/* Also add fixed mode, which may or may not be present in EDID */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center