From: Ville Syrjälä Date: Fri, 22 Jan 2021 23:26:37 +0000 (-0800) Subject: drm/i915/display: VRR + DRRS cannot be enabled together X-Git-Tag: xarray-5.12~281^2~10^2~19 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ac4acaed70cc66506af17b9b1f166ea9a31ea4ef;p=users%2Fwilly%2Fxarray.git drm/i915/display: VRR + DRRS cannot be enabled together If VRR is enabled, DRRS cannot be enabled, so make this check in atomic check. Signed-off-by: Manasi Navare Signed-off-by: Ville Syrjälä Reviewed-by: Manasi Navare Link: https://patchwork.freedesktop.org/patch/msgid/20210122232647.22688-8-manasi.d.navare@intel.com --- diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 6c1aaaf587c2..8c12d5375607 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1725,6 +1725,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,