[PATCH] drm/amdgpu/display: fix compilation when CONFIG_DRM_AMD_DC_DCN is not set

Alex Deucher alexdeucher at gmail.com
Tue Feb 23 15:22:39 UTC 2021


Missing some CONFIG_DRM_AMD_DC_DCN ifdefs.

Fixes: 9d99a805a9a0 ("drm/amd/display: Fix system hang after multiple hotplugs")
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Cc: Stephen Rothwell <sfr at canb.auug.org.au>
Cc: Qingqing Zhuo <qingqing.zhuo at amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++
 1 file changed, 2 insertions(+)

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 7a393eeae4b1..22443e696567 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -5457,12 +5457,14 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable)
 	if (amdgpu_in_reset(adev))
 		return 0;
 
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 	spin_lock_irqsave(&dm->vblank_lock, flags);
 	dm->vblank_workqueue->dm = dm;
 	dm->vblank_workqueue->otg_inst = acrtc->otg_inst;
 	dm->vblank_workqueue->enable = enable;
 	spin_unlock_irqrestore(&dm->vblank_lock, flags);
 	schedule_work(&dm->vblank_workqueue->mall_work);
+#endif
 
 	return 0;
 }
-- 
2.29.2



More information about the amd-gfx mailing list