1. 09 Sep, 2021 1 commit
    • Mario Kleiner's avatar
      modesetting: Add option for non-vsynced flips for "secondary" outputs. · 68f01c0f
      Mario Kleiner authored and Povilas Kanapickas's avatar Povilas Kanapickas committed
      Whenever an unredirected fullscreen window uses pageflipping for a
      DRI3/Present PresentPixmap() operation and the X-Screen has more than
      one active output, multiple crtc's need to execute pageflips. Only
      after the last flip has completed can the PresentPixmap operation
      as a whole complete.
      If a sync_flip is requested for the present, then the current
      implementation will synchronize each pageflip to the vblank of
      its associated crtc. This provides tear-free image presentation
      across all outputs, but introduces a different artifact, if not
      all outputs run at the same refresh rate with perfect synchrony:
      The slowest output throttles the presentation rate, and present
      completion is delayed to flip completion of the "latest" output
      to complete. This means degraded performance, e.g., a dual-display
      setup with a 144 Hz monitor and a 60 Hz monitor will always be
      throttled to at most 60 fps. It also means non-constant present
      rate if refresh cycles drift against each other, creating complex
      "beat patterns", tremors, stutters and periodic slowdowns - quite
      Such a scenario will be especially annoying if one uses multiple
      outputs in "mirror mode" aka "clone mode". One output will usually
      be the "production output" with the highest quality and fastest
      display attached, whereas a secondary mirror output just has a
      cheaper display for monitoring attached. Users care about perfect
      and perfectly timed tear-free presentation on the "production output",
      but cares less about quality on the secondary "mirror output". They
      are willing to trade quality on secondary outputs away in exchange
      for better presentation timing on the "production output".
      One example use case for such production + monitoring displays are
      neuroscience / medical science applications where one high quality
      display device is used to present visual animations to test subjects
      or patients in a fMRI scanner room (production display), whereas
      an operator monitors the same visual animations from a control room
      on a lower quality display. Presentation timing needs to be perfect,
      and animations high-speed and tear-free for the production display,
      whereas quality and timing don't matter for the monitoring display.
      This commit gives users the option to choose such a trade-off as
      It adds a new boolean option "AsyncFlipSecondaries" to the device section
      of xorg.conf. If this option is specified as true, then DRI3 pageflip
      behaviour changes as follows:
      1. The "reference crtc" for a windows PresentPixmap operation does a
         vblank synced flip, or a DRM_MODE_PAGE_FLIP_ASYNC non-synchronized
         flip, as requested by the caller, just as in the past. Typically
         flips will be requested to be vblank synchronized for tear-free
         presentation. The "reference crtc" is the one chosen by the caller
         to drive presentation timing (as specified by PresentPixmap()'s
         "target_msc", "divisor", "remainder" parameters and implemented by
         vblank events) and to deliver Present completion timestamps (msc
         and ust) extracted from its pageflip completion event.
      2. All other crtc's, which also page-flip in a multi-display configuration,
         will try to flip with DRM_MODE_PAGE_FLIP_ASYNC, ie. immediately and
         not synchronized to vblank. This allows the PresentPixmap operation
         to complete with little delay compared to a single-display present,
         especially if the different crtc's run at different video refresh
         rates or their refresh cycles are not perfectly synchronized, but
         drift against each other. The downside is potential tearing artifacts
         on all outputs apart from the one of the "reference crtc".
      Successfully tested on a AMD gpu with single-display, dual-display and
      triple-display setups, and with single-X-Screen as well as dual-X-Screen
      "ZaphodHeads" configurations.
      Please consider merging this commit for the upcoming server 1.21 branch.
      Signed-off-by: Mario Kleiner's avatarMario Kleiner <mario.kleiner.de@gmail.com>
  2. 07 Sep, 2021 3 commits
    • Ignacio Casal Quinteiro's avatar
      touchevents: set the screen pointer after checking the device is enabled · 1fd5dec1
      Ignacio Casal Quinteiro authored
      If the device is disabled the sprite is NULL so we get a seg fault
    • Povilas Kanapickas's avatar
      Drop DMX DDX · b3b81c8c
      Povilas Kanapickas authored
      It turns out xdmx currently crashes when any client attempts to use GL
      and it has been in such state for about 14 years. There was a patch to
      fix the problem [1] 4 years ago, but it never got merged. The last
      activity on any bugs referring to xdmx has been more than 4 years ago.
      Given such situation, I find it unlikely that anyone is still using xdmx
      and just having the code is a drain of resources.
      [1]: https://lists.x.org/archives/xorg-devel/2017-June/053919.html
      Signed-off-by: Povilas Kanapickas's avatarPovilas Kanapickas <povilas@radix.lt>
    • Mario Kleiner's avatar
      modesetting: Allow Present flips with mismatched stride on atomic drivers. · 8f8ebf87
      Mario Kleiner authored and Povilas Kanapickas's avatar Povilas Kanapickas committed
      When using DRI3+Present with PRIME render offload, sometimes there is
      a mismatch between the stride of the to-be-presented Pixmap and the
      frontbuffer. The current code would reject a pageflip present in this
      case if atomic modesetting is not enabled, ie. always, as atomic
      modesetting is disabled by default due to brokeness in the current
      Fullscreen presents without page flipping however trigger the copy
      path as fallback, which causes not only unreliable presentation timing
      and degraded performance, but also massive tearing artifacts due to
      rendering to the framebuffer without any hardware sync to vblank.
      Tearing is extra awful on modesetting-ddx because glamor afaics seems
      to use drawing of a textured triangle strip for the copy implementation,
      not a dedicated blitter engine. The rasterization pattern creates extra
      awful tearing artifacts.
      We can do better: According to a tip from Michel Daenzer (thanks!),
      at least atomic modesetting capable kms drivers should be able to
      reliably change scanout stride during a pageflip, even if atomic
      modesetting is not actually enabled for the modesetting client.
      This commit adds detection logic to find out if the underlying kms
      driver is atomic_modeset_capable, and if so, it no longer rejects
      page flip presents on mismatched stride between new Pixmap and
      We (ab)use a call to drmSetClientCap(ms->fd, DRM_CLIENT_CAP_ATOMIC, 0);
      for this purpose. The call itself has no practical effect, as it
      requests disabling atomic mode, although atomic mode is disabled by
      default. However, the return value of drmSetClientCap() tells us if the
      underlying kms driver is atomic modesetting capable: An atomic driver
      will return 0 for success. A legacy non-atomic driver will return a
      non-zero error code, either -EINVAL for early atomic Linux versions
      4.0 - 4.19 (or for non-atomic Linux 3.x and earlier), or -EOPNOTSUPP
      for Linux 4.20 and later.
      Testing on a MacBookPro 2017 with Intel Kabylake display server gpu +
      AMD Polaris11 as prime renderoffload gpu, X-Server master + Mesa 21.0.3
      show improvement from unbearable tearing to perfect, despite a stride
      mismatch between display gpu and Pixmap of 11776 Bytes vs. 11520
      Bytes. That this is correct behaviour was also confirmed by comparing the
      behaviour and .check_flip implementation of the patched modesetting-ddx
      against the current intel-ddx SNA Present implementation.
      Please consider merging this patch before the server-1.21 branch point.
      This patch could also be cherry-picked into the server 1.20 branch to
      fix the same limitation.
      Signed-off-by: Mario Kleiner's avatarMario Kleiner <mario.kleiner.de@gmail.com>
  3. 06 Sep, 2021 1 commit
  4. 01 Sep, 2021 2 commits
    • Mario Kleiner's avatar
      Revert "glamor: Enable modifier support for xfree86 too" · 7c63c582
      Mario Kleiner authored and Povilas Kanapickas's avatar Povilas Kanapickas committed
      This reverts commit 9b899941.
      Turns out that defaulting glamor_egl->dmabuf_capable = TRUE
      breaks kms page-flipping on various Mesa+Linux/DRM-KMS+hardware
      combos, resulting in broken presentation timing, degraded performance
      and awful tearing. E.g., my testing shows that X-Server master +
      Mesa 21.2 + Linux 5.3 on Intel Kabylake has broken pageflipping.
      Similar behaviour was observed in the past on RaspberryPi 4/400
      with VideoCore-6 by myself and others, and iirc by myself on some
      AMD gpu's, although my memories of the latter are a bit dim.
      Cfe. mesa/mesa#3601 and
      possibly !254
      for related problems.
      The reason for pageflip failure on the modesetting-ddx under
      DRI3/Present seems to be the following sequence:
      1. Atomic modesetting for the modesetting-ddx is broken and therefore
         both disabled by default in the modesetting-ddx itself and also
         force-disabled by the Linux kernel since quite a while. If the kernel
         detects drmSetClientCap(fd, DRM_CLIENT_CAP_ATOMIC, 1); from the
         X-Server, it will reject the request, as a countermeasure to all the
         past and current brokeness.
      2. Without DRM_CLIENT_CAP_ATOMIC we don't get the implied universal
         planes support (DRM_CLIENT_CAP_UNIVERSAL_PLANES).
      3. Without DRM_CLIENT_CAP_UNIVERSAL_PLANES, drmModeGetPlaneResources()
         will only return overlay planes, but not primary- or cursor planes.
      4. As modesetting-ddx drmmode_crtc_create_planes() function can only
         operate on primary planes, but can't get any from drmModeGetPlaneResources(),
         the drmmode_crtc_create_planes() mostly turns into a no-op, never
         executes populate_format_modifiers() and therefore the Linux kernels
         DRM-KMS driver is not ever queried for the list of scanout/pageflip
         capable DRM format modifiers. Iow. the drmmode_crtc->formats[i].modifiers
         list stays empty with zero drmmode_crtc->formats[i].num_modifiers.
      5. The list from step 4 provides the format+modifiers for intersection
         which would get returned by the X-Servers DRI3 backend as response to
         a xcb_dri3_get_supported_modifiers_window_modifiers() request. Given
         an empty list was returned in step 4, this will lead to return of an
         empty modifiers list by xcb_dri3_get_supported_modifiers_window_modifiers().
      6. Both Mesa's DRI3/Present OpenGL backbuffer allocation logic and iirc
         Mesa/Vulkan/WSI/X11's swapchain image allocation logic use the list
         from xcb_dri3_get_supported_modifiers_window_modifiers() for format+
         modifier selection for scanout/pageflip capable buffers. Cfe. Mesa's
         dri3_alloc_render_buffer() function.
         Due to the empty list, the Mesa code falls back to the format+modifiers
         reported by xcb_dri3_get_supported_modifiers_screen_modifiers()
         instead. This list contains all modifiers reported by GLAMOR as
         result of glamor_get_formats() and glamor_get_modifiers(), which
         in turn are query results from Mesa eglQueryDmaBufFormatsEXT()
         and eglQueryDmaBufModifiersEXT(). Iow. all format+modifiers which
         are supported for rendering are considered for the OpenGL backbuffers
         and Vulkan swapchain buffers.
      7. Depending on kms driver + gpu combo and Mesa version, such buffers
         are often not direct-scanout / pageflip capable, and so pageflipping
         can't be used for DRI3/Present of fullscreen windows. Whenever the
         system has to fallback to copies instead of pageflips, the results
         are broken presentation timing, degraded performance and quite
         horrible tearing, as the current DRI3/Present implementation does not
         perform any hardware synchronization of copy presents to the start
         of vblank or similar.
      By defaulting glamor_egl->dmabuf_capable = FALSE instead, as the server
      1.20 branch does, we avoid this failure:
      1. glamor_get_modifiers() turns into a no-op and returns false, not
         reporting any supported dmabuf modifiers to the servers DRI3 code,
         ie. the servers cache_formats_and_modifiers() function can't retrieve
         and cache any format+modifiers. Therefore the servers DRI3 code now
         also reports an empty format+modifiers list when Mesa does a
         xcb_dri3_get_supported_modifiers_screen_modifiers() query.
      2. Mesa's buffer allocation code therefore falls back to using the old
         DRI image extensions createImage() function to allocate buffers
         and our OpenGL backbuffers / Vulkan swapchain images get allocated
         in a direct-scanout / pageflip capable format. Pageflipping works,
         timing and performance is good, presentation is tear-free.
      Please consider merging this for branching the X-Server 1.21 branch.
      Signed-off-by: Mario Kleiner's avatarMario Kleiner <mario.kleiner.de@gmail.com>
    • Jon Turney's avatar
      Don't underlink inputtest on targets which require complete linkage · c5a9287d
      Jon Turney authored
      Don't underlink inputtest on targets which require complete linkage
      (e.g. when building for PE/COFF)
  5. 31 Aug, 2021 1 commit
    • Jon Turney's avatar
      Fix compilation with windows.h from latest w32api · d68b50ec
      Jon Turney authored
      misc.h has complex logic (checking MAXSHORT is undefined etc.)
      controlling if it includes assert.h or not.
      Including windows.h from w32api 9.0.0 now trips over that, causing
      assert.h to not be included, causing various errors, e.g.
      In file included from ../include/cursor.h:53,
                       from ../include/dix.h:54,
                       from ../os/osdep.h:139,
                       from ../hw/xwin/winauth.c:40:
      ../include/privates.h: In function ‘dixGetPrivateAddr’:
      ../include/privates.h:121:5: error: implicit declaration of function ‘assert’ [-Werror=implicit-function-declaration]
      Fix this by IWYU in privates.h
  6. 27 Aug, 2021 1 commit
    • Mario Kleiner's avatar
      modesetting: Fix VRR window property handling. · ab86be0e
      Mario Kleiner authored
      A misplaced error check can cause this failure scenario, and does
      so reliably as tested on Ubuntu 21.04 with KDE Plasma 5 desktop
      within the first few seconds of login session startup, rendering
      VRR under modesetting-ddx unusable:
      1. Some X11 client application changes some window property.
      2. ms_change_property() is called as part of the property change
         handling call chain (client->requestVector[X_ChangeProperty]).
         It removes itself temporarily from the call chain - or so it
         thinks, hooking up saved_change_property instead.
      3. ret = saved_change_property(client) is called and fails
         temporarily for some non-critical reason.
      4. The misplaced error check returns early (error abort), without
         first restoring ms_change_property() as initial X_ChangeProperty
         handler in the call chain again.
      -> Now ms_change_property() has removed itself permanently from the
         property handler call chain for the remainder of the X session
         and VRR property changes on windows are no longer handled, ie.
         VRR no longer gets enabled/disabled in response to window VRR
         property changes.
      Place the error check at the proper place, just as it is correctly
      done by amdgpu-ddx, and in modesetting-ddx ms_delete_property()
      Verified to fix VRR handling with an AMD gpu under KDE desktop
      Please consider merging before branching the server 1.21 branch.
      Signed-off-by: Mario Kleiner's avatarMario Kleiner <mario.kleiner.de@gmail.com>
  7. 20 Aug, 2021 2 commits
  8. 17 Aug, 2021 4 commits
    • Adam Jackson's avatar
      dmx: Fix some redeclaration warnings from gcc 11 · 1f720dc9
      Adam Jackson authored
      Of the form:
          ../hw/dmx/config/xdmxconfig.c:68:26: warning: redundant redeclaration of ‘dmxConfigEntry’ [-Wredundant-decls]
             68 | extern DMXConfigEntryPtr dmxConfigEntry;
                |                          ^~~~~~~~~~~~~~
    • Adam Jackson's avatar
      xkb: Silence a warning from gcc 11 · b49f0f9b
      Adam Jackson authored
      I get this:
          In function ‘TryCopyStr’,
              inlined from ‘CopyISOLockArgs’ at ../xkb/xkbtext.c:875:9:
          ../xkb/xkbtext.c:720:13: warning: ‘tbuf’ may be used uninitialized [-Wmaybe-uninitialized]
            720 |             strcat(to, from);
                |             ^~~~~~~~~~~~~~~~
          ../xkb/xkbtext.c: In function ‘CopyISOLockArgs’:
          <built-in>: note: by argument 1 of type ‘const char *’ to ‘__builtin_strlen’ declared here
          ../xkb/xkbtext.c:871:10: note: ‘tbuf’ declared here
            871 |     char tbuf[64];
                |          ^~~~
      Just initialize tbuf so it definitely works.
    • Adam Jackson's avatar
      xinput: Silence a warning from gcc 11 · c1138d8e
      Adam Jackson authored
      [45/388] Compiling C object Xi/liblibxserver_xi.a.p/xichangehierarchy.c.o
      ../Xi/xichangehierarchy.c:61:32: warning: argument 1 of type ‘int[256]’ with mismatched bound [-Warray-parameter=]
         61 | XISendDeviceHierarchyEvent(int flags[MAXDEVICES])
            |                            ~~~~^~~~~~~~~~~~~~~~~
      In file included from ../Xi/xichangehierarchy.c:54:
      ../Xi/xichangehierarchy.h:42:37: note: previously declared as ‘int[]’
         42 | void XISendDeviceHierarchyEvent(int flags[]);
            |                                 ~~~~^~~~~~~
    • Adam Jackson's avatar
      selinux: Stop using security_context_t · f3a98334
      Adam Jackson authored
      This is apparently deprecated now and is and was always just char *.
  9. 12 Aug, 2021 1 commit
  10. 08 Aug, 2021 1 commit
  11. 07 Aug, 2021 1 commit
  12. 06 Aug, 2021 7 commits
  13. 31 Jul, 2021 1 commit
  14. 30 Jul, 2021 4 commits
  15. 29 Jul, 2021 1 commit
    • Boris-Barboris's avatar
      Don't hardcode fps for fake screen · 16571b89
      Boris-Barboris authored and Povilas Kanapickas's avatar Povilas Kanapickas committed
      Currently, when main hardware screen is powered-off,
      X server initializes fake screen's timer with
      1 second update interval.
      Streaming software like Nomachine or Vnc, as well as
      desktop input automation suffers from it, since it
      will forever be stuck on 1 fps until the display is
      turned back on.
      This commit adds command line option -fakescreenfps <int>
      that allows the user to change the default fake screen
      Signed-off-by: Boris-Barboris's avatarBaranin Alexander <ismailsiege@gmail.com>
  16. 22 Jul, 2021 1 commit
  17. 20 Jul, 2021 1 commit
  18. 09 Jul, 2021 7 commits