Commit 7d1e4783 authored by Daniel Martin's avatar Daniel Martin Committed by Adam Jackson

modesetting: Remove XF86_CRTC_VERSION checks

The ifdef checks for XF86_CRTC_VERSION >= 3/5 are remnants from the
out-of-tree driver. Within the tree, we can rely on:
    xf86Crtc.h:#define XF86_CRTC_VERSION 6
Signed-off-by: 's avatarDaniel Martin <consume.noise@gmail.com>
Reviewed-by: Emil Velikov's avatarEmil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: 's avatarAlex Deucher <alexander.deucher@amd.com>
parent 45c83a26
......@@ -462,11 +462,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
crtc->y = saved_y;
crtc->rotation = saved_rotation;
crtc->mode = saved_mode;
}
#if defined(XF86_CRTC_VERSION) && XF86_CRTC_VERSION >= 3
else
} else
crtc->active = TRUE;
#endif
free(output_ids);
......@@ -1789,9 +1786,7 @@ drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
drmmode_clones_init(pScrn, drmmode, mode_res);
drmModeFreeResources(mode_res);
#if XF86_CRTC_VERSION >= 5
xf86ProviderSetup(pScrn, NULL, "modesetting");
#endif
xf86InitialConfiguration(pScrn, TRUE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment