[git pull] modesetting features, a bug fix and some cleanups

Dave Airlie airlied at gmail.com
Mon Jun 29 20:49:57 PDT 2015


Hi Keith,

This contains a few patches that I've been working on,
everthing except one trivial cleanup is acked or reviewed

I've included the cleanups, one bug fix in auto add devices,

and three modesetting features:
a) GPU output master side support
b) reverse prime support (nvidia outputting from intel GPU)
c) pageflipping support.

I've spent a fair bit of time trying to robustify the pageflip
code, it's definitely a lot better than it was, mostly from
working with Michel's changes ported from AMD drivers. I also
agree with Eric this needs to be in the tree already so we can
improve it.

I've got two patches left, the cursor one I reposted, and
PRIME rotation patch needs some review, Chris has a question
on it, but nothing else has happened.

Dave.

The following changes since commit fa12f2c150b2f50de9dac4a2b09265f13af353af:

  glamor: don't do render ops with matching source/dest (v3)
(2015-06-02 14:16:26 +1000)

are available in the git repository at:

  ssh://people.freedesktop.org/~airlied/xserver for-keithp

for you to fetch changes up to 13c7d53df8dac45ea2a685826cd45a39bcb51657:

  modesetting: Implement page flipping support for Present.
(2015-06-30 13:44:09 +1000)

----------------------------------------------------------------
Dave Airlie (9):
      cursor: drop ARGB_CURSOR
      xf86Rotate: remove unused macros.
      xf86: restrict when we auto add devices as gpu devices.
      glamor: add support for allocating linear buffers (v2)
      modesetting: add output master support
      glamor: egl: add function to back a pixmap with a dma-buf. (v1.1)
      modesetting: reverse prime support (v1.1)
      modesetting: drop unused struct in vblank.c
      modesetting: don't try and load dri2

Jason Ekstrand (1):
      glamor: Add a new glamor_gbm_bo_from_pixmap() function.

Kenneth Graunke (4):
      modesetting: Improve the ms_flush_drm_events() API.
      modesetting: Make ms_crtc_on non-static.
      modesetting: Implement an ms_drm_abort_seq() function.
      modesetting: Implement page flipping support for Present.

 configure.ac                                     |   4 +
 dix/cursor.c                                     |   8 -
 glamor/glamor.h                                  |  37 +-
 glamor/glamor_egl.c                              | 117 ++++--
 glamor/glamor_egl_stubs.c                        |   2 +-
 glamor/glamor_fbo.c                              |  13 +-
 hw/kdrive/ephyr/ephyrcursor.c                    |   4 -
 hw/xfree86/common/xf86Config.c                   |  13 +-
 hw/xfree86/drivers/modesetting/driver.c          |  82 ++++-
 hw/xfree86/drivers/modesetting/driver.h          |   9 +
 hw/xfree86/drivers/modesetting/drmmode_display.c | 117 +++++-
 hw/xfree86/drivers/modesetting/drmmode_display.h |  12 +-
 hw/xfree86/drivers/modesetting/present.c         | 450 ++++++++++++++++++++++-
 hw/xfree86/drivers/modesetting/vblank.c          |  23 +-
 hw/xfree86/modes/xf86Cursors.c                   |   8 -
 hw/xfree86/modes/xf86Rotate.c                    |   6 -
 hw/xfree86/ramdac/xf86Cursor.c                   |   2 -
 hw/xfree86/ramdac/xf86Cursor.h                   |   4 -
 hw/xfree86/ramdac/xf86HWCurs.c                   |   6 -
 hw/xquartz/xpr/xprCursor.c                       |   2 -
 hw/xwayland/xwayland-glamor.c                    |   2 +-
 include/cursorstr.h                              |   2 -
 include/dix-config.h.in                          |   3 +
 mi/midispcur.c                                   |  20 +-
 xfixes/cursor.c                                  |   2 -
 25 files changed, 821 insertions(+), 127 deletions(-)


More information about the xorg-devel mailing list