gallium/targets: remove r600/xorg

Reviewed-by: Christian König <christian.koenig@amd.com>

4 files changed, 1 insertions, 228 deletions

diff --git a/configure.ac b/configure.ac
index f94c9b9791c..a1bc1167c9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1789,7 +1789,7 @@ if test "x$with_gallium_drivers" != x; then
             if test "x$enable_opencl" = xyes; then
                 LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser"
             fi
-            gallium_check_st "radeon/drm" "r600/dri" "r600/xorg" "" "r600/xvmc" "r600/vdpau"
+            gallium_check_st "radeon/drm" "r600/dri" "" "" "r600/xvmc" "r600/vdpau"
             DRICOMMON_NEED_LIBDRM=yes
             ;;
         xradeonsi)
@@ -2050,7 +2050,6 @@ AC_CONFIG_FILES([Makefile
 		src/gallium/targets/r300/xvmc/Makefile
 		src/gallium/targets/r600/dri/Makefile
 		src/gallium/targets/r600/vdpau/Makefile
-		src/gallium/targets/r600/xorg/Makefile
 		src/gallium/targets/r600/xvmc/Makefile
 		src/gallium/targets/libgl-xlib/Makefile
 		src/gallium/targets/vdpau-nouveau/Makefile
diff --git a/src/gallium/targets/Makefile.am b/src/gallium/targets/Makefile.am
index 2498ee17b84..be3c441aaaa 100644
--- a/src/gallium/targets/Makefile.am
+++ b/src/gallium/targets/Makefile.am
@@ -89,10 +89,6 @@ if HAVE_DRI
 SUBDIRS += r600/dri
 endif
 
-if HAVE_ST_XORG
-SUBDIRS += r600/xorg
-endif
-
 if HAVE_ST_XVMC
 SUBDIRS += r600/xvmc
 endif
diff --git a/src/gallium/targets/r600/xorg/Makefile.am b/src/gallium/targets/r600/xorg/Makefile.am
deleted file mode 100644
index c3dee5a43f7..00000000000
--- a/src/gallium/targets/r600/xorg/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright © 2012 Intel Corporation
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
-include $(top_srcdir)/src/gallium/Automake.inc
-
-AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(PTHREAD_CFLAGS) \
-	$(XORG_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-DHAVE_CONFIG_H \
-	-DGALLIUM_RBUG \
-	-DGALLIUM_TRACE \
-	-DGALLIUM_GALAHAD
-
-xorgdir = $(XORG_DRIVER_INSTALL_DIR)
-xorg_LTLIBRARIES = r600g_drv.la
-
-r600g_drv_la_SOURCES = \
-	../drm_target.c \
-	xorg.c
-
-r600g_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
-
-r600g_drv_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
-	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
-	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
-	$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
-	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
-	$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
-	$(GALLIUM_DRI_LIB_DEPS) \
-	$(LIBDRM_XORG_LIBS) \
-	$(LIBKMS_XORG_LIBS) \
-	$(RADEON_LIBS)
-
-if HAVE_MESA_LLVM
-r600g_drv_la_LINK = $(CXXLINK) $(r600g_drv_la_LDFLAGS)
-# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
-nodist_EXTRA_r600g_drv_la_SOURCES = dummy-cpp.cpp
-
-r600g_drv_la_LDFLAGS += $(LLVM_LDFLAGS)
-r600g_drv_la_LIBADD += $(LLVM_LIBS)
-else
-r600g_drv_la_LINK = $(LINK) $(r600g_drv_la_LDFLAGS)
-# Mention a dummy pure C file to trigger generation of the $(LINK) variable
-nodist_EXTRA_r600g_drv_la_SOURCES = dummy-c.c
-endif
-
-# Provide compatibility with scripts for the old Mesa build system for
-# a while by putting a link to the driver into /lib of the build tree.
-all-local: r600g_drv.la
-	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
-	ln -f .libs/r600g_drv.so $(top_builddir)/$(LIB_DIR)/gallium/r600g_drv.so
diff --git a/src/gallium/targets/r600/xorg/xorg.c b/src/gallium/targets/r600/xorg/xorg.c
deleted file mode 100644
index b0b0ef0a2ef..00000000000
--- a/src/gallium/targets/r600/xorg/xorg.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *
- * Author: Alan Hourihane <alanh@tungstengraphics.com>
- * Author: Jakob Bornecrantz <wallbraker@gmail.com>
- * Author: Corbin Simpson <MostAwesomedude@gmail.com>
- *
- */
-
-#include "../../../state_trackers/xorg/xorg_winsys.h"
-
-static void r600_xorg_identify(int flags);
-static Bool r600_xorg_pci_probe(DriverPtr driver,
-				 int entity_num,
-				 struct pci_device *device,
-				 intptr_t match_data);
-
-static const struct pci_id_match r600_xorg_device_match[] = {
-    {0x1002, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, 0},
-    {0, 0, 0},
-};
-
-static SymTabRec r600_xorg_chipsets[] = {
-    {PCI_MATCH_ANY, "AMD R6xx Graphics Chipset"},
-    {-1, NULL}
-};
-
-static PciChipsets r600_xorg_pci_devices[] = {
-    {PCI_MATCH_ANY, PCI_MATCH_ANY, NULL},
-    {-1, -1, NULL}
-};
-
-static XF86ModuleVersionInfo r600_xorg_version = {
-    "r600g",
-    MODULEVENDORSTRING,
-    MODINFOSTRING1,
-    MODINFOSTRING2,
-    XORG_VERSION_CURRENT,
-    0, 1, 0, /* major, minor, patch */
-    ABI_CLASS_VIDEODRV,
-    ABI_VIDEODRV_VERSION,
-    MOD_CLASS_VIDEODRV,
-    {0, 0, 0, 0}
-};
-
-/*
- * Xorg driver exported structures
- */
-
-_X_EXPORT DriverRec r600_driver = {
-    1,
-    "r600g",
-    r600_xorg_identify,
-    NULL,
-    xorg_tracker_available_options,
-    NULL,
-    0,
-    NULL,
-    r600_xorg_device_match,
-    r600_xorg_pci_probe
-};
-
-static MODULESETUPPROTO(r600_xorg_setup);
-
-_X_EXPORT XF86ModuleData r600gModuleData = {
-    &r600_xorg_version,
-    r600_xorg_setup,
-    NULL
-};
-
-/*
- * Xorg driver functions
- */
-
-static pointer
-r600_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)
-{
-    static Bool setupDone = 0;
-
-    /* This module should be loaded only once, but check to be sure.
-     */
-    if (!setupDone) {
-	setupDone = 1;
-	xf86AddDriver(&r600_driver, module, HaveDriverFuncs);
-
-	/*
-	 * The return value must be non-NULL on success even though there
-	 * is no TearDownProc.
-	 */
-	return (pointer) 1;
-    } else {
-	if (errmaj)
-	    *errmaj = LDR_ONCEONLY;
-	return NULL;
-    }
-}
-
-static void
-r600_xorg_identify(int flags)
-{
-    xf86PrintChipsets("r600", "Driver for R6xx Gallium with KMS",
-		      r600_xorg_chipsets);
-}
-
-static Bool
-r600_xorg_pci_probe(DriverPtr driver,
-	  int entity_num, struct pci_device *device, intptr_t match_data)
-{
-    ScrnInfoPtr scrn = NULL;
-
-    scrn = xf86ConfigPciEntity(scrn, 0, entity_num, r600_xorg_pci_devices,
-			       NULL, NULL, NULL, NULL, NULL);
-    if (scrn != NULL) {
-	scrn->driverVersion = 1;
-	scrn->driverName = "r600";
-	scrn->name = "R600G";
-	scrn->Probe = NULL;
-
-	/* Use all the functions from the xorg tracker */
-	xorg_tracker_set_functions(scrn);
-    }
-    return scrn != NULL;
-}