diff mbox series

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

Message ID 20220223221453.26274-1-manasi.d.navare@intel.com (mailing list archive)
State New, archived
Headers show
Series [v5] drm/i915/display/vrr: Reset VRR capable property on a long hpd | expand

Commit Message

Navare, Manasi Feb. 23, 2022, 10:14 p.m. UTC
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)
v5: Fixes the regression on older platforms by reseting the VRR
only if HAS_VRR

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Fixes: 390a1f8beb87 ("Revert "drm/i915/display/vrr: Reset VRR capable property on a long hpd")
Signed-off-by: Manasi Navare <manasi.d.navare@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

Comments

Navare, Manasi Feb. 24, 2022, 7 p.m. UTC | #1
Hi,

I fixed the regression in this patch and resent it, it still has BAT failures, I wanted to understand if it failed to boot some of the machines again or the errors flagged here are the known errors.

Regards
Manasi

From: Patchwork <patchwork@emeril.freedesktop.org>
Sent: Thursday, February 24, 2022 10:45 AM
To: Navare, Manasi D <manasi.d.navare@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: ✗ Fi.CI.BAT: failure for drm/i915/display/vrr: Reset VRR capable property on a long hpd (rev4)

Patch Details
Series:

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

URL:

https://patchwork.freedesktop.org/series/98801/

State:

failure

Details:

https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/index.html

CI Bug Log - changes from CI_DRM_11279 -> Patchwork_22394
Summary

FAILURE

Serious unknown changes coming with Patchwork_22394 absolutely need to be
verified manually.

If you think the reported changes have nothing to do with the changes
introduced in Patchwork_22394, 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_22394/index.html

Participating hosts (43 -> 32)

Missing (11): fi-kbl-soraka fi-cml-u2 fi-bsw-cyan fi-ilk-650 fi-apl-guc fi-kbl-7500u fi-kbl-x1275 fi-cfl-8109u fi-bsw-kefka fi-bdw-samus fi-skl-6600u

Possible new issues

Here are the unknown changes that may have been introduced in Patchwork_22394:

IGT changes
Possible regressions

  *   igt@gem_exec_suspend@basic-s0@smem:
     *   fi-skl-6700k2: PASS<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11279/fi-skl-6700k2/igt@gem_exec_suspend@basic-s0@smem.html> -> DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-skl-6700k2/igt@gem_exec_suspend@basic-s0@smem.html>

Known issues

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

IGT changes
Issues hit

  *   igt@amdgpu/amd_basic@cs-multi-fence:
     *   fi-blb-e6850: NOTRUN -> SKIP<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-blb-e6850/igt@amdgpu/amd_basic@cs-multi-fence.html> (fdo#109271<https://bugs.freedesktop.org/show_bug.cgi?id=109271>) +17 similar issues
  *   igt@runner@aborted:
     *   fi-skl-6700k2: NOTRUN -> FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-skl-6700k2/igt@runner@aborted.html> (i915#4312<https://gitlab.freedesktop.org/drm/intel/issues/4312>)

Possible fixes

  *   igt@i915_selftest@live@hangcheck:
     *   bat-dg1-6: DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11279/bat-dg1-6/igt@i915_selftest@live@hangcheck.html> (i915#4494<https://gitlab.freedesktop.org/drm/intel/issues/4494> / i915#4957<https://gitlab.freedesktop.org/drm/intel/issues/4957>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/bat-dg1-6/igt@i915_selftest@live@hangcheck.html>
  *   igt@i915_selftest@live@requests:
     *   fi-blb-e6850: DMESG-FAIL<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11279/fi-blb-e6850/igt@i915_selftest@live@requests.html> (i915#5026<https://gitlab.freedesktop.org/drm/intel/issues/5026>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-blb-e6850/igt@i915_selftest@live@requests.html>
  *   igt@i915_selftest@live@workarounds:
     *   {bat-adlp-6}: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11279/bat-adlp-6/igt@i915_selftest@live@workarounds.html> (i915#5068<https://gitlab.freedesktop.org/drm/intel/issues/5068>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/bat-adlp-6/igt@i915_selftest@live@workarounds.html>
  *   igt@kms_flip@basic-flip-vs-modeset@a-edp1:
     *   {bat-adlp-6}: DMESG-WARN<https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11279/bat-adlp-6/igt@kms_flip@basic-flip-vs-modeset@a-edp1.html> (i915#3576<https://gitlab.freedesktop.org/drm/intel/issues/3576>) -> PASS<https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/bat-adlp-6/igt@kms_flip@basic-flip-vs-modeset@a-edp1.html>

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

Build changes

  *   Linux: CI_DRM_11279 -> Patchwork_22394

CI-20190529: 20190529
CI_DRM_11279: 5301cc85b3cc0eaa37405a117c77a35db7f4a76d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6356: b403d8e73c6888561eaec97835688313b0763ce9 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22394: 244f36e5190c176be3ec2fbc9fc18c63b8383621 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

244f36e5190c drm/i915/display/vrr: Reset VRR capable property on a long hpd
Saarinen, Jani Feb. 24, 2022, 7:56 p.m. UTC | #2
Hi, 
> -----Original Message-----
> From: Navare, Manasi D <manasi.d.navare@intel.com>
> Sent: torstai 24. helmikuuta 2022 21.00
> To: intel-gfx@lists.freedesktop.org
> Cc: Sarvela, Tomi P <tomi.p.sarvela@intel.com>; Syrjala, Ville
> <ville.syrjala@intel.com>; Saarinen, Jani <jani.saarinen@intel.com>; Nikula, Jani
> <jani.nikula@intel.com>
> Subject: RE: ✗ Fi.CI.BAT: failure for drm/i915/display/vrr: Reset VRR capable
> property on a long hpd (rev4)
> 
> Hi,
> 
> 
> 
> I fixed the regression in this patch and resent it, it still has BAT failures, I wanted
> to understand if it failed to boot some of the machines again or the errors flagged
> here are the known errors.
> 
> 
> 
> Regards
> 
> Manasi
> 
> 
> 
> From: Patchwork <patchwork@emeril.freedesktop.org>
> Sent: Thursday, February 24, 2022 10:45 AM
> To: Navare, Manasi D <manasi.d.navare@intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Subject: ✗ Fi.CI.BAT: failure for drm/i915/display/vrr: Reset VRR capable property
> on a long hpd (rev4)
> 
> 
> 
> Patch Details
> 
> Series:
> 
> drm/i915/display/vrr: Reset VRR capable property on a long hpd (rev4)
> 
> URL:
> 
> https://patchwork.freedesktop.org/series/98801/
> 
> State:
> 
> failure
> 
> Details:
> 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/index.html
> 
> 
> CI Bug Log - changes from CI_DRM_11279 -> Patchwork_22394
> 
> 
> Summary
> 
> 
> FAILURE
> 
> Serious unknown changes coming with Patchwork_22394 absolutely need to be
> verified manually.
> 
> If you think the reported changes have nothing to do with the changes
> introduced in Patchwork_22394, 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_22394/index.html
> 
> 
> Participating hosts (43 -> 32)
> 
> 
> Missing (11): fi-kbl-soraka fi-cml-u2 fi-bsw-cyan fi-ilk-650 fi-apl-guc fi-kbl-7500u fi-
> kbl-x1275 fi-cfl-8109u fi-bsw-kefka fi-bdw-samus fi-skl-6600u
Would be good to understand why there is this many systems down still. Also are these same than on previous series...
Previous was missing:
--
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
--
So there are same systems. Tomi, what is threshold how many systems need to have boot issues and having 
Just looking some same systems on both...:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/filelist.html 
eg. https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-kbl-soraka/run0.txt 
and https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-kbl-7500u/run0.txt , there is also oops https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-kbl-7500u/pstore0-1645726566_Oops_1.txt 
I would say not clean really yet....


> 
> 
> Possible new issues
> 
> 
> Here are the unknown changes that may have been introduced in
> Patchwork_22394:
> 
> 
> IGT changes
> 
> 
> Possible regressions
> 
> 
> *	igt@gem_exec_suspend@basic-s0@smem:
> 
> 	*	fi-skl-6700k2: PASS <https://intel-gfx-ci.01.org/tree/drm-
> tip/CI_DRM_11279/fi-skl-6700k2/igt@gem_exec_suspend@basic-
> s0@smem.html>  -> DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-
> tip/Patchwork_22394/fi-skl-6700k2/igt@gem_exec_suspend@basic-
> s0@smem.html>
> 
> 
> Known issues
> 
> 
> Here are the changes found in Patchwork_22394 that come from known issues:
> 
> 
> IGT changes
> 
> 
> Issues hit
> 
> 
> *	igt@amdgpu/amd_basic@cs-multi-fence:
> 
> 	*	fi-blb-e6850: NOTRUN -> SKIP <https://intel-gfx-
> ci.01.org/tree/drm-tip/Patchwork_22394/fi-blb-
> e6850/igt@amdgpu/amd_basic@cs-multi-fence.html>  (fdo#109271
> <https://bugs.freedesktop.org/show_bug.cgi?id=109271> ) +17 similar issues
> 
> *	igt@runner@aborted:
> 
> 	*	fi-skl-6700k2: NOTRUN -> FAIL <https://intel-gfx-
> ci.01.org/tree/drm-tip/Patchwork_22394/fi-skl-
> 6700k2/igt@runner@aborted.html>  (i915#4312
> <https://gitlab.freedesktop.org/drm/intel/issues/4312> )
> 
> 
> Possible fixes
> 
> 
> *	igt@i915_selftest@live@hangcheck:
> 
> 	*	bat-dg1-6: DMESG-FAIL <https://intel-gfx-ci.01.org/tree/drm-
> tip/CI_DRM_11279/bat-dg1-6/igt@i915_selftest@live@hangcheck.html>
> (i915#4494 <https://gitlab.freedesktop.org/drm/intel/issues/4494>  / i915#4957
> <https://gitlab.freedesktop.org/drm/intel/issues/4957> ) -> PASS <https://intel-
> gfx-ci.01.org/tree/drm-tip/Patchwork_22394/bat-dg1-
> 6/igt@i915_selftest@live@hangcheck.html>
> 
> *	igt@i915_selftest@live@requests:
> 
> 	*	fi-blb-e6850: DMESG-FAIL <https://intel-gfx-ci.01.org/tree/drm-
> tip/CI_DRM_11279/fi-blb-e6850/igt@i915_selftest@live@requests.html>
> (i915#5026 <https://gitlab.freedesktop.org/drm/intel/issues/5026> ) -> PASS
> <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-blb-
> e6850/igt@i915_selftest@live@requests.html>
> 
> *	igt@i915_selftest@live@workarounds:
> 
> 	*	{bat-adlp-6}: DMESG-WARN <https://intel-gfx-
> ci.01.org/tree/drm-tip/CI_DRM_11279/bat-adlp-
> 6/igt@i915_selftest@live@workarounds.html>  (i915#5068
> <https://gitlab.freedesktop.org/drm/intel/issues/5068> ) -> PASS <https://intel-
> gfx-ci.01.org/tree/drm-tip/Patchwork_22394/bat-adlp-
> 6/igt@i915_selftest@live@workarounds.html>
> 
> *	igt@kms_flip@basic-flip-vs-modeset@a-edp1:
> 
> 	*	{bat-adlp-6}: DMESG-WARN <https://intel-gfx-
> ci.01.org/tree/drm-tip/CI_DRM_11279/bat-adlp-6/igt@kms_flip@basic-flip-vs-
> modeset@a-edp1.html>  (i915#3576
> <https://gitlab.freedesktop.org/drm/intel/issues/3576> ) -> PASS <https://intel-
> gfx-ci.01.org/tree/drm-tip/Patchwork_22394/bat-adlp-6/igt@kms_flip@basic-
> flip-vs-modeset@a-edp1.html>
> 
> {name}: This element is suppressed. This means it is ignored when computing the
> status of the difference (SUCCESS, WARNING, or FAILURE).
> 
> 
> Build changes
> 
> 
> *	Linux: CI_DRM_11279 -> Patchwork_22394
> 
> CI-20190529: 20190529
> CI_DRM_11279: 5301cc85b3cc0eaa37405a117c77a35db7f4a76d @
> git://anongit.freedesktop.org/gfx-ci/linux
> IGT_6356: b403d8e73c6888561eaec97835688313b0763ce9 @
> https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
> Patchwork_22394: 244f36e5190c176be3ec2fbc9fc18c63b8383621 @
> git://anongit.freedesktop.org/gfx-ci/linux
> 
> == Linux commits ==
> 
> 244f36e5190c drm/i915/display/vrr: Reset VRR capable property on a long hpd
Sarvela, Tomi P Feb. 25, 2022, 8:36 a.m. UTC | #3
> From: Saarinen, Jani <jani.saarinen@intel.com>
> > From: Navare, Manasi D <manasi.d.navare@intel.com>
> > Subject: RE: ✗ Fi.CI.BAT: failure for drm/i915/display/vrr: Reset VRR
> capable
> > property on a long hpd (rev4)
> >
> > Hi,
> >
> >
> >
> > I fixed the regression in this patch and resent it, it still has BAT failures, I
> wanted
> > to understand if it failed to boot some of the machines again or the errors
> flagged
> > here are the known errors.
> >
> >
> >
> > Regards
> >
> > Manasi
> >
> >
> >
> > From: Patchwork <patchwork@emeril.freedesktop.org>
> > Sent: Thursday, February 24, 2022 10:45 AM
> > To: Navare, Manasi D <manasi.d.navare@intel.com>
> > Cc: intel-gfx@lists.freedesktop.org
> > Subject: ✗ Fi.CI.BAT: failure for drm/i915/display/vrr: Reset VRR capable
> property
> > on a long hpd (rev4)
> >
> >
> >
> > Patch Details
> >
> > Series:
> >
> > drm/i915/display/vrr: Reset VRR capable property on a long hpd (rev4)
> >
> > URL:
> >
> > https://patchwork.freedesktop.org/series/98801/
> >
> > State:
> >
> > failure
> >
> > Details:
> >
> > https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/index.html
> >
> >
> > CI Bug Log - changes from CI_DRM_11279 -> Patchwork_22394
> >
> >
> > Summary
> >
> >
> > FAILURE
> >
> > Serious unknown changes coming with Patchwork_22394 absolutely need
> to be
> > verified manually.
> >
> > If you think the reported changes have nothing to do with the changes
> > introduced in Patchwork_22394, 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_22394/index.html
> >
> >
> > Participating hosts (43 -> 32)
> >
> >
> > Missing (11): fi-kbl-soraka fi-cml-u2 fi-bsw-cyan fi-ilk-650 fi-apl-guc fi-kbl-
> 7500u fi-
> > kbl-x1275 fi-cfl-8109u fi-bsw-kefka fi-bdw-samus fi-skl-6600u
> Would be good to understand why there is this many systems down still. Also
> are these same than on previous series...
> Previous was missing:
> --
> 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
> --
> So there are same systems. Tomi, what is threshold how many systems need
> to have boot issues and having
> Just looking some same systems on both...:
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/filelist.html
> eg. https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-kbl-
> soraka/run0.txt
> and https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-kbl-
> 7500u/run0.txt , there is also oops https://intel-gfx-ci.01.org/tree/drm-
> tip/Patchwork_22394/fi-kbl-7500u/pstore0-1645726566_Oops_1.txt
> I would say not clean really yet....

The threshold is 50% of hosts. Couple of those now missing are problem
children, but there's also some that should not be down.

Please re-test the series, and if the result looks the same, then there
is probably real issue with the patch.

Tomi


> 
> 
> >
> >
> > Possible new issues
> >
> >
> > Here are the unknown changes that may have been introduced in
> > Patchwork_22394:
> >
> >
> > IGT changes
> >
> >
> > Possible regressions
> >
> >
> > *	igt@gem_exec_suspend@basic-s0@smem:
> >
> > 	*	fi-skl-6700k2: PASS <https://intel-gfx-
> ci.01.org/tree/drm-
> > tip/CI_DRM_11279/fi-skl-6700k2/igt@gem_exec_suspend@basic-
> > s0@smem.html>  -> DMESG-WARN <https://intel-gfx-ci.01.org/tree/drm-
> > tip/Patchwork_22394/fi-skl-6700k2/igt@gem_exec_suspend@basic-
> > s0@smem.html>
> >
> >
> > Known issues
> >
> >
> > Here are the changes found in Patchwork_22394 that come from known
> issues:
> >
> >
> > IGT changes
> >
> >
> > Issues hit
> >
> >
> > *	igt@amdgpu/amd_basic@cs-multi-fence:
> >
> > 	*	fi-blb-e6850: NOTRUN -> SKIP <https://intel-gfx-
> > ci.01.org/tree/drm-tip/Patchwork_22394/fi-blb-
> > e6850/igt@amdgpu/amd_basic@cs-multi-fence.html>  (fdo#109271
> > <https://bugs.freedesktop.org/show_bug.cgi?id=109271> ) +17 similar
> issues
> >
> > *	igt@runner@aborted:
> >
> > 	*	fi-skl-6700k2: NOTRUN -> FAIL <https://intel-
> gfx-
> > ci.01.org/tree/drm-tip/Patchwork_22394/fi-skl-
> > 6700k2/igt@runner@aborted.html>  (i915#4312
> > <https://gitlab.freedesktop.org/drm/intel/issues/4312> )
> >
> >
> > Possible fixes
> >
> >
> > *	igt@i915_selftest@live@hangcheck:
> >
> > 	*	bat-dg1-6: DMESG-FAIL <https://intel-gfx-
> ci.01.org/tree/drm-
> > tip/CI_DRM_11279/bat-dg1-6/igt@i915_selftest@live@hangcheck.html>
> > (i915#4494 <https://gitlab.freedesktop.org/drm/intel/issues/4494>  /
> i915#4957
> > <https://gitlab.freedesktop.org/drm/intel/issues/4957> ) -> PASS
> <https://intel-
> > gfx-ci.01.org/tree/drm-tip/Patchwork_22394/bat-dg1-
> > 6/igt@i915_selftest@live@hangcheck.html>
> >
> > *	igt@i915_selftest@live@requests:
> >
> > 	*	fi-blb-e6850: DMESG-FAIL <https://intel-gfx-
> ci.01.org/tree/drm-
> > tip/CI_DRM_11279/fi-blb-e6850/igt@i915_selftest@live@requests.html>
> > (i915#5026 <https://gitlab.freedesktop.org/drm/intel/issues/5026> ) ->
> PASS
> > <https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22394/fi-blb-
> > e6850/igt@i915_selftest@live@requests.html>
> >
> > *	igt@i915_selftest@live@workarounds:
> >
> > 	*	{bat-adlp-6}: DMESG-WARN <https://intel-gfx-
> > ci.01.org/tree/drm-tip/CI_DRM_11279/bat-adlp-
> > 6/igt@i915_selftest@live@workarounds.html>  (i915#5068
> > <https://gitlab.freedesktop.org/drm/intel/issues/5068> ) -> PASS
> <https://intel-
> > gfx-ci.01.org/tree/drm-tip/Patchwork_22394/bat-adlp-
> > 6/igt@i915_selftest@live@workarounds.html>
> >
> > *	igt@kms_flip@basic-flip-vs-modeset@a-edp1:
> >
> > 	*	{bat-adlp-6}: DMESG-WARN <https://intel-gfx-
> > ci.01.org/tree/drm-tip/CI_DRM_11279/bat-adlp-6/igt@kms_flip@basic-
> flip-vs-
> > modeset@a-edp1.html>  (i915#3576
> > <https://gitlab.freedesktop.org/drm/intel/issues/3576> ) -> PASS
> <https://intel-
> > gfx-ci.01.org/tree/drm-tip/Patchwork_22394/bat-adlp-
> 6/igt@kms_flip@basic-
> > flip-vs-modeset@a-edp1.html>
> >
> > {name}: This element is suppressed. This means it is ignored when
> computing the
> > status of the difference (SUCCESS, WARNING, or FAILURE).
> >
> >
> > Build changes
> >
> >
> > *	Linux: CI_DRM_11279 -> Patchwork_22394
> >
> > CI-20190529: 20190529
> > CI_DRM_11279: 5301cc85b3cc0eaa37405a117c77a35db7f4a76d @
> > git://anongit.freedesktop.org/gfx-ci/linux
> > IGT_6356: b403d8e73c6888561eaec97835688313b0763ce9 @
> > https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
> > Patchwork_22394: 244f36e5190c176be3ec2fbc9fc18c63b8383621 @
> > git://anongit.freedesktop.org/gfx-ci/linux
> >
> > == Linux commits ==
> >
> > 244f36e5190c drm/i915/display/vrr: Reset VRR capable property on a long
> hpd
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 1046e7fe310a..4656c7316efa 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -4455,6 +4455,14 @@  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 */
+		if (HAS_VRR(dev_priv)) {
+			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 +4577,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 */