From: Alex Deucher Date: Tue, 9 Feb 2021 20:13:55 +0000 (-0500) Subject: Revert "drm/amd/display: fix unused variable warning" X-Git-Tag: baikal/aarch64/sdk6.1~7223^2~1^2~59 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=8006bd6ab029450e046870041ab37b290e9c9f49;p=kernel.git Revert "drm/amd/display: fix unused variable warning" This reverts commit 20e4e271a4328496f532c123c8b27c35707cbe81. Bhawan's fix is better (less ifdefs), so revert this and apply Bhawan's. 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 67fd9f4ef93e8..f47551c9b2f15 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -5374,9 +5374,7 @@ static inline int dm_set_vblank(struct drm_crtc *crtc, bool enable) struct amdgpu_crtc *acrtc = to_amdgpu_crtc(crtc); struct amdgpu_device *adev = drm_to_adev(crtc->dev); struct dm_crtc_state *acrtc_state = to_dm_crtc_state(crtc->state); -#if defined(CONFIG_DRM_AMD_DC_DCN) struct amdgpu_display_manager *dm = &adev->dm; -#endif int rc = 0; if (enable) {