[PULL] dead code cleanup

Adam Jackson ajax at redhat.com
Tue Jul 29 07:04:36 PDT 2014


On Mon, 2014-07-28 at 12:49 -0700, Keith Packard wrote:
> Adam Jackson <ajax at redhat.com> writes:
> 
> > No real unifying theme here besides cleanup.
> >
> > Two patches here do require trivial driver changes.  06/22 removes an
> > interface that simply can't work; naturally, two drivers (trident and
> > xgixp) do in fact use it.  The fix requires no thought beyond
> > copypasta of, say, vesa's shadow setup code.  22/22 will break the
> > build of i810 mga savage and tdfx, but all they're doing is setting the
> > ValidateTree slots to NULL (which they already are at init time) so the
> > fixes there require even less thought.
> >
> > I'm happy to fix all of the above before this is merged.
> 
> All of these are reviewed now; do you want to send a pull request with
> review included once the other driver changes are upstream?

I went ahead and fixed up the drivers (I was wrong about i810, it only
mentions the ValidateTree hooks inside comments.)  I dropped the
pseudoramix comment cleanup from the xquartz change, everything else is
as before.

The following changes since commit 8a60d1c3f4a62675cad005107f56413f946ecd77:

  glamor: Eliminate diagonal tearing in xv (2014-07-28 13:12:52 -0700)

are available in the git repository at:

  ssh://people.freedesktop.org/~ajax/xserver.git xserver-next

for you to fetch changes up to a08e7a098aa37351294a25fe62b7ff6e95622e64:

  dri1: Remove unused DRI{,Post}ValidateTree (2014-07-29 09:58:30 -0400)

----------------------------------------------------------------
Adam Jackson (22):
      bsd: Remove some reference arm code behind #if 0
      dix: Make some LBX-era code more obvious
      kdrive: Remove some dead bits of the man page
      mi: Remove apparently unused miSegregateChildren
      miext/shadow: Remove ancient backwards-compatibility hack
      miext/shadow: Remove shadowInit
      os: Remove deprecated malloc/free wrappers
      os: Remove LocalClientCred
      render: Remove unused CopyPicture
      saver: Don't open-code IsMapInstalled
      vgahw: Nuke unused vgaCmap.c
      xfree86: Remove xf86ConfigActivePciEntity
      xfree86: Remove some unused pre-pciaccess types
      xfree86: Remove deprecated PCI types
      xfree86: Remove unused xf86{Map,Unmap}LegacyIO
      xfree86: Remove protectMem from VidMemInfo
      xfree86: Remove pointless xf86RandRCreateScreenResources
      xfree86: Remove useless #include "fb.h"
      xfree86: Remove unused HardEdges
      xkb: Remove some fascinating paranoia from event emission
      xquartz: Remove unused DRI{,Post}ValidateTree
      dri1: Remove unused DRI{,Post}ValidateTree

 Xext/saver.c                          |  16 +-
 dix/dispatch.c                        |   4 +-
 doc/Xserver-spec.xml                  |   6 +-
 hw/kdrive/Xkdrive.man                 |   7 -
 hw/xfree86/common/xf86.h              |   8 -
 hw/xfree86/common/xf86Cursor.c        |  17 +--
 hw/xfree86/common/xf86RandR.c         |  32 ----
 hw/xfree86/common/xf86pciBus.c        |  39 -----
 hw/xfree86/doc/ddxDesign.xml          |   3 +-
 hw/xfree86/dri/dri.c                  |  73 ---------
 hw/xfree86/dri/dri.h                  |   8 -
 hw/xfree86/modes/xf86Rotate.c         |   1 -
 hw/xfree86/os-support/bsd/arm_video.c | 139 -----------------
 hw/xfree86/os-support/bus/xf86Pci.h   |  21 ---
 hw/xfree86/os-support/xf86OSpriv.h    |   2 -
 hw/xfree86/vgahw/Makefile.am          |   2 -
 hw/xfree86/vgahw/vgaCmap.c            | 275 ----------------------------------
 hw/xquartz/xpr/dri.c                  |  51 -------
 hw/xquartz/xpr/dri.h                  |   8 -
 include/os.h                          |  40 +----
 mi/mi.h                               |   3 -
 mi/miwindow.c                         |  14 --
 miext/shadow/shadow.c                 |  54 -------
 miext/shadow/shadow.h                 |   6 -
 os/access.c                           |  27 ----
 os/utils.c                            |  48 ------
 render/picture.c                      |  81 ----------
 render/picturestr.h                   |   3 -
 xkb/xkbEvents.c                       |   9 --
 29 files changed, 7 insertions(+), 990 deletions(-)
 delete mode 100644 hw/xfree86/vgahw/vgaCmap.c

- ajax



More information about the xorg-devel mailing list