drm/i915/display/vrr: Reset VRR capable property on a long hpd
Subsystems (3)
PATCH v3 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.
v2: Reset vrr capable if status == connector_disconnected
v3: Use i915 and use bool vrr_capable (Jani Nikula)
v4: Move vrr_capable to after update modes call (Jani N) Remove the redundant comment (Jan N)
--- drivers/gpu/drm/i915/display/intel_dp.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +13 -4
@@ -4455,6 +4455,12 @@ intel_dp_detect(struct drm_connector *connector,memset (&intel_dp->compliance,0 ,sizeof (intel_dp->compliance));memset (intel_dp->dsc_dpcd,0 ,sizeof (intel_dp->dsc_dpcd)); +/* Reset VRR Capable property */ +drm_dbg_kms (&dev_priv->drm,"[CONNECTOR:%d:%s] VRR capable: FALSE\n" , + connector->base.id, connector->name); +drm_connector_set_vrr_capable_property (connector, + false); +if (intel_dp->is_mst) { drm_dbg_kms(&dev_priv->drm, "MST device may have disappeared %d vs %d\n",
@@ -4569,15 +4575,18 @@ 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 *i915 =to_i915 (connector->dev);int num_modes =0 ; edid = intel_connector->detect_edid;if (edid) { - num_modes =intel_connector_update_modes (connector, edid); +bool vrr_capable; -if (intel_vrr_is_capable (connector)) -drm_connector_set_vrr_capable_property (connector, - true); + num_modes =intel_connector_update_modes (connector, edid); + vrr_capable =intel_vrr_is_capable (connector); +drm_dbg_kms (&i915->drm,"[CONNECTOR:%d:%s] VRR capable: %s\n" , + connector->base.id, connector->name,yesno (vrr_capable)); +drm_connector_set_vrr_capable_property (connector, vrr_capable); }/* Also add fixed mode, which may or may not be present in EDID */
Signature · 1 line
2.19.1
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/display/vrr: Reset VRR capable property on a long hpd (rev3)
== Series Details ==
== Series Details ==
Series: drm/i915/display/vrr: Reset VRR capable property on a long hpd (rev3)
URL : https://patchwork.freedesktop.org/series/98801/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip eceba9ce6889 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, 34 lines checked
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/display/vrr: Reset VRR capable property on a long hpd (rev3)
In reply to Manasi Navare== Series Details ==
== Series Details ==
Series: drm/i915/display/vrr: Reset VRR capable property on a long hpd (rev3)
URL : https://patchwork.freedesktop.org/series/98801/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11238 -> Patchwork_22288
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_22288 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_22288, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22288/index.html
Participating hosts (46 -> 18)
------------------------------
ERROR: It appears as if the changes made in Patchwork_22288 prevented too many machines from booting.
Additional (1): fi-pnv-d510
Missing (29): fi-kbl-soraka fi-bdw-gvtdvm fi-apl-guc fi-snb-2520m fi-skl-6600u fi-snb-2600 fi-cml-u2 fi-bxt-dsi fi-bdw-5557u shard-tglu fi-bsw-n3050 fi-glk-dsi fi-ilk-650 fi-kbl-7500u fi-hsw-4770 fi-ivb-3770 fi-elk-e7500 fi-bsw-nick fi-skl-6700k2 fi-kbl-7567u fi-skl-guc fi-cfl-8700k fi-bsw-cyan fi-cfl-guc fi-kbl-guc fi-kbl-x1275 fi-cfl-8109u fi-kbl-8809g fi-bsw-kefka
Known issues
------------
Here are the changes found in Patchwork_22288 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@prime_vgem@basic-userptr:
- fi-pnv-d510: NOTRUN -> [SKIP][1] ([fdo#109271]) +57 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22288/fi-pnv-d510/igt@[email protected]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3@smem:
- {bat-rpls-1}: [INCOMPLETE][2] ([i915#4898]) -> [PASS][3]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11238/bat-rpls-1/igt@gem_exec_suspend@[email protected]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22288/bat-rpls-1/igt@gem_exec_suspend@[email protected]
* igt@i915_selftest@live@perf:
- {fi-tgl-dsi}: [DMESG-WARN][4] ([i915#2867]) -> [PASS][5] +16 similar issues
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11238/fi-tgl-dsi/igt@i915_selftest@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22288/fi-tgl-dsi/igt@i915_selftest@[email protected]
#### Warnings ####
* igt@i915_selftest@live@hangcheck:
- bat-dg1-6: [DMESG-FAIL][6] ([i915#4957]) -> [DMESG-FAIL][7] ([i915#4494] / [i915#4957])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11238/bat-dg1-6/igt@i915_selftest@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22288/bat-dg1-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
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1155]: https://gitlab.freedesktop.org/drm/intel/issues/1155
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4898]: https://gitlab.freedesktop.org/drm/intel/issues/4898
[i915#4957]: https://gitlab.freedesktop.org/drm/intel/issues/4957
Build changes
-------------
* Linux: CI_DRM_11238 -> Patchwork_22288
CI-20190529: 20190529
CI_DRM_11238: e141e36b2871c529379f7ec7d5d6ebae3137a51b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6347: 37ea4c86f97c0e05fcb6b04cff72ec927930536e @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22288: eceba9ce68898bc001ec05d1def1faa45833aa0d @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
eceba9ce6889 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_22288/index.html
Hi Jani,
This addresses the review comments, could you please take a look at thsi patch?
Manasi
Quoted 62 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.
v2: Reset vrr capable if status ==
connector_disconnected
v3: Use i915 and use boolvrr_capable(Jani Nikula)
v4: Movevrr_capableto after update modes call (Jani N) Remove the redundant comment (Jan N)Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +13
-4@@ -4455,6 +4455,12 @@ intel_dp_detect(struct drm_connector *connector,memset (&intel_dp->compliance,0 ,sizeof (intel_dp->compliance));memset (intel_dp->dsc_dpcd,0 ,sizeof (intel_dp->dsc_dpcd)); +/* Reset VRR Capable property */ +drm_dbg_kms (&dev_priv->drm,"[CONNECTOR:%d:%s] VRR capable: FALSE\n" , + connector->base.id, connector->name); +drm_connector_set_vrr_capable_property (connector, + false); +if (intel_dp->is_mst) { drm_dbg_kms(&dev_priv->drm, "MST device may have disappeared %d vs %d\n",@@ -4569,15 +4575,18 @@ 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 *i915 =to_i915 (connector->dev);int num_modes =0 ; edid = intel_connector->detect_edid;if (edid) { - num_modes =intel_connector_update_modes (connector, edid); +bool vrr_capable; -if (intel_vrr_is_capable (connector)) -drm_connector_set_vrr_capable_property (connector, - true); + num_modes =intel_connector_update_modes (connector, edid); + vrr_capable =intel_vrr_is_capable (connector); +drm_dbg_kms (&i915->drm,"[CONNECTOR:%d:%s] VRR capable: %s\n" , + connector->base.id, connector->name,yesno (vrr_capable)); +drm_connector_set_vrr_capable_property (connector, vrr_capable); }/* Also add fixed mode, which may or may not be present in EDID */ Signature · 1 line
2.19.1
Jani Nikula
Reviewed-byQuoted 3 lines · Manasi
Hi Jani,
This addresses the review comments, could you please take a look at thsi patch?
Sorry for the delay,
Quoted 66 lines
Manasi
Quoted 62 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.
v2: Reset vrr capable if status ==
connector_disconnected
v3: Use i915 and use boolvrr_capable(Jani Nikula)
v4: Movevrr_capableto after update modes call (Jani N) Remove the redundant comment (Jan N)Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +13
-4@@ -4455,6 +4455,12 @@ intel_dp_detect(struct drm_connector *connector,memset (&intel_dp->compliance,0 ,sizeof (intel_dp->compliance));memset (intel_dp->dsc_dpcd,0 ,sizeof (intel_dp->dsc_dpcd)); +/* Reset VRR Capable property */ +drm_dbg_kms (&dev_priv->drm,"[CONNECTOR:%d:%s] VRR capable: FALSE\n" , + connector->base.id, connector->name); +drm_connector_set_vrr_capable_property (connector, + false); +if (intel_dp->is_mst) { drm_dbg_kms(&dev_priv->drm, "MST device may have disappeared %d vs %d\n",@@ -4569,15 +4575,18 @@ 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 *i915 =to_i915 (connector->dev);int num_modes =0 ; edid = intel_connector->detect_edid;if (edid) { - num_modes =intel_connector_update_modes (connector, edid); +bool vrr_capable; -if (intel_vrr_is_capable (connector)) -drm_connector_set_vrr_capable_property (connector, - true); + num_modes =intel_connector_update_modes (connector, edid); + vrr_capable =intel_vrr_is_capable (connector); +drm_dbg_kms (&i915->drm,"[CONNECTOR:%d:%s] VRR capable: %s\n" , + connector->base.id, connector->name,yesno (vrr_capable)); +drm_connector_set_vrr_capable_property (connector, vrr_capable); }/* Also add fixed mode, which may or may not be present in EDID */ Signature · 1 line
2.19.1
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Quoted 8 lines · Jani Nikula
Quoted 3 lines · Manasi
Hi Jani,
This addresses the review comments, could you please take a look at thsi patch?
Sorry for the delay,
Reviewed-by Jani Nikula <[email protected]>
Thanks for the comments and review, pushed now to din
Regards
Manasi
Quoted 71 lines
Quoted 68 lines
Manasi
Quoted 62 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.
v2: Reset vrr capable if status ==
connector_disconnected
v3: Use i915 and use boolvrr_capable(Jani Nikula)
v4: Movevrr_capableto after update modes call (Jani N) Remove the redundant comment (Jan N)Cc Jani Nikula <[email protected]>Signed-off-by Manasi Navare <[email protected]>--- drivers/gpu/drm/i915/display/intel_dp.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_dp.c +13
-4@@ -4455,6 +4455,12 @@ intel_dp_detect(struct drm_connector *connector,memset (&intel_dp->compliance,0 ,sizeof (intel_dp->compliance));memset (intel_dp->dsc_dpcd,0 ,sizeof (intel_dp->dsc_dpcd)); +/* Reset VRR Capable property */ +drm_dbg_kms (&dev_priv->drm,"[CONNECTOR:%d:%s] VRR capable: FALSE\n" , + connector->base.id, connector->name); +drm_connector_set_vrr_capable_property (connector, + false); +if (intel_dp->is_mst) { drm_dbg_kms(&dev_priv->drm, "MST device may have disappeared %d vs %d\n",@@ -4569,15 +4575,18 @@ 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 *i915 =to_i915 (connector->dev);int num_modes =0 ; edid = intel_connector->detect_edid;if (edid) { - num_modes =intel_connector_update_modes (connector, edid); +bool vrr_capable; -if (intel_vrr_is_capable (connector)) -drm_connector_set_vrr_capable_property (connector, - true); + num_modes =intel_connector_update_modes (connector, edid); + vrr_capable =intel_vrr_is_capable (connector); +drm_dbg_kms (&i915->drm,"[CONNECTOR:%d:%s] VRR capable: %s\n" , + connector->base.id, connector->name,yesno (vrr_capable)); +drm_connector_set_vrr_capable_property (connector, vrr_capable); }/* Also add fixed mode, which may or may not be present in EDID */ Signature · 1 line
2.19.1Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center