summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2021-02-09 15:13:55 -0500
committerAlex Deucher <alexander.deucher@amd.com>2021-02-09 15:16:54 -0500
commit534e3ea6726674c8a8f16e74820a7188e54f710f (patch)
tree8396d017fae43a2c491e310e0254929e56d62e14 /drivers/gpu/drm/amd/display
parent4c3a3292730c56591472717d8c5c0faf74f6c6bb (diff)
downloadlinux-stable-534e3ea6726674c8a8f16e74820a7188e54f710f.tar.gz
linux-stable-534e3ea6726674c8a8f16e74820a7188e54f710f.tar.bz2
linux-stable-534e3ea6726674c8a8f16e74820a7188e54f710f.zip
Revert "drm/amd/display: fix unused variable warning"
This reverts commit 4c3a3292730c56591472717d8c5c0faf74f6c6bb. Bhawan's fix is better (less ifdefs), so revert this and apply Bhawan's. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display')
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c2
1 files changed, 0 insertions, 2 deletions
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 67fd9f4ef93e..f47551c9b2f1 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) {