Remove intel_hotplug tool now that it won't work with KMS.

We'd want to put something like it in sysfs or something if we wanted
this tool to exist again.

6 files changed, 0 insertions, 318 deletions

diff --git a/configure.ac b/configure.ac
index 411bdac48..33a3df194 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,7 +168,6 @@ AC_OUTPUT([
 	src/xvmc/shader/mc/Makefile
 	src/xvmc/shader/vld/Makefile
 	src/bios_reader/Makefile
-	src/reg_dumper/Makefile
 	man/Makefile
 	src/render_program/Makefile
 ])
diff --git a/src/reg_dumper/.gitignore b/src/reg_dumper/.gitignore
deleted file mode 100644
index fc3444374..000000000
--- a/src/reg_dumper/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-#		Add & Override for this directory and it's subdirectories
-intel_audio
-intel_gtt
-intel_hotplug
-intel_reg_dumper
-intel_statuspage
-intel_lid
diff --git a/src/reg_dumper/Makefile.am b/src/reg_dumper/Makefile.am
deleted file mode 100644
index ed216c8d7..000000000
--- a/src/reg_dumper/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-noinst_PROGRAMS = \
-	intel_hotplug
-
-intel_hotplug_SOURCES = \
-	hotplug.c \
-	reg_dumper.h
-
-intel_hotplug_LDADD = $(PCIACCESS_LIBS)
-
-AM_CFLAGS = $(PCIACCESS_CFLAGS) $(CWARNFLAGS) \
-	-I$(srcdir)/.. -DREG_DUMPER
-
diff --git a/src/reg_dumper/hotplug.c b/src/reg_dumper/hotplug.c
deleted file mode 100644
index aa0aba3d2..000000000
--- a/src/reg_dumper/hotplug.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright © 2007 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.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <pciaccess.h>
-#include <err.h>
-#include <unistd.h>
-
-#include "reg_dumper.h"
-#include "../i810_reg.h"
-
-struct idle_flags {
-	uint32_t instdone_flag;
-	char *name;
-	unsigned int count;
-};
-
-int main(int argc, char **argv)
-{
-	struct pci_device *dev;
-	I830Rec i830;
-	I830Ptr pI830 = &i830;
-	ScrnInfoRec scrn;
-	int err, mmio_bar;
-	void *mmio;
-	int i;
-
-	err = pci_system_init();
-	if (err != 0) {
-		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
-			strerror(err));
-		exit(1);
-	}
-
-	/* Grab the graphics card */
-	dev = pci_device_find_by_slot(0, 0, 2, 0);
-	if (dev == NULL)
-		errx(1, "Couldn't find graphics card");
-
-	err = pci_device_probe(dev);
-	if (err != 0) {
-		fprintf(stderr, "Couldn't probe graphics card: %s\n",
-			strerror(err));
-		exit(1);
-	}
-
-	if (dev->vendor_id != 0x8086)
-		errx(1, "Graphics card is non-intel");
-
-	i830.PciInfo = dev;
-
-	mmio_bar = IS_I9XX((&i830)) ? 0 : 1;
-
-	err = pci_device_map_range(dev,
-				   dev->regions[mmio_bar].base_addr,
-				   dev->regions[mmio_bar].size,
-				   PCI_DEV_MAP_FLAG_WRITABLE, &mmio);
-
-	if (err != 0) {
-		fprintf(stderr, "Couldn't map MMIO region: %s\n",
-			strerror(err));
-		exit(1);
-	}
-	i830.mmio = mmio;
-
-	scrn.scrnIndex = 0;
-	scrn.pI830 = &i830;
-
-	OUTREG(SDVOB, (0x0 << 10));
-	OUTREG(SDVOC, (0x0 << 10));
-
-	OUTREG(PORT_HOTPLUG_EN,
-	       (1 << 29) |
-	       (1 << 28) |
-	       (1 << 27) |
-	       SDVOB_HOTPLUG_INT_EN |
-	       SDVOC_HOTPLUG_INT_EN |
-	       (1 << 24) |
-	       CRT_HOTPLUG_INT_EN | TV_HOTPLUG_INT_EN | CRT_HOTPLUG_INT_EN);
-
-	for (i = 0;; i++) {
-		OUTREG(PORT_HOTPLUG_STAT,
-		       (1 << 20) |
-		       (1 << 19) |
-		       (1 << 18) |
-		       (1 << 17) |
-		       CRT_HOTPLUG_INT_STATUS |
-		       TV_HOTPLUG_INT_STATUS |
-		       SDVOC_HOTPLUG_INT_STATUS | SDVOB_HOTPLUG_INT_STATUS);
-		INREG(PORT_HOTPLUG_STAT);
-
-		usleep(500 * 1000);
-
-		printf("%5d: 0x%08x\n", i, INREG(PORT_HOTPLUG_STAT));
-		sleep(1);
-	}
-
-	return 0;
-}
diff --git a/src/reg_dumper/reg_dumper.h b/src/reg_dumper/reg_dumper.h
deleted file mode 100644
index 150793727..000000000
--- a/src/reg_dumper/reg_dumper.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright © 2007 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.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-#include <inttypes.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <pciaccess.h>
-#include "common.h"
-
-/** @file
- * This file defines the typedefs and stub structures necessary for us to
- * use i830_debug.c mostly unmodified.
- */
-
-typedef char Bool;
-
-#define FALSE 0
-#define TRUE 1
-
-#define X_INFO 0
-#define X_WARNING 1
-#define X_ERROR 2
-
-typedef struct _i830 {
-	/* Fields in common with the real pI830 */
-	struct pci_device *PciInfo;
-	Bool use_drm_mode;
-
-	/* Fields used for setting up reg_dumper */
-	volatile unsigned char *mmio;
-} I830Rec, *I830Ptr;
-
-typedef struct _scrn {
-	/* Fields in common with the real pScrn */
-	int scrnIndex;
-
-	/* Fields used for setting up reg_dumper */
-	I830Ptr pI830;
-} ScrnInfoRec, *ScrnInfoPtr;
-
-#define I830PTR(pScrn) (pScrn->pI830)
-
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
-
-#define INREG8(reg) (*(volatile uint8_t *)((pI830)->mmio + (reg)))
-#define INREG16(reg) (*(volatile uint16_t *)((pI830)->mmio + (reg)))
-#define INREG(reg) (*(volatile uint32_t *)((pI830)->mmio + (reg)))
-#define OUTREG8(reg, val) \
-	*(volatile uint8_t *)((pI830)->mmio + (reg)) = (val)
-#define OUTREG16(reg, val) \
-	*(volatile uint16_t *)((pI830)->mmio + (reg)) = (val)
-#define OUTREG(reg, val) \
-	*(volatile uint32_t *)((pI830)->mmio + (reg)) = (val)
-
-#define xalloc malloc
-#define xfree free
-#define ErrorF printf
-
-char *XNFprintf(const char *format, ...);
-void xf86DrvMsg(int scrnIndex, int severity, const char *format, ...);
-void i830DumpRegs(ScrnInfoPtr pScrn);
-void intel_i830rec_init(I830Ptr pI830);
diff --git a/src/reg_dumper/util.c b/src/reg_dumper/util.c
deleted file mode 100644
index 61210f672..000000000
--- a/src/reg_dumper/util.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright © 2008 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.
- *
- * Authors:
- *    Eric Anholt <eric@anholt.net>
- *
- */
-
-/** @file util.c
- *
- * Utility functions for the various tools in the reg_dumper directory.
- */
-
-#include <err.h>
-#include <pciaccess.h>
-
-#include "reg_dumper.h"
-
-/**
- * Sets up the pI830 for use by common.h-style macros, particularly
- * INREG/OUTERG.
- */
-void intel_i830rec_init(I830Ptr pI830)
-{
-	struct pci_device *dev;
-	int err, mmio_bar;
-	void *mmio;
-
-	err = pci_system_init();
-	if (err != 0) {
-		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
-			strerror(err));
-		exit(1);
-	}
-
-	/* Grab the graphics card */
-	dev = pci_device_find_by_slot(0, 0, 2, 0);
-	if (dev == NULL)
-		errx(1, "Couldn't find graphics card");
-
-	err = pci_device_probe(dev);
-	if (err != 0) {
-		fprintf(stderr, "Couldn't probe graphics card: %s\n",
-			strerror(err));
-		exit(1);
-	}
-
-	if (dev->vendor_id != 0x8086)
-		errx(1, "Graphics card is non-intel");
-
-	pI830->PciInfo = dev;
-
-	mmio_bar = IS_I9XX(pI830) ? 0 : 1;
-
-	err = pci_device_map_range(dev,
-				   dev->regions[mmio_bar].base_addr,
-				   dev->regions[mmio_bar].size,
-				   PCI_DEV_MAP_FLAG_WRITABLE, &mmio);
-
-	if (err != 0) {
-		fprintf(stderr, "Couldn't map MMIO region: %s\n",
-			strerror(err));
-		exit(1);
-	}
-	pI830->mmio = mmio;
-}