From: Alex Deucher Date: Fri, 8 Jan 2021 16:32:11 +0000 (-0500) Subject: drm/amdgpu/display: fix build with CONFIG_DRM_AMD_DC_DCN disabled X-Git-Tag: v5.12-rc1~132^2~18^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4928b480cbed50da28eba06bff7eec6a274a3914;p=thirdparty%2Fkernel%2Flinux.git drm/amdgpu/display: fix build with CONFIG_DRM_AMD_DC_DCN disabled dc_allow_idle_optimizations() needs to be protected by CONFIG_DRM_AMD_DC_DCN. Fixes: 71338cb4a7c2 ("drm/amd/display: enable idle optimizations for linux (MALL stutter)") Reviewed-by: Nicholas Kazlauskas Reported-by: Stephen Rothwell Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 318eb12f8de73..2dc8493793e08 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5490,10 +5490,12 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable) else dm->active_vblank_irq_count--; +#if defined(CONFIG_DRM_AMD_DC_DCN) dc_allow_idle_optimizations( adev->dm.dc, dm->active_vblank_irq_count == 0 ? true : false); DRM_DEBUG_DRIVER("Allow idle optimizations (MALL): %d\n", dm->active_vblank_irq_count == 0); +#endif mutex_unlock(&dm->dc_lock);