diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2021-01-23 00:26:37 +0100 |
|---|---|---|
| committer | Manasi Navare <manasi.d.navare@intel.com> | 2021-01-26 00:22:59 +0100 |
| commit | ac4acaed70cc66506af17b9b1f166ea9a31ea4ef (patch) | |
| tree | 1c931600163d7d6df941c51cb22d037c598b9702 /drivers/gpu/drm/i915/display | |
| parent | drm/i915/display/dp: Do not enable PSR if VRR is enabled (diff) | |
| download | linux-ac4acaed70cc66506af17b9b1f166ea9a31ea4ef.tar.xz linux-ac4acaed70cc66506af17b9b1f166ea9a31ea4ef.zip | |
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 <manasi.d.navare@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210122232647.22688-8-manasi.d.navare@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c | 3 |
1 files changed, 3 insertions, 0 deletions
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, |