From acf26f3857cf921e14f736229ae77b01eda0d62c Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Sun, 8 Apr 2018 15:09:06 +0800 Subject: [PATCH 4026/4131] drm/amdkcl: [rhel6.9] fix for_each_oldnew_connector_in_state compile error Change-Id: I98b087e618f9b0a49c5bf9e9f8ba548f68aa9c0e Signed-off-by: Kevin Wang Reviewed-by: Le Ma --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 ++++++ 1 file changed, 6 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 4312d3b..f52e584 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -1626,7 +1626,13 @@ static int amdgpu_notify_freesync(struct drm_device *dev, void *data, goto fail; } +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && \ + !defined(OS_NAME_RHEL_7_5) + for_each_connector_in_state(state, connector, new_con_state, i) { + old_con_state = connector->state; +#else for_each_oldnew_connector_in_state(state, connector, old_con_state, new_con_state, i) { +#endif struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state); struct drm_crtc_state *new_crtc_state; struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc); -- 2.7.4