xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/drivers/modesetting/present.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 3ce05a44f3d9b114af936f39e3f44552c5bf2c43
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Thu Nov 26 14:39:32 2020 +0100

    modesetting: Fix build with DebugPresent() enabled
    
    By default, the macro DebugPresent() is a no-op but it can be enabled
    at build time for debugging purpose.
    
    However, doing so prevents the code to build because one debug statement
    tries to make use of a non-existent variable:
    
      present.c: In function ‘ms_present_queue_vblank’:
      present.c:147:18: error: ‘vbl’ undeclared (first use in this function)
        147 |                  vbl.request.sequence));
            |                  ^~~
      present.c:49:32: note: in definition of macro ‘DebugPresent’
        49 | #define DebugPresent(x) ErrorF x
           |                                ^
    
    Fix the build with DebugPresent() by removing the vbl variable from the
    debug message.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>

diff --git a/hw/xfree86/drivers/modesetting/present.c b/hw/xfree86/drivers/modesetting/present.c
index 6e5b58938..869a38c8e 100644
--- a/hw/xfree86/drivers/modesetting/present.c
+++ b/hw/xfree86/drivers/modesetting/present.c
@@ -142,9 +142,8 @@ ms_present_queue_vblank(RRCrtcPtr crtc,
     if (!ms_queue_vblank(xf86_crtc, MS_QUEUE_ABSOLUTE, msc, NULL, seq))
         return BadAlloc;
 
-    DebugPresent(("\t\tmq %lld seq %u msc %llu (hw msc %u)\n",
-                 (long long) event_id, seq, (long long) msc,
-                 vbl.request.sequence));
+    DebugPresent(("\t\tmq %lld seq %u msc %llu\n",
+                 (long long) event_id, seq, (long long) msc));
     return Success;
 }