Merge remote-tracking branch 'origin/kms-only'

This merges the removal of the UMS code and subsequent simplifications.

Hell yes.

* origin/kms-only: (24 commits)
  radeon: fix radeonchipsets properly
  radeon: fix RADEONChipsets
  radeon: migrate remainder of radeon_driver.c to rest of driver
  radeon: avoid including large static struct twice.
  radeon: drop some more unused macros/inlines
  radeon: drop another unused struct member.
  radeon: more unused stuff
  radeon: drop cardType shouldn't matter to userspace.
  radeon: drop radeonGetPixmapOffset
  radeon: move more functions into texture video
  radeon: drop legacy memory, merge into radeon video
  radeon: drop unused txoffset vars.
  radeon: drop vb_mc_addr, not needed anymore
  radeon: drop offset member of r600 accel object
  radeon: move macros into radeon.h
  radeon: drop more wrapper macros.
  radeon: further macro cleanups.
  radeon: make exa copy funcs static.
  radeon: drop FUNC_NAME macro and ONCE_ONLY stuff
  radeon: drop radeon_commonfuncs.
  ...

Conflicts:
	configure.ac

1 files changed, 14 insertions, 139 deletions

diff --git a/configure.ac b/configure.ac
index 0fa21413..2b7fc24f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,12 +30,6 @@ AC_INIT([xf86-video-ati],
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
 
-# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.8)
-XORG_DEFAULT_OPTIONS
-
 AC_CONFIG_AUX_DIR(.)
 
 # Initialize Automake
@@ -44,6 +38,12 @@ AC_SYS_LARGEFILE
 
 AM_MAINTAINER_MODE
 
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
+
 # Initialize libtool
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
@@ -64,144 +64,32 @@ AC_ARG_WITH(xorg-module-dir,
             [moduledir="$withval"],
             [moduledir="$libdir/xorg/modules"])
 
-AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
-                                  [Disable DRI support [[default=auto]]]),
-              [DRI="$enableval"],
-              [DRI=auto])
-
-AC_ARG_ENABLE(exa,
-              AS_HELP_STRING([--disable-exa],
-                             [Disable EXA support [[default=enabled]]]),
-              [EXA="$enableval"],
-              [EXA=yes])
-
-AC_ARG_ENABLE(kms,
-              AS_HELP_STRING([--disable-kms],
-                             [Disable KMS support [[default=enabled]]]),
-              [DRM_MODE="$enableval"],
-              [DRM_MODE=yes])
-
 # Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
 XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
+# Checks for libraries.
+PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.36])
+PKG_CHECK_MODULES(LIBDRM_RADEON, [libdrm_radeon])
+
 # Obtain compiler/linker options for the driver dependencies
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.3 xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.2 xproto fontsproto xf86driproto $REQUIRED_MODULES])
 PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
                   HAVE_XEXTPROTO_71="no")
 AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
 
-# Checks for libraries.
-
 
-if test "$DRI" != no; then
-	PKG_CHECK_MODULES(DRI, [libdrm >= 2.2 xf86driproto])
-	save_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS"
-	AC_CHECK_HEADER([dri.h],
-                      [have_dri_h="yes"], [have_dri_h="no"],[-])
-	AC_CHECK_HEADER([sarea.h],
-                      [have_sarea_h="yes"], [have_sarea_h="no"],[-])
-	AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
-#include <xorg-server.h>
-#include <dristruct.h>
-                      ]])],
-                      [have_dristruct_h="yes"], [have_dristruct_h="no"],[-])
-	AC_CHECK_HEADER([damage.h],
-                      [have_damage_h="yes"], [have_damage_h="no"],[-])
-	CPPFLAGS="$save_CPPFLAGS"
+PKG_CHECK_MODULES(LIBUDEV, [libudev], [LIBUDEV=yes], [LIBUDEV=no])
+if test "x$LIBUDEV" = xyes; then
+       AC_DEFINE(HAVE_LIBUDEV, 1,[libudev support])
 fi
