File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed
drivers/gpu/drm/amd/display/amdgpu_dm Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -113,6 +113,7 @@ bool amdgpu_dm_crtc_vrr_active(const struct dm_crtc_state *dm_state)
113
113
*
114
114
* Panel Replay and PSR SU
115
115
* - Enable when:
116
+ * - VRR is disabled
116
117
* - vblank counter is disabled
117
118
* - entry is allowed: usermode demonstrates an adequate number of fast
118
119
* commits)
@@ -131,19 +132,20 @@ static void amdgpu_dm_crtc_set_panel_sr_feature(
131
132
bool is_sr_active = (link -> replay_settings .replay_allow_active ||
132
133
link -> psr_settings .psr_allow_active );
133
134
bool is_crc_window_active = false;
135
+ bool vrr_active = amdgpu_dm_crtc_vrr_active_irq (vblank_work -> acrtc );
134
136
135
137
#ifdef CONFIG_DRM_AMD_SECURE_DISPLAY
136
138
is_crc_window_active =
137
139
amdgpu_dm_crc_window_is_activated (& vblank_work -> acrtc -> base );
138
140
#endif
139
141
140
- if (link -> replay_settings .replay_feature_enabled &&
142
+ if (link -> replay_settings .replay_feature_enabled && ! vrr_active &&
141
143
allow_sr_entry && !is_sr_active && !is_crc_window_active ) {
142
144
amdgpu_dm_replay_enable (vblank_work -> stream , true);
143
145
} else if (vblank_enabled ) {
144
146
if (link -> psr_settings .psr_version < DC_PSR_VERSION_SU_1 && is_sr_active )
145
147
amdgpu_dm_psr_disable (vblank_work -> stream , false);
146
- } else if (link -> psr_settings .psr_feature_enabled &&
148
+ } else if (link -> psr_settings .psr_feature_enabled && ! vrr_active &&
147
149
allow_sr_entry && !is_sr_active && !is_crc_window_active ) {
148
150
149
151
struct amdgpu_dm_connector * aconn =
You can’t perform that action at this time.
0 commit comments