File tree Expand file tree Collapse file tree 1 file changed +6
-4
lines changed
drivers/gpu/drm/amd/display/amdgpu_dm Expand file tree Collapse file tree 1 file changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -8204,6 +8204,12 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
8204
8204
if (acrtc_state -> abm_level != dm_old_crtc_state -> abm_level )
8205
8205
bundle -> stream_update .abm_level = & acrtc_state -> abm_level ;
8206
8206
8207
+ mutex_lock (& dm -> dc_lock );
8208
+ if ((acrtc_state -> update_type > UPDATE_TYPE_FAST ) &&
8209
+ acrtc_state -> stream -> link -> psr_settings .psr_allow_active )
8210
+ amdgpu_dm_psr_disable (acrtc_state -> stream );
8211
+ mutex_unlock (& dm -> dc_lock );
8212
+
8207
8213
/*
8208
8214
* If FreeSync state on the stream has changed then we need to
8209
8215
* re-adjust the min/max bounds now that DC doesn't handle this
@@ -8217,10 +8223,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
8217
8223
spin_unlock_irqrestore (& pcrtc -> dev -> event_lock , flags );
8218
8224
}
8219
8225
mutex_lock (& dm -> dc_lock );
8220
- if ((acrtc_state -> update_type > UPDATE_TYPE_FAST ) &&
8221
- acrtc_state -> stream -> link -> psr_settings .psr_allow_active )
8222
- amdgpu_dm_psr_disable (acrtc_state -> stream );
8223
-
8224
8226
update_planes_and_stream_adapter (dm -> dc ,
8225
8227
acrtc_state -> update_type ,
8226
8228
planes_count ,
You can’t perform that action at this time.
0 commit comments