[PATCH 0/4] v3: xf86-video-intel: Replace glamor support

Keith Packard keithp at keithp.com
Fri Sep 26 20:35:31 PDT 2014


With all of the preparatory patches applied, here's the remaining
short sequence of patches necessary to conver the intel driver over to
using glamor directly, rather than indirectly through UXA.

I've removed the (scary) changes which moved the initial mode setting
to the first invocation of the block handler. That required exporting
another function from glamor in the server (patch already on the list)
so that I could copy the existing console contents to the new frame
buffer before GCs were ready to go.

The final patch in this sequence moves the mode set from ScreenInit to
CreateScreenResources so that it occurs after the contents have been
initialized from the console. That is independent of the rest of the
sequence and serves to avoid a brief flicker of black during server
initialization.

Again, the plan when actually merging this into the driver will be to
squash the first two patches so that we can bisect across this change
without losing glamor entirely; the patches are provided separately
here because it's a lot easier to review them this way.

Keith Packard (4):
  Remove glamor support from driver
  Add glamor back into the driver
  Add "none" acceleration option
  Delay mode set until fb contents copied from console

 configure.ac              |  46 ++---
 src/Makefile.am           |   9 +-
 src/intel_module.c        |  14 +-
 src/uxa/Makefile.am       |  46 +++--
 src/uxa/intel.h           |  17 ++
 src/uxa/intel_display.c   |  72 +++++--
 src/uxa/intel_dri.c       | 294 ++++++++--------------------
 src/uxa/intel_dri3.c      |  58 +++---
 src/uxa/intel_driver.c    | 479 ++++++++++++++++++++++++++++++++++------------
 src/uxa/intel_glamor.c    | 384 +++++++++++++++++++------------------
 src/uxa/intel_glamor.h    |  59 ++----
 src/uxa/intel_none.c      | 299 +++++++++++++++++++++++++++++
 src/uxa/intel_none.h      |  46 +++++
 src/uxa/intel_uxa.c       | 174 ++++++++++++-----
 src/uxa/intel_uxa.h       |  12 +-
 src/uxa/intel_uxa_video.c |   1 -
 src/uxa/intel_video.c     |  75 +++++---
 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 --
 23 files changed, 1328 insertions(+), 1198 deletions(-)
 create mode 100644 src/uxa/intel_none.c
 create mode 100644 src/uxa/intel_none.h
 delete mode 100644 src/uxa/uxa-glamor.h

-- 
2.1.1



More information about the xorg-devel mailing list