[Intel-gfx] [PATCH] drm/i915: Disable DRRS when PSR is enabled

[Sripada, Radhakrishna]

> -----Original Message-----
> From: Vivi, Rodrigo
> Sent: Wednesday, August 30, 2017 5:59 PM
> To: Sripada, Radhakrishna <radhakrishna.sripada at intel.com>
> Cc: intel-gfx at lists.freedesktop.org; Pandiyan, Dhinakaran
> <dhinakaran.pandiyan at intel.com>; Nikula, Jani <jani.nikula at intel.com>;
> Taylor, Clinton A <clinton.a.taylor at intel.com>; nicholas.stommel at gmail.com
> Subject: Re: [PATCH] drm/i915: Disable DRRS when PSR is enabled
> 
> On Wed, 2017-08-30 at 17:32 -0700, Radhakrishna Sripada wrote:
> > Some platforms donot support PSR and DRRS simultaneously. Deferring to
> > PSR when both PSR and DRRS are supported by the panel.
> >
> > Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=101111
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101111
> 
> "Fixes: <commit>" is only used to -fixes cherry-picks. Not a case for this
> patch.
Got it. Will update in the next revision of the patch.
> 
> > Cc: Nicholas Stommel <nicholas.stommel at gmail.com>
> > Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan at intel.com>
> > Cc: Jani Nikula <jani.nikula at intel.com>
> > Cc: Clinton Taylor <clinton.a.taylor at intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada at intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_dp.c | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c
> > b/drivers/gpu/drm/i915/intel_dp.c index d3e5fdf0d2fa..dc7a6721e0dd
> > 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -5469,11 +5469,6 @@ static void intel_dp_set_drrs_state(struct
> drm_i915_private *dev_priv,
> >  		return;
> >  	}
> >
> > -	/*
> > -	 * FIXME: This needs proper synchronization with psr state for some
> > -	 * platforms that cannot have PSR and DRRS enabled at the same
> time.
> > -	 */
> > -
> >  	dig_port = dp_to_dig_port(intel_dp);
> >  	encoder = &dig_port->base;
> >  	intel_crtc = to_intel_crtc(encoder->base.crtc);
> > @@ -5557,6 +5552,11 @@ void intel_edp_drrs_enable(struct intel_dp
> *intel_dp,
> >  		return;
> >  	}
> >
> > +	if (dev_priv->psr.enabled != NULL) {
> 
> 	if (dev_priv->psr.enabled) {
> ?
This looks cleaner will use this in the follow up patch.
> 
> > +		DRM_DEBUG_KMS("PSR active. Disabling DRRS.\n");
> > +		return;
> > +	}
> > +
> >  	mutex_lock(&dev_priv->drrs.mutex);
> >  	if (WARN_ON(dev_priv->drrs.dp)) {
> >  		DRM_ERROR("DRRS already enabled\n");