Commit 96160687 authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher
Browse files

drm/amd/display: Guard vblank wq flush with DCN guards 



[Why]
Compilation of the workqueue fails if not building with the DCN config
option set.

[How]
Guard calls to the flush with the DCN config option to fix the build.

Reviewed-by: default avatarRoman Li <Roman.Li@amd.com>
Acked-by: default avatarWayne Lin <wayne.lin@amd.com>
Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f586fea8

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+4 −0
Original line number Diff line number Diff line
@@ -8643,11 +8643,13 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
	/* Update the planes if changed or disable if we don't have any. */

	if ((planes_count || acrtc_state->active_planes == 0) &&

		acrtc_state->stream) {

#if defined(CONFIG_DRM_AMD_DC_DCN)

		/*

		 * If PSR or idle optimizations are enabled then flush out

		 * any pending work before hardware programming.

		 */

		flush_workqueue(dm->vblank_control_workqueue);

#endif



		bundle->stream_update.stream = acrtc_state->stream;

		if (new_pcrtc_state->mode_changed) {
@@ -8980,7 +8982,9 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
	if (dc_state) {

		/* if there mode set or reset, disable eDP PSR */

		if (mode_set_reset_required) {

#if defined(CONFIG_DRM_AMD_DC_DCN)

			flush_workqueue(dm->vblank_control_workqueue);

#endif

			amdgpu_dm_psr_disable_all(dm);

		}