On Wed, Jan 13, 2021 at 02:09:25PM -0800, Manasi Navare wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > If VRR is enabled, DRRS cannot be enabled, so make this check > in atomic check. Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> if we want to keep this as a separete patch. > --- > drivers/gpu/drm/i915/display/intel_dp.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > index a275303c0c5c..869a9d291e1b 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -2845,6 +2845,9 @@ intel_dp_drrs_compute_config(struct intel_dp *intel_dp, > struct intel_connector *intel_connector = intel_dp->attached_connector; > struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); > > + if (pipe_config->vrr.enable) > + return; > + > /* > * DRRS and PSR can't be enable together, so giving preference to PSR > * as it allows more power-savings by complete shutting down display, > -- > 2.19.1 -- Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
