tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Roman Li <Roman.Li@amd.com>
Acked-by: Wayne Lin <wayne.lin@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Nicholas Kazlauskas and committed by
Alex Deucher 96160687 f586fea8

+4
+4
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
··· 8643 8643 /* Update the planes if changed or disable if we don't have any. */ 8644 8644 if ((planes_count || acrtc_state->active_planes == 0) && 8645 8645 acrtc_state->stream) { 8646 + #if defined(CONFIG_DRM_AMD_DC_DCN) 8646 8647 /* 8647 8648 * If PSR or idle optimizations are enabled then flush out 8648 8649 * any pending work before hardware programming. 8649 8650 */ 8650 8651 flush_workqueue(dm->vblank_control_workqueue); 8652 + #endif 8651 8653 8652 8654 bundle->stream_update.stream = acrtc_state->stream; 8653 8655 if (new_pcrtc_state->mode_changed) { ··· 8982 8980 if (dc_state) { 8983 8981 /* if there mode set or reset, disable eDP PSR */ 8984 8982 if (mode_set_reset_required) { 8983 + #if defined(CONFIG_DRM_AMD_DC_DCN) 8985 8984 flush_workqueue(dm->vblank_control_workqueue); 8985 + #endif 8986 8986 amdgpu_dm_psr_disable_all(dm); 8987 8987 } 8988 8988