-
-AC_MSG_CHECKING([whether to include DRI support])
-if test x$DRI = xauto; then
-	if test "$have_dri_h" = yes -a \
-                "$have_sarea_h" = yes -a \
-                "$have_dristruct_h" = yes; then
-		DRI="yes"
-	else
-		DRI="no"
-	fi
-fi
-AC_MSG_RESULT([$DRI])
-
-AM_CONDITIONAL(DRI, test x$DRI = xyes)
-if test "$DRI" = yes; then
-        AC_DEFINE(XF86DRI,1,[Enable DRI driver support])
-        AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
-	if test "$have_damage_h" = yes; then
-		AC_DEFINE(DAMAGE,1,[Use Damage extension])
-	fi
-
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $CFLAGS"
-	if test "$DRM_MODE" = yes; then
-	   	AC_CHECK_HEADER(xf86drmMode.h,[DRM_MODE=yes],[DRM_MODE=no],[#include <stdint.h>
-#include <stdlib.h>])
-		if test "x$DRM_MODE" = xyes; then
-			PKG_CHECK_MODULES(LIBDRM_RADEON, [xorg-server >= 1.6.2 libdrm >= 2.4.36 libdrm_radeon],
-			[LIBDRM_RADEON=yes], [LIBDRM_RADEON=no])
-
-			if test "x$LIBDRM_RADEON" = xyes; then
-			   	AC_DEFINE(XF86DRM_MODE,1,[DRM kernel modesetting])
-				AC_DEFINE(RADEON_DRI2, 1,[Enable DRI2 code])
-                        else
-                                DRM_MODE=no
-			fi
-			PKG_CHECK_MODULES(LIBUDEV, [libudev], [LIBUDEV=yes], [LIBUDEV=no])
-			if test "x$LIBUDEV" = xyes; then
-			       AC_DEFINE(HAVE_LIBUDEV, 1,[libudev support])
-			fi
-        	fi
-	fi
-	CFLAGS="$save_CFLAGS"
-else
-	DRM_MODE=no
-fi
-AM_CONDITIONAL(DRM_MODE, test x$DRM_MODE = xyes)
 AM_CONDITIONAL(LIBUDEV, test x$LIBUDEV = xyes)
 
-AC_DEFINE(USE_XAA, 1, [Build support for XAA])
-
-# Properly handle EXA.
-AC_MSG_CHECKING([whether to enable EXA support])
-if test "x$EXA" = xyes; then
-        AC_MSG_RESULT(yes)
-
-        SAVE_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-        AC_CHECK_HEADER(exa.h,
-                       [have_exa_h="yes"], [have_exa_h="no"])
-        CPPFLAGS="$SAVE_CPPFLAGS"
-else
-        AC_MSG_RESULT(no)
-fi 
-
 SAVE_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-if test "x$have_exa_h" = xyes; then
-        AC_MSG_CHECKING([whether EXA version is at least 2.0.0])
-        AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
-#include "exa.h"
-#if EXA_VERSION_MAJOR < 2
-#error OLD EXA!
-#endif
-                          ]])],
-                          [USE_EXA=yes],
-                          [USE_EXA=no])
-        AC_MSG_RESULT($USE_EXA)
-
-        if test "x$USE_EXA" = xyes; then
-                AC_DEFINE(USE_EXA, 1, [Build support for Exa])
-        fi
-fi
-
-AC_CHECK_DECL(xf86XVFillKeyHelperDrawable,
-	      [AC_DEFINE(HAVE_XV_DRAWABLE_HELPER, 1, [Have xf86XVFillKeyHelperDrawable prototype])],
-	      [],
-	      [#include <xf86xv.h>])
 
 AC_CHECK_DECL(xf86ModeBandwidth,
 	      [AC_DEFINE(HAVE_XF86MODEBANDWIDTH, 1, [Have xf86ModeBandwidth prototype])],
@@ -248,10 +136,6 @@ fi
 
 CPPFLAGS="$SAVE_CPPFLAGS"
 
-AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
-
-AM_CONDITIONAL(XF86DRM_MODE, test "x$LIBDRM_RADEON" = xyes)
-
 if test "x$XSERVER_LIBPCIACCESS" = xyes; then
     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
     XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
@@ -318,11 +202,6 @@ b = bswap16(a);
 	fi
 fi
 
-case $host_os in
-  *linux*)
-  AC_DEFINE(FGL_LINUX, 1, [Use linux pragma pack]) ;;
-esac
-
 AC_SUBST([moduledir])
 
 DRIVER_NAME=ati
@@ -356,10 +235,6 @@ echo "        exec_prefix:         $exec_prefix"
 echo "        libdir:              $libdir"
 echo "        includedir:          $includedir"
 
-
-echo ""
-echo "        Kernel modesetting:  $DRM_MODE"
-
 echo ""
 echo "        CFLAGS:              $CFLAGS"
 echo "        CXXFLAGS:            $CXXFLAGS"