[PATCH 00/18] v2: xf86-video-intel: Replace glamor support

[Keith Packard]

I spent another day reworking the glamor code in the intel
driver. There aren't many changes since the last series overall, but
the sequence of patches is very different.

There's a long sequence of patches which prepare the way for the
glamor update. Then, there's one patch which removes the current
glamor support immediately followed by a patch which adds the
replacement glamor support. Finally, a patch which adds bare fb
support that includes DRI2 and DRI3 to enable hardware bringup in a
sane order.

My thinking is that having the glamor changes in two patches should
make them a bit easier to review. Once reviewed, we'll squash those
two patches together so that bisecting won't remove glamor support and
break things for users.

Major changes since last time:

 1) The UXA pixmap BO allocation and validation code has
    been fixed to align to just the tile height, rather than
    twice that.

 2) I've cleaned up the UXA pixmap private to remove the 'stride'
    field which was always the same as devKind.

 3) DRI2 is supported in all three modes. Under Glamor,
    indirect GL is disabled due to recursion through the
    driver when allocating surfaces.

Keith Packard (18):
  Correct BO allocation alignment
  Fix present debug output
  Remove redundant calls to drm_intel_bo_disable_reuse
  Three minor warning and whitespace fixes
  Don't use GetScratchPixmapHeader for shadow pixmaps
  Eliminate pixmap private 'stride' field, which duplicates devKind
  Delay initial modeset until root window contents are prepared
  Do more checks for proposed flip pixmaps
  Move intel_alloc_framebuffer to intel_memory.c
  Rename uxa-specific functions and structs
  Add intel_flush to abstract flushing pending acceleration operations
  Move UXA hardware initialization into intel_uxa_init
  Move some UXA-specific code under #if USE_UXA.
  intel_present.c does not need to include uxa.h
  Use intel_uxa.h in all uxa-specific files
  Remove glamor support from driver
  Add glamor back into the driver
  Add "none" acceleration option

 configure.ac                  |   46 +-
 src/Makefile.am               |    9 +-
 src/intel_module.c            |   14 +-
 src/uxa/Makefile.am           |   48 +-
 src/uxa/i830_3d.c             |    1 +
 src/uxa/i830_render.c         |   83 +--
 src/uxa/i915_3d.c             |    1 +
 src/uxa/i915_render.c         |  101 ++--
 src/uxa/i915_video.c          |   12 +-
 src/uxa/i965_3d.c             |    1 +
 src/uxa/i965_render.c         |   99 +--
 src/uxa/i965_video.c          |   50 +-
 src/uxa/intel.h               |  298 ++-------
 src/uxa/intel_batchbuffer.c   |   10 +-
 src/uxa/intel_batchbuffer.h   |    4 +-
 src/uxa/intel_display.c       |  209 +++++--
 src/uxa/intel_dri.c           |  298 +++------
 src/uxa/intel_dri3.c          |   50 +-
 src/uxa/intel_driver.c        |  566 ++++++++++++-----
 src/uxa/intel_glamor.c        |  318 +++++-----
 src/uxa/intel_glamor.h        |   35 +-
 src/uxa/intel_memory.c        |  138 +++++
 src/uxa/intel_none.c          |  268 ++++++++
 src/uxa/intel_none.h          |   43 ++
 src/uxa/intel_present.c       |   16 +-
 src/uxa/intel_uxa.c           |  469 +++++++-------
 src/uxa/intel_uxa.h           |  307 ++++++++++
 src/uxa/intel_uxa_video.c     |  388 ++++++++++++
 src/uxa/intel_video.c         | 1343 ++++++++---------------------------------
 src/uxa/intel_video.h         |  156 +++--
 src/uxa/intel_video_overlay.c |  554 +++++++++++++++++
 src/uxa/intel_video_overlay.h |   51 ++
 src/uxa/uxa-accel.c           |  230 -------
 src/uxa/uxa-glamor.h          |   65 --
 src/uxa/uxa-glyphs.c          |   28 -
 src/uxa/uxa-render.c          |   91 ---
 src/uxa/uxa.c                 |   11 -
 src/uxa/uxa.h                 |   16 -
 38 files changed, 3463 insertions(+), 2964 deletions(-)
 create mode 100644 src/uxa/intel_none.c
 create mode 100644 src/uxa/intel_none.h
 create mode 100644 src/uxa/intel_uxa.h
 create mode 100644 src/uxa/intel_uxa_video.c
 create mode 100644 src/uxa/intel_video_overlay.c
 create mode 100644 src/uxa/intel_video_overlay.h
 delete mode 100644 src/uxa/uxa-glamor.h

-- 
2.0.1