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

modesetting: remove always true DRM_IOCTL_CRTC_QUEUE_SEQUENCE guard 

We already require libdrm 2.4.89 which provides the definition plus
guarding kernel UABI like that is generally a bad idea.

See previous commit for details why :-)

Cc: Keith Packard <keithp@keithp.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Emil Velikov 2018-03-07 18:45:32 +00:00 committed by Adam Jackson
parent f368428ab8
commit d2568c0587
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/drivers/modesetting/vblank.c
View File

@ -182,7 +182,6 @@ ms_get_kernel_ust_msc(xf86CrtcPtr crtc,
drmVBlank vbl; drmVBlank vbl;
int ret; int ret;
#ifdef DRM_IOCTL_CRTC_QUEUE_SEQUENCE
if (ms->has_queue_sequence || !ms->tried_queue_sequence) { if (ms->has_queue_sequence || !ms->tried_queue_sequence) {
uint64_t ns; uint64_t ns;
ms->tried_queue_sequence = TRUE; ms->tried_queue_sequence = TRUE;
@ -196,7 +195,6 @@ ms_get_kernel_ust_msc(xf86CrtcPtr crtc,
return ret == 0; return ret == 0;
} }
} }
#endif
/* Get current count */ /* Get current count */
vbl.request.type = DRM_VBLANK_RELATIVE | drmmode_crtc->vblank_pipe; vbl.request.type = DRM_VBLANK_RELATIVE | drmmode_crtc->vblank_pipe;
vbl.request.sequence = 0; vbl.request.sequence = 0;
@ -226,7 +224,6 @@ ms_queue_vblank(xf86CrtcPtr crtc, ms_queue_flag flags,
for (;;) { for (;;) {
/* Queue an event at the specified sequence */ /* Queue an event at the specified sequence */
#ifdef DRM_IOCTL_CRTC_QUEUE_SEQUENCE
if (ms->has_queue_sequence || !ms->tried_queue_sequence) { if (ms->has_queue_sequence || !ms->tried_queue_sequence) {
uint32_t drm_flags = 0; uint32_t drm_flags = 0;
uint64_t kernel; uint64_t kernel;
@ -255,7 +252,6 @@ ms_queue_vblank(xf86CrtcPtr crtc, ms_queue_flag flags,
goto check; goto check;
} }
} }
#endif
vbl.request.type = DRM_VBLANK_EVENT | drmmode_crtc->vblank_pipe; vbl.request.type = DRM_VBLANK_EVENT | drmmode_crtc->vblank_pipe;
if (flags & MS_QUEUE_RELATIVE) if (flags & MS_QUEUE_RELATIVE)
vbl.request.type |= DRM_VBLANK_RELATIVE; vbl.request.type |= DRM_VBLANK_RELATIVE;
@ -273,9 +269,7 @@ ms_queue_vblank(xf86CrtcPtr crtc, ms_queue_flag flags,
*msc_queued = ms_kernel_msc_to_crtc_msc(crtc, vbl.reply.sequence); *msc_queued = ms_kernel_msc_to_crtc_msc(crtc, vbl.reply.sequence);
return TRUE; return TRUE;
} }
#ifdef DRM_IOCTL_CRTC_QUEUE_SEQUENCE
check: check:
#endif
if (errno != EBUSY) { if (errno != EBUSY) {
ms_drm_abort_seq(scrn, seq); ms_drm_abort_seq(scrn, seq);
return FALSE; return FALSE;