[Intel-gfx] [PATCH v3] drm/i915/display/vrr: Reset VRR capable property on a long hpd

[Navare, Manasi]

On Fri, Feb 18, 2022 at 10:36:00AM +0200, Jani Nikula wrote:
> On Thu, 17 Feb 2022, "Navare, Manasi" <manasi.d.navare at intel.com> wrote:
> > Hi Jani,
> >
> > This addresses the review comments, could you please take a look at thsi patch?
> 
> Sorry for the delay,
> 
> Reviewed-by: Jani Nikula <jani.nikula at intel.com>

Thanks for the comments and review, pushed now to din

Regards
Manasi

> 
> 
> >
> > Manasi
> >
> > On Tue, Feb 15, 2022 at 12:26:01PM -0800, Manasi Navare wrote:
> >> 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)
> >> 
> >> Cc: Jani Nikula <jani.nikula at intel.com>
> >> Signed-off-by: Manasi Navare <manasi.d.navare at intel.com>
> >> ---
> >>  drivers/gpu/drm/i915/display/intel_dp.c | 17 +++++++++++++----
> >>  1 file changed, 13 insertions(+), 4 deletions(-)
> >> 
> >> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
> >> index 1046e7fe310a..929e9b6febf1 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> >> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> >> @@ -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 */
> >> -- 
> >> 2.19.1
> >> 
> 
> -- 
> Jani Nikula, Intel Open Source Graphics Center