Attachment 139311 Details for Bug 106372 – Disable new code

[patch] Disable new code

xserver-disable-queue-sequence.diff (text/plain), 1.58 KB, created by Michel Dänzer on 2018-05-03 15:02:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2018-05-03 15:02:38 UTC

Size: 1.58 KB

patch

obsolete

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

Actions: View | Splinter Review

Attachments on bug 106372: 139302 | 139311

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.