frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Daniel Martin 2015-10-29 14:58:11 +01:00 committed by Adam Jackson
parent 45c83a266d
commit 7d1e478385
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -462,11 +462,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
crtc->y = saved_y; crtc->y = saved_y;
crtc->rotation = saved_rotation; crtc->rotation = saved_rotation;
crtc->mode = saved_mode; crtc->mode = saved_mode;
} } else
#if defined(XF86_CRTC_VERSION) && XF86_CRTC_VERSION >= 3
else
crtc->active = TRUE; crtc->active = TRUE;
#endif
free(output_ids); free(output_ids);
@ -1789,9 +1786,7 @@ drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
drmmode_clones_init(pScrn, drmmode, mode_res); drmmode_clones_init(pScrn, drmmode, mode_res);
drmModeFreeResources(mode_res); drmModeFreeResources(mode_res);
#if XF86_CRTC_VERSION >= 5
xf86ProviderSetup(pScrn, NULL, "modesetting"); xf86ProviderSetup(pScrn, NULL, "modesetting");
#endif
xf86InitialConfiguration(pScrn, TRUE); xf86InitialConfiguration(pScrn, TRUE);