igt: remove deprecated reg access tools in favor of intel_reg
diff mbox

Message ID 1434629867-27033-1-git-send-email-jani.nikula@intel.com
State New
Headers show

Commit Message

Jani Nikula June 18, 2015, 12:17 p.m. UTC
intel_iosf_sb_read, intel_iosf_sb_write, intel_reg_dumper,
intel_reg_read, intel_reg_snapshot, intel_reg_write, intel_vga_read, and
intel_vga_write have been deprecated in favor of intel_reg. Remove the
deprecated tools. intel_reg does everything they do, and more.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 man/Makefile.am             |    3 -
 man/intel_reg_dumper.man    |   33 -
 man/intel_reg_read.man      |   15 -
 man/intel_reg_snapshot.man  |   15 -
 man/intel_reg_write.man     |   16 -
 tools/Makefile.sources      |    8 -
 tools/intel_iosf_sb_read.c  |  153 ---
 tools/intel_iosf_sb_write.c |  140 --
 tools/intel_reg_dumper.c    | 3020 -------------------------------------------
 tools/intel_reg_read.c      |  145 ---
 tools/intel_reg_snapshot.c  |   56 -
 tools/intel_reg_write.c     |   60 -
 tools/intel_vga_read.c      |   97 --
 tools/intel_vga_write.c     |   97 --
 14 files changed, 3858 deletions(-)
 delete mode 100644 man/intel_reg_dumper.man
 delete mode 100644 man/intel_reg_read.man
 delete mode 100644 man/intel_reg_snapshot.man
 delete mode 100644 man/intel_reg_write.man
 delete mode 100644 tools/intel_iosf_sb_read.c
 delete mode 100644 tools/intel_iosf_sb_write.c
 delete mode 100644 tools/intel_reg_dumper.c
 delete mode 100644 tools/intel_reg_read.c
 delete mode 100644 tools/intel_reg_snapshot.c
 delete mode 100644 tools/intel_reg_write.c
 delete mode 100644 tools/intel_vga_read.c
 delete mode 100644 tools/intel_vga_write.c

Patch
diff mbox

diff --git a/man/Makefile.am b/man/Makefile.am
index ee09156c934e..c42a91beb09b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -10,9 +10,6 @@  appman_PRE = 				\
 	intel_infoframes.man		\
 	intel_lid.man			\
 	intel_panel_fitter.man		\
-	intel_reg_dumper.man		\
-	intel_reg_read.man		\
-	intel_reg_write.man		\
 	intel_stepping.man		\
 	intel_upload_blit_large.man	\
 	intel_upload_blit_large_gtt.man \
diff --git a/man/intel_reg_dumper.man b/man/intel_reg_dumper.man
deleted file mode 100644
index 89f6b9f96072..000000000000
--- a/man/intel_reg_dumper.man
+++ /dev/null
@@ -1,33 +0,0 @@ 
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH intel_reg_dumper __appmansuffix__ __xorgversion__
-.SH NAME
-intel_reg_dumper \- Decode a bunch of Intel GPU registers for debugging
-.SH SYNOPSIS
-.B intel_reg_dumper [ options ] [ file ]
-.SH DESCRIPTION
-.B intel_reg_dumper
-is a tool to read and decode the values of many Intel GPU registers.  It is
-commonly used in debugging video mode setting issues.  If the
-.B file
-argument is present, the registers will be decoded from the given file
-instead of the current registers.  Use the
-.B intel_reg_snapshot
-tool to generate such files.
-
-When the
-.B file
-argument is present and the
-.B -d
-argument is not present,
-.B intel_reg_dumper
-will assume the file was generated on an Ironlake machine.
-.SH OPTIONS
-.TP
-.B -d id
-when a dump file is used, use 'id' as device id (in hex)
-.TP
-.B -h
-prints a help message
-.SH SEE ALSO
-.BR intel_reg_snapshot(1)
diff --git a/man/intel_reg_read.man b/man/intel_reg_read.man
deleted file mode 100644
index cc2bf612eb35..000000000000
--- a/man/intel_reg_read.man
+++ /dev/null
@@ -1,15 +0,0 @@ 
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH intel_reg_read __appmansuffix__ __xorgversion__
-.SH NAME
-intel_reg_read \- Reads an Intel GPU register value
-.SH SYNOPSIS
-.B intel_reg_read \fIregister\fR
-.SH DESCRIPTION
-.B intel_reg_read
-is a tool to read Intel GPU registers, for use in debugging.  The
-\fIregister\fR argument is given as hexadecimal.
-.SH EXAMPLES
-.TP
-intel_reg_read 0x61230
-Shows the register value for the first internal panel fitter.
diff --git a/man/intel_reg_snapshot.man b/man/intel_reg_snapshot.man
deleted file mode 100644
index 1930f613fb26..000000000000
--- a/man/intel_reg_snapshot.man
+++ /dev/null
@@ -1,15 +0,0 @@ 
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH intel_reg_snapshot __appmansuffix__ __xorgversion__
-.SH NAME
-intel_reg_snapshot \- Take a GPU register snapshot
-.SH SYNOPSIS
-.B intel_reg_snapshot
-.SH DESCRIPTION
-.B intel_reg_snapshot
-takes a snapshot of the registers of an Intel GPU, and writes it to standard
-output.  These files can be inspected later with the
-.B intel_reg_dumper
-tool.
-.SH SEE ALSO
-.BR intel_reg_dumper(1)
diff --git a/man/intel_reg_write.man b/man/intel_reg_write.man
deleted file mode 100644
index cb1731c6f04b..000000000000
--- a/man/intel_reg_write.man
+++ /dev/null
@@ -1,16 +0,0 @@ 
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH intel_reg_write __appmansuffix__ __xorgversion__
-.SH NAME
-intel_reg_write \- Set an Intel GPU register to a value
-.SH SYNOPSIS
-.B intel_reg_write \fIregister\fR \fIvalue\fR
-.SH DESCRIPTION
-.B intel_reg_write
-is a tool to set Intel GPU registers to values, for use in speeding up
-debugging.  The \fIregister\fR and \fIvalue\fR arguments are given as
-hexadecimal.
-.SH EXAMPLES
-.TP
-intel_reg_write 0x61230 0x0
-Disables the first internal panel fitter.
diff --git a/tools/Makefile.sources b/tools/Makefile.sources
index 5acf45ad628a..02632c56c6f7 100644
--- a/tools/Makefile.sources
+++ b/tools/Makefile.sources
@@ -21,21 +21,13 @@  bin_PROGRAMS = 				\
 	intel_gpu_top 			\
 	intel_gtt 			\
 	intel_infoframes		\
-	intel_iosf_sb_read		\
-	intel_iosf_sb_write		\
 	intel_l3_parity			\
 	intel_lid			\
 	intel_opregion_decode		\
 	intel_panel_fitter		\
 	intel_perf_counters		\
 	intel_reg_checker 		\
-	intel_reg_dumper 		\
-	intel_reg_read 			\
-	intel_reg_snapshot 		\
-	intel_reg_write 		\
 	intel_stepping 			\
-	intel_vga_read			\
-	intel_vga_write			\
 	intel_watermark
 
 dist_bin_SCRIPTS = intel_gpu_abrt
diff --git a/tools/intel_iosf_sb_read.c b/tools/intel_iosf_sb_read.c
deleted file mode 100644
index 097b0b8afb8d..000000000000
--- a/tools/intel_iosf_sb_read.c
+++ /dev/null
@@ -1,153 +0,0 @@ 
-/*
- * Copyright © 2014 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 <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <err.h>
-#include <string.h>
-#include "intel_io.h"
-#include "intel_chipset.h"
-#include "drmtest.h"
-
-/* keep sorted by name for bsearch() */
-static const struct iosf_sb_port {
-	const char *name;
-	uint8_t port;
-	uint8_t reg_stride;
-} iosf_sb_ports[] = {
-	{ "bunit",   0x03, 1, },
-	{ "cck",     0x14, 1, },
-	{ "ccu",     0xa9, 4, },
-	{ "dpio",    0x12, 4, },
-	{ "dpio2",   0x1a, 4, },
-	{ "flisdsi", 0x1b, 1, },
-	{ "gpio_nc", 0x13, 4, },
-	{ "nc",      0x11, 4, },
-	{ "punit",   0x04, 1, },
-};
-
-static int iosf_sb_port_compare(const void *a, const void *b)
-{
-	const char *name = a;
-	const struct iosf_sb_port *p = b;
-
-	return strcasecmp(name, p->name);
-}
-
-static int iosf_sb_port_parse(const char *name, int *reg_stride)
-{
-	const struct iosf_sb_port *p;
-
-	p = bsearch(name, iosf_sb_ports, ARRAY_SIZE(iosf_sb_ports),
-		    sizeof(iosf_sb_ports[0]),
-		    iosf_sb_port_compare);
-	if (p) {
-		*reg_stride = p->reg_stride;
-		return p->port;
-	}
-
-	*reg_stride = 4;
-	return strtoul(name, NULL, 16);
-}
-
-static void usage(const char *name)
-{
-	int i;
-
-	printf("Warning : This program will work only on Valleyview/Cherryview\n"
-	       "Usage: %s [-h] [-c <count>] [--] <port> <reg> [<reg> ...]\n"
-	       "\t -h : Show this help text\n"
-	       "\t -c <count> : how many consecutive registers to read\n"
-	       "\t <port> : ", name);
-	for (i = 0; i < ARRAY_SIZE(iosf_sb_ports); i++)
-		printf("%s,", iosf_sb_ports[i].name);
-	printf(" or in hex\n"
-	       "\t <reg> : in hex\n");
-}
-
-int main(int argc, char *argv[])
-{
-	uint32_t port, reg, val;
-	struct pci_device *dev = intel_get_pci_device();
-	int i, nregs, count = 1, reg_stride;
-	const char *name;
-
-	fprintf(stderr, "WARNING: Use of %s has been deprecated and replaced by"
-		" intel_reg.\n", argv[0]);
-
-	if (!IS_VALLEYVIEW(dev->device_id) &&
-	    !IS_CHERRYVIEW(dev->device_id)) {
-		usage(argv[0]);
-		return 1;
-	}
-
-	for (;;) {
-		int c = getopt(argc, argv, "hc:");
-
-		if (c == -1)
-			break;
-
-		switch (c) {
-		case 'h':
-			usage(argv[0]);
-			return 0;
-		case 'c':
-			count = strtol(optarg, NULL, 0);
-			if (count < 1) {
-				usage(argv[0]);
-				return 3;
-			}
-			break;
-		}
-	}
-
-	nregs = argc - optind;
-	if (nregs < 1) {
-		usage(argv[0]);
-		return 2;
-	}
-
-	i = optind;
-	name = argv[i++];
-	port = iosf_sb_port_parse(name, &reg_stride);
-
-	intel_register_access_init(dev, 0);
-
-	for (; i < argc; i++) {
-		int j;
-
-		reg = strtoul(argv[i], NULL, 16);
-
-		for (j = 0; j < count; j++) {
-			val = intel_iosf_sb_read(port, reg);
-			printf("0x%02x(%s)/0x%04x : 0x%08x\n", port, name, reg, val);
-			reg += reg_stride;
-		}
-	}
-
-	intel_register_access_fini();
-
-	return 0;
-}
diff --git a/tools/intel_iosf_sb_write.c b/tools/intel_iosf_sb_write.c
deleted file mode 100644
index a091a0d40b77..000000000000
--- a/tools/intel_iosf_sb_write.c
+++ /dev/null
@@ -1,140 +0,0 @@ 
-/*
- * Copyright © 2014 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 <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <err.h>
-#include <string.h>
-#include "intel_io.h"
-#include "intel_chipset.h"
-#include "drmtest.h"
-
-/* keep sorted by name for bsearch() */
-static const struct iosf_sb_port {
-	const char *name;
-	uint8_t port;
-} iosf_sb_ports[] = {
-	{ "bunit",   0x03, },
-	{ "cck",     0x14, },
-	{ "ccu",     0xa9, },
-	{ "dpio",    0x12, },
-	{ "dpio2",   0x1a, },
-	{ "flisdsi", 0x1b, },
-	{ "gpio_nc", 0x13, },
-	{ "nc",      0x11, },
-	{ "punit",   0x04, },
-};
-
-static int iosf_sb_port_compare(const void *a, const void *b)
-{
-	const char *name = a;
-	const struct iosf_sb_port *p = b;
-
-	return strcasecmp(name, p->name);
-}
-
-static int iosf_sb_port_parse(const char *name)
-{
-	const struct iosf_sb_port *p;
-
-	p = bsearch(name, iosf_sb_ports, ARRAY_SIZE(iosf_sb_ports),
-		    sizeof(iosf_sb_ports[0]),
-		    iosf_sb_port_compare);
-	if (p)
-		return p->port;
-
-	return strtoul(name, NULL, 16);
-}
-
-static void usage(const char *name)
-{
-	int i;
-
-	printf("Warning : This program will work only on Valleyview/Cherryview\n"
-	       "Usage: %s [-h] [--] <port> <reg> <val> [<reg> <val> ...]\n"
-	       "\t -h : Show this help text\n"
-	       "\t <port> : ", name);
-	for (i = 0; i < ARRAY_SIZE(iosf_sb_ports); i++)
-		printf("%s,", iosf_sb_ports[i].name);
-	printf(" or in hex\n"
-	       "\t <reg> : in hex\n"
-	       "\t <val> : in hex\n");
-}
-
-int main(int argc, char** argv)
-{
-	uint32_t port, reg, val, tmp;
-	struct pci_device *dev = intel_get_pci_device();
-	int i, nregs;
-	const char *name;
-
-	fprintf(stderr, "WARNING: Use of %s has been deprecated and replaced by"
-		" intel_reg.\n", argv[0]);
-
-	if (!IS_VALLEYVIEW(dev->device_id) &&
-	    !IS_CHERRYVIEW(dev->device_id)) {
-		usage(argv[0]);
-		return 1;
-	}
-
-	for (;;) {
-		int c = getopt(argc, argv, "h");
-
-		if (c == -1)
-			break;
-
-		switch (c) {
-		case 'h':
-			usage(argv[0]);
-			return 0;
-		}
-	}
-
-	nregs = argc - optind;
-	if (nregs < 2) {
-		usage(argv[0]);
-		return 2;
-	}
-
-	i = optind;
-	name = argv[i++];
-	port = iosf_sb_port_parse(name);
-
-	intel_register_access_init(dev, 0);
-
-	for (; i < argc; i += 2) {
-		reg = strtoul(argv[i], NULL, 16);
-		val = strtoul(argv[i+1], NULL, 16);
-
-		tmp = intel_iosf_sb_read(port, reg);
-		printf("0x%02x(%s)/0x%04x before : 0x%08x\n", port, name, reg, tmp);
-		intel_iosf_sb_write(port, reg, val);
-		tmp = intel_iosf_sb_read(port, reg);
-		printf("0x%02x(%s)/0x%04x after  : 0x%08x\n", port, name, reg, tmp);
-	}
-
-	intel_register_access_fini();
-
-	return 0;
-}
diff --git a/tools/intel_reg_dumper.c b/tools/intel_reg_dumper.c
deleted file mode 100644
index f9b4d063006c..000000000000
--- a/tools/intel_reg_dumper.c
+++ /dev/null
@@ -1,3020 +0,0 @@ 
-/*
- * Copyright © 2006,2009 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>
- *
- */
-
-#define _GNU_SOURCE
-#include <ctype.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <err.h>
-#include <unistd.h>
-#include "intel_io.h"
-#include "intel_chipset.h"
-#include "intel_reg.h"
-#include "drmtest.h"
-
-static uint32_t devid = 0;
-
-#define DEBUGSTRING(func) static void func(char *result, int len, int reg, uint32_t val)
-
-DEBUGSTRING(i830_16bit_func)
-{
-	snprintf(result, len, "0x%04x", (uint16_t) val);
-}
-
-DEBUGSTRING(i830_debug_dcc)
-{
-	const char *addressing = NULL;
-
-	if (!IS_MOBILE(devid))
-		return;
-
-	if (IS_965(devid)) {
-		if (val & (1 << 1))
-			addressing = "dual channel interleaved";
-		else
-			addressing = "single or dual channel asymmetric";
-	} else {
-		switch (val & 3) {
-		case 0:
-			addressing = "single channel";
-			break;
-		case 1:
-			addressing = "dual channel asymmetric";
-			break;
-		case 2:
-			addressing = "dual channel interleaved";
-			break;
-		case 3:
-			addressing = "unknown channel layout";
-			break;
-		}
-	}
-
-	snprintf(result, len, "%s, XOR randomization: %sabled, XOR bit: %d",
-		 addressing,
-		 (val & (1 << 10)) ? "dis" : "en",
-		 (val & (1 << 9)) ? 17 : 11);
-}
-
-DEBUGSTRING(i830_debug_chdecmisc)
-{
-	const char *enhmodesel = NULL;
-
-	switch ((val >> 5) & 3) {
-	case 1:
-		enhmodesel = "XOR bank/rank";
-		break;
-	case 2:
-		enhmodesel = "swap bank";
-		break;
-	case 3:
-		enhmodesel = "XOR bank";
-		break;
-	case 0:
-		enhmodesel = "none";
-		break;
-	}
-
-	snprintf(result, len,
-		 "%s, ch2 enh %sabled, ch1 enh %sabled, "
-		 "ch0 enh %sabled, "
-		 "flex %sabled, ep %spresent", enhmodesel,
-		 (val & (1 << 4)) ? "en" : "dis",
-		 (val & (1 << 3)) ? "en" : "dis",
-		 (val & (1 << 2)) ? "en" : "dis",
-		 (val & (1 << 1)) ? "en" : "dis",
-		 (val & (1 << 0)) ? "" : "not ");
-}
-
-DEBUGSTRING(i830_debug_xyminus1)
-{
-	snprintf(result, len, "%d, %d", (val & 0xffff) + 1,
-		 ((val & 0xffff0000) >> 16) + 1);
-}
-
-DEBUGSTRING(i830_debug_yxminus1)
-{
-	snprintf(result, len, "%d, %d", ((val & 0xffff0000) >> 16) + 1,
-		 (val & 0xffff) + 1);
-}
-
-DEBUGSTRING(i830_debug_xy)
-{
-	snprintf(result, len, "%d, %d", (val & 0xffff), ((val & 0xffff0000) >> 16));
-}
-
-DEBUGSTRING(i830_debug_dspstride)
-{
-	snprintf(result, len, "%d bytes", val);
-}
-
-DEBUGSTRING(i830_debug_dspcntr)
-{
-	const char *enabled = val & DISPLAY_PLANE_ENABLE ? "enabled" : "disabled";
-	char plane = val & DISPPLANE_SEL_PIPE_B ? 'B' : 'A';
-	if (HAS_PCH_SPLIT(devid) || IS_BROXTON(devid))
-		snprintf(result, len, "%s", enabled);
-	else
-		snprintf(result, len, "%s, pipe %c", enabled, plane);
-}
-
-DEBUGSTRING(i830_debug_pipeconf)
-{
-	const char *enabled = val & PIPEACONF_ENABLE ? "enabled" : "disabled";
-	const char *bit30;
-	char buf[256];
-	int buf_len;
-
-	if (IS_965(devid))
-		bit30 = val & I965_PIPECONF_ACTIVE ? "active" : "inactive";
-	else
-		bit30 =
-		    val & PIPEACONF_DOUBLE_WIDE ? "double-wide" : "single-wide";
-
-	buf_len = snprintf(buf, sizeof(buf), "%s, %s", enabled, bit30);
-
-	if (HAS_PCH_SPLIT(devid) || IS_BROXTON(devid)) {
-		const char *interlace;
-		int interlace_mode;
-
-		if ((IS_IVYBRIDGE(devid) || IS_HASWELL(devid) ||
-		     IS_BROADWELL(devid) || IS_GEN9(devid)))
-			interlace_mode = (val >> 21) & 3;
-		else
-			interlace_mode = (val >> 21) & 7;
-
-		switch (interlace_mode) {
-		case 0:
-			interlace = "pf-pd";
-			break;
-		case 1:
-			interlace = "pf-id";
-			break;
-		case 3:
-			interlace = "if-id";
-			break;
-		case 4:
-			interlace = "if-id-dbl";
-			break;
-		case 5:
-			interlace = "pf-id-dbl";
-			break;
-		default:
-			interlace = "rsvd";
-			break;
-		}
-		if (buf_len < sizeof(buf))
-			buf_len += snprintf(&buf[buf_len], sizeof(buf) - buf_len,
-					    ", %s", interlace);
-	} else if (IS_GEN4(devid) || IS_VALLEYVIEW(devid) ||
-		   IS_CHERRYVIEW(devid)) {
-		const char *interlace;
-
-		switch ((val >> 21) & 7) {
-		case 0:
-		case 1:
-		case 2:
-		case 3:
-			interlace = "progressive";
-			break;
-		case 4:
-			interlace = "interlaced embedded";
-			break;
-		case 5:
-			interlace = "interlaced";
-			break;
-		case 6:
-			interlace = "interlaced sdvo";
-			break;
-		case 7:
-			interlace = "interlaced legacy";
-			break;
-		}
-		if (buf_len < sizeof(buf))
-			buf_len += snprintf(&buf[buf_len], sizeof(buf) - buf_len,
-					    ", %s", interlace);
-	}
-
-	if (IS_HASWELL(devid) || IS_IVYBRIDGE(devid) ||
-	    IS_GEN6(devid) || IS_GEN5(devid)) {
-		const char *rotation;
-
-		switch ((val >> 14) & 3) {
-		case 0:
-			rotation = "rotate 0";
-			break;
-		case 1:
-			rotation = "rotate 90";
-			break;
-		case 2:
-			rotation = "rotate 180";
-			break;
-		case 3:
-			rotation = "rotate 270";
-			break;
-		}
-		if (buf_len < sizeof(buf))
-			buf_len += snprintf(&buf[buf_len], sizeof(buf) - buf_len,
-					    ", %s", rotation);
-	}
-
-	if (IS_IVYBRIDGE(devid) || IS_GEN6(devid) || IS_GEN5(devid)) {
-		const char *bpc;
-
-		switch (val & (7 << 5)) {
-		case PIPECONF_8BPP:
-			bpc = "8bpc";
-			break;
-		case PIPECONF_10BPP:
-			bpc = "10bpc";
-			break;
-		case PIPECONF_6BPP:
-			bpc = "6bpc";
-			break;
-		case PIPECONF_12BPP:
-			bpc = "12bpc";
-			break;
-		default:
-			bpc = "invalid bpc";
-			break;
-		}
-		if (buf_len < sizeof(buf))
-			buf_len += snprintf(&buf[buf_len], sizeof(buf) - buf_len,
-					    ", %s", bpc);
-	}
-
-	snprintf(result, len, "%s", buf);
-}
-
-DEBUGSTRING(i830_debug_pipestat)
-{
-	const char *_FIFO_UNDERRUN = val & FIFO_UNDERRUN ? " FIFO_UNDERRUN" : "";
-	const char *_CRC_ERROR_ENABLE =
-	    val & CRC_ERROR_ENABLE ? " CRC_ERROR_ENABLE" : "";
-	const char *_CRC_DONE_ENABLE =
-	    val & CRC_DONE_ENABLE ? " CRC_DONE_ENABLE" : "";
-	const char *_GMBUS_EVENT_ENABLE =
-	    val & GMBUS_EVENT_ENABLE ? " GMBUS_EVENT_ENABLE" : "";
-	const char *_VSYNC_INT_ENABLE =
-	    val & VSYNC_INT_ENABLE ? " VSYNC_INT_ENABLE" : "";
-	const char *_DLINE_COMPARE_ENABLE =
-	    val & DLINE_COMPARE_ENABLE ? " DLINE_COMPARE_ENABLE" : "";
-	const char *_DPST_EVENT_ENABLE =
-	    val & DPST_EVENT_ENABLE ? " DPST_EVENT_ENABLE" : "";
-	const char *_LBLC_EVENT_ENABLE =
-	    val & LBLC_EVENT_ENABLE ? " LBLC_EVENT_ENABLE" : "";
-	const char *_OFIELD_INT_ENABLE =
-	    val & OFIELD_INT_ENABLE ? " OFIELD_INT_ENABLE" : "";
-	const char *_EFIELD_INT_ENABLE =
-	    val & EFIELD_INT_ENABLE ? " EFIELD_INT_ENABLE" : "";
-	const char *_SVBLANK_INT_ENABLE =
-	    val & SVBLANK_INT_ENABLE ? " SVBLANK_INT_ENABLE" : "";
-	const char *_VBLANK_INT_ENABLE =
-	    val & VBLANK_INT_ENABLE ? " VBLANK_INT_ENABLE" : "";
-	const char *_OREG_UPDATE_ENABLE =
-	    val & OREG_UPDATE_ENABLE ? " OREG_UPDATE_ENABLE" : "";
-	const char *_CRC_ERROR_INT_STATUS =
-	    val & CRC_ERROR_INT_STATUS ? " CRC_ERROR_INT_STATUS" : "";
-	const char *_CRC_DONE_INT_STATUS =
-	    val & CRC_DONE_INT_STATUS ? " CRC_DONE_INT_STATUS" : "";
-	const char *_GMBUS_INT_STATUS =
-	    val & GMBUS_INT_STATUS ? " GMBUS_INT_STATUS" : "";
-	const char *_VSYNC_INT_STATUS =
-	    val & VSYNC_INT_STATUS ? " VSYNC_INT_STATUS" : "";
-	const char *_DLINE_COMPARE_STATUS =
-	    val & DLINE_COMPARE_STATUS ? " DLINE_COMPARE_STATUS" : "";
-	const char *_DPST_EVENT_STATUS =
-	    val & DPST_EVENT_STATUS ? " DPST_EVENT_STATUS" : "";
-	const char *_LBLC_EVENT_STATUS =
-	    val & LBLC_EVENT_STATUS ? " LBLC_EVENT_STATUS" : "";
-	const char *_OFIELD_INT_STATUS =
-	    val & OFIELD_INT_STATUS ? " OFIELD_INT_STATUS" : "";
-	const char *_EFIELD_INT_STATUS =
-	    val & EFIELD_INT_STATUS ? " EFIELD_INT_STATUS" : "";
-	const char *_SVBLANK_INT_STATUS =
-	    val & SVBLANK_INT_STATUS ? " SVBLANK_INT_STATUS" : "";
-	const char *_VBLANK_INT_STATUS =
-	    val & VBLANK_INT_STATUS ? " VBLANK_INT_STATUS" : "";
-	const char *_OREG_UPDATE_STATUS =
-	    val & OREG_UPDATE_STATUS ? " OREG_UPDATE_STATUS" : "";
-	snprintf(result, len,
-		 "status:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
-		 _FIFO_UNDERRUN,
-		 _CRC_ERROR_ENABLE,
-		 _CRC_DONE_ENABLE,
-		 _GMBUS_EVENT_ENABLE,
-		 _VSYNC_INT_ENABLE,
-		 _DLINE_COMPARE_ENABLE,
-		 _DPST_EVENT_ENABLE,
-		 _LBLC_EVENT_ENABLE,
-		 _OFIELD_INT_ENABLE,
-		 _EFIELD_INT_ENABLE,
-		 _SVBLANK_INT_ENABLE,
-		 _VBLANK_INT_ENABLE,
-		 _OREG_UPDATE_ENABLE,
-		 _CRC_ERROR_INT_STATUS,
-		 _CRC_DONE_INT_STATUS,
-		 _GMBUS_INT_STATUS,
-		 _VSYNC_INT_STATUS,
-		 _DLINE_COMPARE_STATUS,
-		 _DPST_EVENT_STATUS,
-		 _LBLC_EVENT_STATUS,
-		 _OFIELD_INT_STATUS,
-		 _EFIELD_INT_STATUS,
-		 _SVBLANK_INT_STATUS,
-		 _VBLANK_INT_STATUS,
-		 _OREG_UPDATE_STATUS);
-}
-
-DEBUGSTRING(ivb_debug_port)
-{
-	const char *drrs = NULL;
-	switch (val & (2 << 30)) {
-		case PORT_DBG_DRRS_HW_STATE_OFF:
-			drrs = "off";
-			break;
-		case PORT_DBG_DRRS_HW_STATE_LOW:
-			drrs = "low";
-			break;
-		case PORT_DBG_DRRS_HW_STATE_HIGH:
-			drrs = "high";
-			break;
-	}
-	snprintf(result, len, "HW DRRS %s",
-			drrs);
-}
-
-DEBUGSTRING(i830_debug_hvtotal)
-{
-	snprintf(result, len, "%d active, %d total",
-		 (val & 0xffff) + 1,
-		 ((val & 0xffff0000) >> 16) + 1);
-}
-
-DEBUGSTRING(i830_debug_hvsyncblank)
-{
-	snprintf(result, len, "%d start, %d end",
-		 (val & 0xffff) + 1,
-		 ((val & 0xffff0000) >> 16) + 1);
-}
-
-DEBUGSTRING(i830_debug_vgacntrl)
-{
-	snprintf(result, len, "%s",
-		 val & VGA_DISP_DISABLE ? "disabled" : "enabled");
-}
-
-DEBUGSTRING(i830_debug_fp)
-{
-	if (IS_IGD(devid)) {
-		snprintf(result, len, "n = %d, m1 = %d, m2 = %d",
-			 ffs((val & FP_N_IGD_DIV_MASK) >>
-			     FP_N_DIV_SHIFT) - 1,
-			 ((val & FP_M1_DIV_MASK) >> FP_M1_DIV_SHIFT),
-			 ((val & FP_M2_IGD_DIV_MASK) >>
-			  FP_M2_DIV_SHIFT));
-	}
-	snprintf(result, len, "n = %d, m1 = %d, m2 = %d",
-		 ((val & FP_N_DIV_MASK) >> FP_N_DIV_SHIFT),
-		 ((val & FP_M1_DIV_MASK) >> FP_M1_DIV_SHIFT),
-		 ((val & FP_M2_DIV_MASK) >> FP_M2_DIV_SHIFT));
-}
-
-DEBUGSTRING(i830_debug_vga_pd)
-{
-	int vga0_p1, vga0_p2, vga1_p1, vga1_p2;
-
-	/* XXX: i9xx version */
-
-	if (val & VGA0_PD_P1_DIV_2)
-		vga0_p1 = 2;
-	else
-		vga0_p1 = ((val & VGA0_PD_P1_MASK) >> VGA0_PD_P1_SHIFT) + 2;
-	vga0_p2 = (val & VGA0_PD_P2_DIV_4) ? 4 : 2;
-
-	if (val & VGA1_PD_P1_DIV_2)
-		vga1_p1 = 2;
-	else
-		vga1_p1 = ((val & VGA1_PD_P1_MASK) >> VGA1_PD_P1_SHIFT) + 2;
-	vga1_p2 = (val & VGA1_PD_P2_DIV_4) ? 4 : 2;
-
-	snprintf(result, len, "vga0 p1 = %d, p2 = %d, vga1 p1 = %d, p2 = %d",
-			 vga0_p1, vga0_p2, vga1_p1, vga1_p2);
-}
-
-DEBUGSTRING(i830_debug_pp_status)
-{
-	const char *status = val & PP_ON ? "on" : "off";
-	const char *ready = val & PP_READY ? "ready" : "not ready";
-	const char *seq = "unknown";
-
-	switch (val & PP_SEQUENCE_MASK) {
-	case PP_SEQUENCE_NONE:
-		seq = "idle";
-		break;
-	case PP_SEQUENCE_ON:
-		seq = "on";
-		break;
-	case PP_SEQUENCE_OFF:
-		seq = "off";
-		break;
-	}
-
-	snprintf(result, len, "%s, %s, sequencing %s", status, ready, seq);
-}
-
-DEBUGSTRING(i830_debug_pp_control)
-{
-	snprintf(result, len, "power target: %s",
-			 val & POWER_TARGET_ON ? "on" : "off");
-}
-
-DEBUGSTRING(i830_debug_dpll)
-{
-	const char *enabled = val & DPLL_VCO_ENABLE ? "enabled" : "disabled";
-	const char *dvomode = val & DPLL_DVO_HIGH_SPEED ? "dvo" : "non-dvo";
-	const char *vgamode = val & DPLL_VGA_MODE_DIS ? "" : ", VGA";
-	const char *mode = "unknown";
-	const char *clock = "unknown";
-	const char *fpextra = val & DISPLAY_RATE_SELECT_FPA1 ? ", using FPx1!" : "";
-	char sdvoextra[20];
-	int p1, p2 = 0;
-
-	if (IS_GEN2(devid)) {
-		char is_lvds = (INREG(LVDS) & LVDS_PORT_EN) && (reg == DPLL_B);
-
-		if (is_lvds) {
-			mode = "LVDS";
-			p1 = ffs((val & DPLL_FPA01_P1_POST_DIV_MASK_I830_LVDS)
-				 >> DPLL_FPA01_P1_POST_DIV_SHIFT);
-			if ((INREG(LVDS) & LVDS_CLKB_POWER_MASK) ==
-			    LVDS_CLKB_POWER_UP)
-				p2 = 7;
-			else
-				p2 = 14;
-
-		} else {
-			mode = "DAC/serial";
-			if (val & PLL_P1_DIVIDE_BY_TWO) {
-				p1 = 2;
-			} else {
-				/* Map the number in the field to (3, 33) */
-				p1 = ((val & DPLL_FPA01_P1_POST_DIV_MASK_I830)
-				      >> DPLL_FPA01_P1_POST_DIV_SHIFT) + 2;
-			}
-			if (val & PLL_P2_DIVIDE_BY_4)
-				p2 = 4;
-			else
-				p2 = 2;
-		}
-	} else {
-		if (IS_IGD(devid)) {
-			p1 = ffs((val & DPLL_FPA01_P1_POST_DIV_MASK_IGD) >>
-				 DPLL_FPA01_P1_POST_DIV_SHIFT_IGD);
-		} else {
-			p1 = ffs((val & DPLL_FPA01_P1_POST_DIV_MASK) >>
-				 DPLL_FPA01_P1_POST_DIV_SHIFT);
-		}
-		switch (val & DPLL_MODE_MASK) {
-		case DPLLB_MODE_DAC_SERIAL:
-			mode = "DAC/serial";
-			p2 = val & DPLL_DAC_SERIAL_P2_CLOCK_DIV_5 ? 5 : 10;
-			break;
-		case DPLLB_MODE_LVDS:
-			mode = "LVDS";
-			p2 = val & DPLLB_LVDS_P2_CLOCK_DIV_7 ? 7 : 14;
-			break;
-		}
-	}
-
-	switch (val & PLL_REF_INPUT_MASK) {
-	case PLL_REF_INPUT_DREFCLK:
-		clock = "default";
-		break;
-	case PLL_REF_INPUT_TVCLKINA:
-		clock = "TV A";
-		break;
-	case PLL_REF_INPUT_TVCLKINBC:
-		clock = "TV B/C";
-		break;
-	case PLLB_REF_INPUT_SPREADSPECTRUMIN:
-		if (reg == DPLL_B)
-			clock = "spread spectrum";
-		break;
-	}
-
-	if (IS_945(devid)) {
-		sprintf(sdvoextra, ", SDVO mult %d",
-			(int)((val & SDVO_MULTIPLIER_MASK) >>
-			      SDVO_MULTIPLIER_SHIFT_HIRES) + 1);
-	} else {
-		sdvoextra[0] = '\0';
-	}
-
-	snprintf(result, len, "%s, %s%s, %s clock, %s mode, p1 = %d, "
-			 "p2 = %d%s%s",
-			 enabled, dvomode, vgamode, clock, mode, p1, p2,
-			 fpextra, sdvoextra);
-}
-
-DEBUGSTRING(i830_debug_dpll_test)
-{
-	const char *dpllandiv = val & DPLLA_TEST_N_BYPASS ? ", DPLLA N bypassed" : "";
-	const char *dpllamdiv = val & DPLLA_TEST_M_BYPASS ? ", DPLLA M bypassed" : "";
-	const char *dpllainput = val & DPLLA_INPUT_BUFFER_ENABLE ?
-	    "" : ", DPLLA input buffer disabled";
-	const char *dpllbndiv = val & DPLLB_TEST_N_BYPASS ? ", DPLLB N bypassed" : "";
-	const char *dpllbmdiv = val & DPLLB_TEST_M_BYPASS ? ", DPLLB M bypassed" : "";
-	const char *dpllbinput = val & DPLLB_INPUT_BUFFER_ENABLE ?
-	    "" : ", DPLLB input buffer disabled";
-
-	snprintf(result, len, "%s%s%s%s%s%s",
-			 dpllandiv, dpllamdiv, dpllainput,
-			 dpllbndiv, dpllbmdiv, dpllbinput);
-}
-
-DEBUGSTRING(i830_debug_adpa)
-{
-	char disp_pipe = (val & ADPA_PIPE_B_SELECT) ? 'B' : 'A';
-	const char *enable = (val & ADPA_DAC_ENABLE) ? "enabled" : "disabled";
-	char hsync = (val & ADPA_HSYNC_ACTIVE_HIGH) ? '+' : '-';
-	char vsync = (val & ADPA_VSYNC_ACTIVE_HIGH) ? '+' : '-';
-
-	if (HAS_CPT)
-		disp_pipe = val & (1<<29) ? 'B' : 'A';
-
-	if (HAS_PCH_SPLIT(devid))
-		snprintf(result, len, "%s, transcoder %c, %chsync, %cvsync",
-				 enable, disp_pipe, hsync, vsync);
-	else
-		snprintf(result, len, "%s, pipe %c, %chsync, %cvsync",
-				 enable, disp_pipe, hsync, vsync);
-}
-
-DEBUGSTRING(i830_debug_lvds)
-{
-	char disp_pipe = val & LVDS_PIPEB_SELECT ? 'B' : 'A';
-	const char *enable = val & LVDS_PORT_EN ? "enabled" : "disabled";
-	int depth;
-	const char *channels;
-
-	if ((val & LVDS_A3_POWER_MASK) == LVDS_A3_POWER_UP)
-		depth = 24;
-	else
-		depth = 18;
-	if ((val & LVDS_B0B3_POWER_MASK) == LVDS_B0B3_POWER_UP)
-		channels = "2 channels";
-	else
-		channels = "1 channel";
-
-	if (HAS_CPT)
-		disp_pipe = val & (1<<29) ? 'B' : 'A';
-
-	snprintf(result, len, "%s, pipe %c, %d bit, %s",
-			 enable, disp_pipe, depth, channels);
-}
-
-DEBUGSTRING(i830_debug_dvo)
-{
-	const char *enable = val & DVO_ENABLE ? "enabled" : "disabled";
-	char disp_pipe = val & DVO_PIPE_B_SELECT ? 'B' : 'A';
-	const char *stall;
-	char hsync = val & DVO_HSYNC_ACTIVE_HIGH ? '+' : '-';
-	char vsync = val & DVO_VSYNC_ACTIVE_HIGH ? '+' : '-';
-
-	switch (val & DVO_PIPE_STALL_MASK) {
-	case DVO_PIPE_STALL_UNUSED:
-		stall = "no stall";
-		break;
-	case DVO_PIPE_STALL:
-		stall = "stall";
-		break;
-	case DVO_PIPE_STALL_TV:
-		stall = "TV stall";
-		break;
-	default:
-		stall = "unknown stall";
-		break;
-	}
-
-	snprintf(result, len, "%s, pipe %c, %s, %chsync, %cvsync",
-			 enable, disp_pipe, stall, hsync, vsync);
-}
-
-DEBUGSTRING(i830_debug_sdvo)
-{
-	const char *enable = val & SDVO_ENABLE ? "enabled" : "disabled";
-	char disp_pipe = val & SDVO_PIPE_B_SELECT ? 'B' : 'A';
-	const char *stall = val & SDVO_STALL_SELECT ? "enabled" : "disabled";
-	const char *detected = val & SDVO_DETECTED ? "" : "not ";
-	const char *gang = val & SDVOC_GANG_MODE ? ", gang mode" : "";
-	char sdvoextra[20];
-
-	if (IS_915(devid)) {
-		sprintf(sdvoextra, ", SDVO mult %d",
-			(int)((val & SDVO_PORT_MULTIPLY_MASK) >>
-			      SDVO_PORT_MULTIPLY_SHIFT) + 1);
-	} else {
-		sdvoextra[0] = '\0';
-	}
-
-	snprintf(result, len, "%s, pipe %c, stall %s, %sdetected%s%s",
-			 enable, disp_pipe, stall, detected, sdvoextra, gang);
-}
-
-DEBUGSTRING(i830_debug_dspclk_gate_d)
-{
-	const char *DPUNIT_B = val & DPUNIT_B_CLOCK_GATE_DISABLE ? " DPUNIT_B" : "";
-	const char *VSUNIT = val & VSUNIT_CLOCK_GATE_DISABLE ? " VSUNIT" : "";
-	const char *VRHUNIT = val & VRHUNIT_CLOCK_GATE_DISABLE ? " VRHUNIT" : "";
-	const char *VRDUNIT = val & VRDUNIT_CLOCK_GATE_DISABLE ? " VRDUNIT" : "";
-	const char *AUDUNIT = val & AUDUNIT_CLOCK_GATE_DISABLE ? " AUDUNIT" : "";
-	const char *DPUNIT_A = val & DPUNIT_A_CLOCK_GATE_DISABLE ? " DPUNIT_A" : "";
-	const char *DPCUNIT = val & DPCUNIT_CLOCK_GATE_DISABLE ? " DPCUNIT" : "";
-	const char *TVRUNIT = val & TVRUNIT_CLOCK_GATE_DISABLE ? " TVRUNIT" : "";
-	const char *TVCUNIT = val & TVCUNIT_CLOCK_GATE_DISABLE ? " TVCUNIT" : "";
-	const char *TVFUNIT = val & TVFUNIT_CLOCK_GATE_DISABLE ? " TVFUNIT" : "";
-	const char *TVEUNIT = val & TVEUNIT_CLOCK_GATE_DISABLE ? " TVEUNIT" : "";
-	const char *DVSUNIT = val & DVSUNIT_CLOCK_GATE_DISABLE ? " DVSUNIT" : "";
-	const char *DSSUNIT = val & DSSUNIT_CLOCK_GATE_DISABLE ? " DSSUNIT" : "";
-	const char *DDBUNIT = val & DDBUNIT_CLOCK_GATE_DISABLE ? " DDBUNIT" : "";
-	const char *DPRUNIT = val & DPRUNIT_CLOCK_GATE_DISABLE ? " DPRUNIT" : "";
-	const char *DPFUNIT = val & DPFUNIT_CLOCK_GATE_DISABLE ? " DPFUNIT" : "";
-	const char *DPBMUNIT = val & DPBMUNIT_CLOCK_GATE_DISABLE ? " DPBMUNIT" : "";
-	const char *DPLSUNIT = val & DPLSUNIT_CLOCK_GATE_DISABLE ? " DPLSUNIT" : "";
-	const char *DPLUNIT = val & DPLUNIT_CLOCK_GATE_DISABLE ? " DPLUNIT" : "";
-	const char *DPOUNIT = val & DPOUNIT_CLOCK_GATE_DISABLE ? " DPOUNIT" : "";
-	const char *DPBUNIT = val & DPBUNIT_CLOCK_GATE_DISABLE ? " DPBUNIT" : "";
-	const char *DCUNIT = val & DCUNIT_CLOCK_GATE_DISABLE ? " DCUNIT" : "";
-	const char *DPUNIT = val & DPUNIT_CLOCK_GATE_DISABLE ? " DPUNIT" : "";
-	const char *VRUNIT = val & VRUNIT_CLOCK_GATE_DISABLE ? " VRUNIT" : "";
-	const char *OVHUNIT = val & OVHUNIT_CLOCK_GATE_DISABLE ? " OVHUNIT" : "";
-	const char *DPIOUNIT = val & DPIOUNIT_CLOCK_GATE_DISABLE ? " DPIOUNIT" : "";
-	const char *OVFUNIT = val & OVFUNIT_CLOCK_GATE_DISABLE ? " OVFUNIT" : "";
-	const char *OVBUNIT = val & OVBUNIT_CLOCK_GATE_DISABLE ? " OVBUNIT" : "";
-	const char *OVRUNIT = val & OVRUNIT_CLOCK_GATE_DISABLE ? " OVRUNIT" : "";
-	const char *OVCUNIT = val & OVCUNIT_CLOCK_GATE_DISABLE ? " OVCUNIT" : "";
-	const char *OVUUNIT = val & OVUUNIT_CLOCK_GATE_DISABLE ? " OVUUNIT" : "";
-	const char *OVLUNIT = val & OVLUNIT_CLOCK_GATE_DISABLE ? " OVLUNIT" : "";
-
-	snprintf(result, len,
-		 "clock gates disabled:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
-		 DPUNIT_B, VSUNIT, VRHUNIT, VRDUNIT, AUDUNIT, DPUNIT_A, DPCUNIT,
-		 TVRUNIT, TVCUNIT, TVFUNIT, TVEUNIT, DVSUNIT, DSSUNIT, DDBUNIT,
-		 DPRUNIT, DPFUNIT, DPBMUNIT, DPLSUNIT, DPLUNIT, DPOUNIT, DPBUNIT,
-		 DCUNIT, DPUNIT, VRUNIT, OVHUNIT, DPIOUNIT, OVFUNIT, OVBUNIT,
-		 OVRUNIT, OVCUNIT, OVUUNIT, OVLUNIT);
-}
-
-DEBUGSTRING(i810_debug_915_fence)
-{
-	char format = (val & 1 << 12) ? 'Y' : 'X';
-	int pitch = 128 << ((val & 0x70) >> 4);
-	unsigned int offset = val & 0x0ff00000;
-	int size = (1024 * 1024) << ((val & 0x700) >> 8);
-
-	if (IS_965(devid) || (IS_915(devid) && reg >= FENCE_NEW))
-		return;
-
-	if (format == 'X')
-		pitch *= 4;
-	if (val & 1) {
-		snprintf(result, len, "enabled, %c tiled, %4d pitch, 0x%08x - 0x%08x (%dkb)",
-			 format, pitch, offset, offset + size,
-			 size / 1024);
-	} else {
-		snprintf(result, len, "disabled");
-	}
-}
-
-DEBUGSTRING(i810_debug_965_fence_start)
-{
-	const char *enable = (val & FENCE_VALID) ? " enabled" : "disabled";
-	char format = (val & I965_FENCE_Y_MAJOR) ? 'Y' : 'X';
-	int pitch = ((val & 0xffc) >> 2) * 128 + 128;
-	unsigned int offset = val & 0xfffff000;
-
-	if (!IS_965(devid))
-		return;
-
-	snprintf(result, len, "%s, %c tile walk, %4d pitch, 0x%08x start",
-		 enable, format, pitch, offset);
-}
-
-DEBUGSTRING(i810_debug_965_fence_end)
-{
-	unsigned int end = val & 0xfffff000;
-
-	if (!IS_965(devid))
-		return;
-
-	snprintf(result, len, "                                   0x%08x end", end);
-}
-
-#define DEFINEREG(reg) \
-	{ reg, #reg, NULL, 0 }
-#define DEFINEREG_16BIT(reg) \
-	{ reg, #reg, i830_16bit_func, 0 }
-#define DEFINEREG2(reg, func) \
-	{ reg, #reg, func, 0 }
-
-struct reg_debug {
-	int reg;
-	const char *name;
-	void (*debug_output) (char *result, int len, int reg, uint32_t val);
-	uint32_t val;
-};
-
-static struct reg_debug intel_debug_regs[] = {
-	DEFINEREG2(DCC, i830_debug_dcc),
-	DEFINEREG2(CHDECMISC, i830_debug_chdecmisc),
-	DEFINEREG_16BIT(C0DRB0),
-	DEFINEREG_16BIT(C0DRB1),
-	DEFINEREG_16BIT(C0DRB2),
-	DEFINEREG_16BIT(C0DRB3),
-	DEFINEREG_16BIT(C1DRB0),
-	DEFINEREG_16BIT(C1DRB1),
-	DEFINEREG_16BIT(C1DRB2),
-	DEFINEREG_16BIT(C1DRB3),
-	DEFINEREG_16BIT(C0DRA01),
-	DEFINEREG_16BIT(C0DRA23),
-	DEFINEREG_16BIT(C1DRA01),
-	DEFINEREG_16BIT(C1DRA23),
-
-	DEFINEREG(PGETBL_CTL),
-
-	DEFINEREG2(VCLK_DIVISOR_VGA0, i830_debug_fp),
-	DEFINEREG2(VCLK_DIVISOR_VGA1, i830_debug_fp),
-	DEFINEREG2(VCLK_POST_DIV, i830_debug_vga_pd),
-	DEFINEREG2(DPLL_TEST, i830_debug_dpll_test),
-	DEFINEREG(CACHE_MODE_0),
-	DEFINEREG(D_STATE),
-	DEFINEREG2(DSPCLK_GATE_D, i830_debug_dspclk_gate_d),
-	DEFINEREG(RENCLK_GATE_D1),
-	DEFINEREG(RENCLK_GATE_D2),
-/*  DEFINEREG(RAMCLK_GATE_D),	CRL only */
-	DEFINEREG2(SDVOB, i830_debug_sdvo),
-	DEFINEREG2(SDVOC, i830_debug_sdvo),
-/*    DEFINEREG(UDIB_SVB_SHB_CODES), CRL only */
-/*    DEFINEREG(UDIB_SHA_BLANK_CODES), CRL only */
-	DEFINEREG(SDVOUDI),
-	DEFINEREG(DSPARB),
-	DEFINEREG(FW_BLC),
-	DEFINEREG(FW_BLC2),
-	DEFINEREG(FW_BLC_SELF),
-	DEFINEREG(DSPFW1),
-	DEFINEREG(DSPFW2),
-	DEFINEREG(DSPFW3),
-
-	DEFINEREG2(ADPA, i830_debug_adpa),
-	DEFINEREG2(LVDS, i830_debug_lvds),
-	DEFINEREG2(DVOA, i830_debug_dvo),
-	DEFINEREG2(DVOB, i830_debug_dvo),
-	DEFINEREG2(DVOC, i830_debug_dvo),
-	DEFINEREG(DVOA_SRCDIM),
-	DEFINEREG(DVOB_SRCDIM),
-	DEFINEREG(DVOC_SRCDIM),
-
-	DEFINEREG(BLC_PWM_CTL),
-	DEFINEREG(BLC_PWM_CTL2),
-
-	DEFINEREG2(PP_CONTROL, i830_debug_pp_control),
-	DEFINEREG2(PP_STATUS, i830_debug_pp_status),
-	DEFINEREG(PP_ON_DELAYS),
-	DEFINEREG(PP_OFF_DELAYS),
-	DEFINEREG(PP_DIVISOR),
-	DEFINEREG(PFIT_CONTROL),
-	DEFINEREG(PFIT_PGM_RATIOS),
-	DEFINEREG(PORT_HOTPLUG_EN),
-	DEFINEREG(PORT_HOTPLUG_STAT),
-
-	DEFINEREG2(DSPACNTR, i830_debug_dspcntr),
-	DEFINEREG2(DSPASTRIDE, i830_debug_dspstride),
-	DEFINEREG2(DSPAPOS, i830_debug_xy),
-	DEFINEREG2(DSPASIZE, i830_debug_xyminus1),
-	DEFINEREG(DSPABASE),
-	DEFINEREG(DSPASURF),
-	DEFINEREG(DSPATILEOFF),
-	DEFINEREG2(PIPEACONF, i830_debug_pipeconf),
-	DEFINEREG2(PIPEASRC, i830_debug_yxminus1),
-	DEFINEREG2(PIPEASTAT, i830_debug_pipestat),
-	DEFINEREG(PIPEA_GMCH_DATA_M),
-	DEFINEREG(PIPEA_GMCH_DATA_N),
-	DEFINEREG(PIPEA_DP_LINK_M),
-	DEFINEREG(PIPEA_DP_LINK_N),
-	DEFINEREG(CURSOR_A_BASE),
-	DEFINEREG(CURSOR_A_CONTROL),
-	DEFINEREG(CURSOR_A_POSITION),
-
-	DEFINEREG2(FPA0, i830_debug_fp),
-	DEFINEREG2(FPA1, i830_debug_fp),
-	DEFINEREG2(DPLL_A, i830_debug_dpll),
-	DEFINEREG(DPLL_A_MD),
-	DEFINEREG2(HTOTAL_A, i830_debug_hvtotal),
-	DEFINEREG2(HBLANK_A, i830_debug_hvsyncblank),
-	DEFINEREG2(HSYNC_A, i830_debug_hvsyncblank),
-	DEFINEREG2(VTOTAL_A, i830_debug_hvtotal),
-	DEFINEREG2(VBLANK_A, i830_debug_hvsyncblank),
-	DEFINEREG2(VSYNC_A, i830_debug_hvsyncblank),
-	DEFINEREG(BCLRPAT_A),
-	DEFINEREG(VSYNCSHIFT_A),
-
-	DEFINEREG2(DSPBCNTR, i830_debug_dspcntr),
-	DEFINEREG2(DSPBSTRIDE, i830_debug_dspstride),
-	DEFINEREG2(DSPBPOS, i830_debug_xy),
-	DEFINEREG2(DSPBSIZE, i830_debug_xyminus1),
-	DEFINEREG(DSPBBASE),
-	DEFINEREG(DSPBSURF),
-	DEFINEREG(DSPBTILEOFF),
-	DEFINEREG2(PIPEBCONF, i830_debug_pipeconf),
-	DEFINEREG2(PIPEBSRC, i830_debug_yxminus1),
-	DEFINEREG2(PIPEBSTAT, i830_debug_pipestat),
-	DEFINEREG(PIPEB_GMCH_DATA_M),
-	DEFINEREG(PIPEB_GMCH_DATA_N),
-	DEFINEREG(PIPEB_DP_LINK_M),
-	DEFINEREG(PIPEB_DP_LINK_N),
-	DEFINEREG(CURSOR_B_BASE),
-	DEFINEREG(CURSOR_B_CONTROL),
-	DEFINEREG(CURSOR_B_POSITION),
-
-	DEFINEREG2(FPB0, i830_debug_fp),
-	DEFINEREG2(FPB1, i830_debug_fp),
-	DEFINEREG2(DPLL_B, i830_debug_dpll),
-	DEFINEREG(DPLL_B_MD),
-	DEFINEREG2(HTOTAL_B, i830_debug_hvtotal),
-	DEFINEREG2(HBLANK_B, i830_debug_hvsyncblank),
-	DEFINEREG2(HSYNC_B, i830_debug_hvsyncblank),
-	DEFINEREG2(VTOTAL_B, i830_debug_hvtotal),
-	DEFINEREG2(VBLANK_B, i830_debug_hvsyncblank),
-	DEFINEREG2(VSYNC_B, i830_debug_hvsyncblank),
-	DEFINEREG(BCLRPAT_B),
-	DEFINEREG(VSYNCSHIFT_B),
-
-	DEFINEREG(VCLK_DIVISOR_VGA0),
-	DEFINEREG(VCLK_DIVISOR_VGA1),
-	DEFINEREG(VCLK_POST_DIV),
-	DEFINEREG2(VGACNTRL, i830_debug_vgacntrl),
-
-	DEFINEREG(TV_CTL),
-	DEFINEREG(TV_DAC),
-	DEFINEREG(TV_CSC_Y),
-	DEFINEREG(TV_CSC_Y2),
-	DEFINEREG(TV_CSC_U),
-	DEFINEREG(TV_CSC_U2),
-	DEFINEREG(TV_CSC_V),
-	DEFINEREG(TV_CSC_V2),
-	DEFINEREG(TV_CLR_KNOBS),
-	DEFINEREG(TV_CLR_LEVEL),
-	DEFINEREG(TV_H_CTL_1),
-	DEFINEREG(TV_H_CTL_2),
-	DEFINEREG(TV_H_CTL_3),
-	DEFINEREG(TV_V_CTL_1),
-	DEFINEREG(TV_V_CTL_2),
-	DEFINEREG(TV_V_CTL_3),
-	DEFINEREG(TV_V_CTL_4),
-	DEFINEREG(TV_V_CTL_5),
-	DEFINEREG(TV_V_CTL_6),
-	DEFINEREG(TV_V_CTL_7),
-	DEFINEREG(TV_SC_CTL_1),
-	DEFINEREG(TV_SC_CTL_2),
-	DEFINEREG(TV_SC_CTL_3),
-	DEFINEREG(TV_WIN_POS),
-	DEFINEREG(TV_WIN_SIZE),
-	DEFINEREG(TV_FILTER_CTL_1),
-	DEFINEREG(TV_FILTER_CTL_2),
-	DEFINEREG(TV_FILTER_CTL_3),
-	DEFINEREG(TV_CC_CONTROL),
-	DEFINEREG(TV_CC_DATA),
-	DEFINEREG(TV_H_LUMA_0),
-	DEFINEREG(TV_H_LUMA_59),
-	DEFINEREG(TV_H_CHROMA_0),
-	DEFINEREG(TV_H_CHROMA_59),
-
-	DEFINEREG(FBC_CFB_BASE),
-	DEFINEREG(FBC_LL_BASE),
-	DEFINEREG(FBC_CONTROL),
-	DEFINEREG(FBC_COMMAND),
-	DEFINEREG(FBC_STATUS),
-	DEFINEREG(FBC_CONTROL2),
-	DEFINEREG(FBC_FENCE_OFF),
-	DEFINEREG(FBC_MOD_NUM),
-
-	DEFINEREG(MI_MODE),
-	/* DEFINEREG(MI_DISPLAY_POWER_DOWN), CRL only */
-	DEFINEREG(MI_ARB_STATE),
-	DEFINEREG(MI_RDRET_STATE),
-	DEFINEREG(ECOSKPD),
-
-	DEFINEREG(DP_B),
-	DEFINEREG(DPB_AUX_CH_CTL),
-	DEFINEREG(DPB_AUX_CH_DATA1),
-	DEFINEREG(DPB_AUX_CH_DATA2),
-	DEFINEREG(DPB_AUX_CH_DATA3),
-	DEFINEREG(DPB_AUX_CH_DATA4),
-	DEFINEREG(DPB_AUX_CH_DATA5),
-
-	DEFINEREG(DP_C),
-	DEFINEREG(DPC_AUX_CH_CTL),
-	DEFINEREG(DPC_AUX_CH_DATA1),
-	DEFINEREG(DPC_AUX_CH_DATA2),
-	DEFINEREG(DPC_AUX_CH_DATA3),
-	DEFINEREG(DPC_AUX_CH_DATA4),
-	DEFINEREG(DPC_AUX_CH_DATA5),
-
-	DEFINEREG(DP_D),
-	DEFINEREG(DPD_AUX_CH_CTL),
-	DEFINEREG(DPD_AUX_CH_DATA1),
-	DEFINEREG(DPD_AUX_CH_DATA2),
-	DEFINEREG(DPD_AUX_CH_DATA3),
-	DEFINEREG(DPD_AUX_CH_DATA4),
-	DEFINEREG(DPD_AUX_CH_DATA5),
-
-	DEFINEREG(AUD_CONFIG),
-	DEFINEREG(AUD_HDMIW_STATUS),
-	DEFINEREG(AUD_CONV_CHCNT),
-	DEFINEREG(VIDEO_DIP_CTL),
-	DEFINEREG(AUD_PINW_CNTR),
-	DEFINEREG(AUD_CNTL_ST),
-	DEFINEREG(AUD_PIN_CAP),
-	DEFINEREG(AUD_PINW_CAP),
-	DEFINEREG(AUD_PINW_UNSOLRESP),
-	DEFINEREG(AUD_OUT_DIG_CNVT),
-	DEFINEREG(AUD_OUT_CWCAP),
-	DEFINEREG(AUD_GRP_CAP),
-
-#define DEFINEFENCE_915(i) \
-	{ FENCE+i*4, "FENCE  " #i, i810_debug_915_fence, 0 }
-#define DEFINEFENCE_945(i)						\
-	{ FENCE_NEW+(i - 8) * 4, "FENCE  " #i, i810_debug_915_fence, 0 }
-
-	DEFINEFENCE_915(0),
-	DEFINEFENCE_915(1),
-	DEFINEFENCE_915(2),
-	DEFINEFENCE_915(3),
-	DEFINEFENCE_915(4),
-	DEFINEFENCE_915(5),
-	DEFINEFENCE_915(6),
-	DEFINEFENCE_915(7),
-	DEFINEFENCE_945(8),
-	DEFINEFENCE_945(9),
-	DEFINEFENCE_945(10),
-	DEFINEFENCE_945(11),
-	DEFINEFENCE_945(12),
-	DEFINEFENCE_945(13),
-	DEFINEFENCE_945(14),
-	DEFINEFENCE_945(15),
-
-#define DEFINEFENCE_965(i) \
-	{ FENCE_NEW+i*8, "FENCE START " #i, i810_debug_965_fence_start, 0 }, \
-	{ FENCE_NEW+i*8+4, "FENCE END " #i, i810_debug_965_fence_end, 0 }
-
-	DEFINEFENCE_965(0),
-	DEFINEFENCE_965(1),
-	DEFINEFENCE_965(2),
-	DEFINEFENCE_965(3),
-	DEFINEFENCE_965(4),
-	DEFINEFENCE_965(5),
-	DEFINEFENCE_965(6),
-	DEFINEFENCE_965(7),
-	DEFINEFENCE_965(8),
-	DEFINEFENCE_965(9),
-	DEFINEFENCE_965(10),
-	DEFINEFENCE_965(11),
-	DEFINEFENCE_965(12),
-	DEFINEFENCE_965(13),
-	DEFINEFENCE_965(14),
-	DEFINEFENCE_965(15),
-
-	DEFINEREG(INST_PM),
-};
-
-DEBUGSTRING(ironlake_debug_rr_hw_ctl)
-{
-	snprintf(result, len, "low %d, high %d", val & RR_HW_LOW_POWER_FRAMES_MASK,
-		 (val & RR_HW_HIGH_POWER_FRAMES_MASK) >> 8);
-}
-
-DEBUGSTRING(ironlake_debug_m_tu)
-{
-	snprintf(result, len, "TU %d, val 0x%x %d", (val >> 25) + 1, val & 0xffffff,
-		 val & 0xffffff);
-}
-
-DEBUGSTRING(ironlake_debug_n)
-{
-	snprintf(result, len, "val 0x%x %d", val & 0xffffff, val & 0xffffff);
-}
-
-DEBUGSTRING(ironlake_debug_fdi_tx_ctl)
-{
-	const char *train = NULL, *voltage = NULL, *pre_emphasis = NULL, *portw =
-	    NULL;
-
-	switch (val & FDI_LINK_TRAIN_NONE) {
-	case FDI_LINK_TRAIN_PATTERN_1:
-		train = "pattern_1";
-		break;
-	case FDI_LINK_TRAIN_PATTERN_2:
-		train = "pattern_2";
-		break;
-	case FDI_LINK_TRAIN_PATTERN_IDLE:
-		train = "pattern_idle";
-		break;
-	case FDI_LINK_TRAIN_NONE:
-		train = "not train";
-		break;
-	}
-
-	if (HAS_CPT) {
-		/* SNB B0 */
-		switch (val & (0x3f << 22)) {
-		case FDI_LINK_TRAIN_400MV_0DB_SNB_B:
-			voltage = "0.4V";
-			pre_emphasis = "0dB";
-			break;
-		case FDI_LINK_TRAIN_400MV_6DB_SNB_B:
-			voltage = "0.4V";
-			pre_emphasis = "6dB";
-			break;
-		case FDI_LINK_TRAIN_600MV_3_5DB_SNB_B:
-			voltage = "0.6V";
-			pre_emphasis = "3.5dB";
-			break;
-		case FDI_LINK_TRAIN_800MV_0DB_SNB_B:
-			voltage = "0.8V";
-			pre_emphasis = "0dB";
-			break;
-		}
-
-	} else {
-
-		switch (val & (7 << 25)) {
-			case FDI_LINK_TRAIN_VOLTAGE_0_4V:
-				voltage = "0.4V";
-				break;
-			case FDI_LINK_TRAIN_VOLTAGE_0_6V:
-				voltage = "0.6V";
-				break;
-			case FDI_LINK_TRAIN_VOLTAGE_0_8V:
-				voltage = "0.8V";
-				break;
-			case FDI_LINK_TRAIN_VOLTAGE_1_2V:
-				voltage = "1.2V";
-				break;
-			default:
-				voltage = "reserved";
-		}
-
-		switch (val & (7 << 22)) {
-			case FDI_LINK_TRAIN_PRE_EMPHASIS_NONE:
-				pre_emphasis = "none";
-				break;
-			case FDI_LINK_TRAIN_PRE_EMPHASIS_1_5X:
-				pre_emphasis = "1.5x";
-				break;
-			case FDI_LINK_TRAIN_PRE_EMPHASIS_2X:
-				pre_emphasis = "2x";
-				break;
-			case FDI_LINK_TRAIN_PRE_EMPHASIS_3X:
-				pre_emphasis = "3x";
-				break;
-			default:
-				pre_emphasis = "reserved";
-		}
-
-	}
-
-	switch (val & (7 << 19)) {
-	case FDI_DP_PORT_WIDTH_X1:
-		portw = "X1";
-		break;
-	case FDI_DP_PORT_WIDTH_X2:
-		portw = "X2";
-		break;
-	case FDI_DP_PORT_WIDTH_X3:
-		portw = "X3";
-		break;
-	case FDI_DP_PORT_WIDTH_X4:
-		portw = "X4";
-		break;
-	}
-
-	snprintf(result, len, "%s, train pattern %s, voltage swing %s,"
-		 "pre-emphasis %s, port width %s, enhanced framing %s, FDI PLL %s, scrambing %s, master mode %s",
-		 val & FDI_TX_ENABLE ? "enable" : "disable",
-		 train, voltage, pre_emphasis, portw,
-		 val & FDI_TX_ENHANCE_FRAME_ENABLE ? "enable" :
-		 "disable",
-		 val & FDI_TX_PLL_ENABLE ? "enable" : "disable",
-		 val & (1 << 7) ? "disable" : "enable",
-		 val & (1 << 0) ? "enable" : "disable");
-}
-
-DEBUGSTRING(ironlake_debug_fdi_rx_ctl)
-{
-	const char *train = NULL, *portw = NULL, *bpc = NULL;
-
-	if (HAS_CPT) {
-		switch (val & FDI_LINK_TRAIN_PATTERN_MASK_CPT) {
-		case FDI_LINK_TRAIN_PATTERN_1_CPT:
-			train = "pattern_1";
-			break;
-		case FDI_LINK_TRAIN_PATTERN_2_CPT:
-			train = "pattern_2";
-			break;
-		case FDI_LINK_TRAIN_PATTERN_IDLE_CPT:
-			train = "pattern_idle";
-			break;
-		case FDI_LINK_TRAIN_NORMAL_CPT:
-			train = "not train";
-			break;
-		}
-	} else {
-		switch (val & FDI_LINK_TRAIN_NONE) {
-		case FDI_LINK_TRAIN_PATTERN_1:
-			train = "pattern_1";
-			break;
-		case FDI_LINK_TRAIN_PATTERN_2:
-			train = "pattern_2";
-			break;
-		case FDI_LINK_TRAIN_PATTERN_IDLE:
-			train = "pattern_idle";
-			break;
-		case FDI_LINK_TRAIN_NONE:
-			train = "not train";
-			break;
-		}
-	}
-
-	switch (val & (7 << 19)) {
-	case FDI_DP_PORT_WIDTH_X1:
-		portw = "X1";
-		break;
-	case FDI_DP_PORT_WIDTH_X2:
-		portw = "X2";
-		break;
-	case FDI_DP_PORT_WIDTH_X3:
-		portw = "X3";
-		break;
-	case FDI_DP_PORT_WIDTH_X4:
-		portw = "X4";
-		break;
-	}
-
-	switch (val & (7 << 16)) {
-	case FDI_8BPC:
-		bpc = "8bpc";
-		break;
-	case FDI_10BPC:
-		bpc = "10bpc";
-		break;
-	case FDI_6BPC:
-		bpc = "6bpc";
-		break;
-	case FDI_12BPC:
-		bpc = "12bpc";
-		break;
-	}
-
-	snprintf(result, len, "%s, train pattern %s, port width %s, %s,"
-		 "link_reverse_strap_overwrite %s, dmi_link_reverse %s, FDI PLL %s,"
-		 "FS ecc %s, FE ecc %s, FS err report %s, FE err report %s,"
-		 "scrambing %s, enhanced framing %s, %s",
-		 val & FDI_RX_ENABLE ? "enable" : "disable",
-		 train, portw, bpc,
-		 val & FDI_LINK_REVERSE_OVERWRITE ? "yes" : "no",
-		 val & FDI_DMI_LINK_REVERSE_MASK ? "yes" : "no",
-		 val & FDI_RX_PLL_ENABLE ? "enable" : "disable",
-		 val & FDI_FS_ERR_CORRECT_ENABLE ? "enable" : "disable",
-		 val & FDI_FE_ERR_CORRECT_ENABLE ? "enable" : "disable",
-		 val & FDI_FS_ERR_REPORT_ENABLE ? "enable" : "disable",
-		 val & FDI_FE_ERR_REPORT_ENABLE ? "enable" : "disable",
-		 val & (1 << 7) ? "disable" : "enable",
-		 val & FDI_RX_ENHANCE_FRAME_ENABLE ? "enable" :
-		 "disable", val & FDI_SEL_PCDCLK ? "PCDClk" : "RawClk");
-}
-
-DEBUGSTRING(ironlake_debug_dspstride)
-{
-	snprintf(result, len, "%d", val >> 6);
-}
-
-DEBUGSTRING(ironlake_debug_pch_dpll)
-{
-	const char *enable = val & DPLL_VCO_ENABLE ? "enable" : "disable";
-	const char *highspeed = val & DPLL_DVO_HIGH_SPEED ? "yes" : "no";
-	const char *mode = NULL;
-	const char *p2 = NULL;
-	int fpa0_p1, fpa1_p1;
-	const char *refclk = NULL;
-	int sdvo_mul;
-
-	if ((val & DPLLB_MODE_LVDS) == DPLLB_MODE_LVDS) {
-		mode = "LVDS";
-		if (val & DPLLB_LVDS_P2_CLOCK_DIV_7)
-			p2 = "Div 7";
-		else
-			p2 = "Div 14";
-	} else if ((val & DPLLB_MODE_LVDS) == DPLLB_MODE_DAC_SERIAL) {
-		mode = "Non-LVDS";
-		if (val & DPLL_DAC_SERIAL_P2_CLOCK_DIV_5)
-			p2 = "Div 5";
-		else
-			p2 = "Div 10";
-	}
-	fpa0_p1 = ffs((val & DPLL_FPA01_P1_POST_DIV_MASK) >> 16);
-	fpa1_p1 = ffs((val & DPLL_FPA1_P1_POST_DIV_MASK));
-
-	switch (val & PLL_REF_INPUT_MASK) {
-	case PLL_REF_INPUT_DREFCLK:
-		refclk = "default 120Mhz";
-		break;
-	case PLL_REF_INPUT_SUPER_SSC:
-		refclk = "SuperSSC 120Mhz";
-		break;
-	case PLL_REF_INPUT_TVCLKINBC:
-		refclk = "SDVO TVClkIn";
-		break;
-	case PLLB_REF_INPUT_SPREADSPECTRUMIN:
-		refclk = "SSC";
-		break;
-	case PLL_REF_INPUT_DMICLK:
-		refclk = "DMI RefCLK";
-		break;
-	}
-
-	sdvo_mul = ((val & PLL_REF_SDVO_HDMI_MULTIPLIER_MASK) >> 9) + 1;
-
-	snprintf(result, len, "%s, sdvo high speed %s, mode %s, p2 %s, "
-		 "FPA0 P1 %d, FPA1 P1 %d, refclk %s, sdvo/hdmi mul %d",
-		 enable, highspeed, mode, p2, fpa0_p1, fpa1_p1, refclk,
-		 sdvo_mul);
-}
-
-DEBUGSTRING(ironlake_debug_dref_ctl)
-{
-	const char *cpu_source;
-	const char *ssc_source = val & DREF_SSC_SOURCE_ENABLE ? "enable" : "disable";
-	const char *nonspread_source =
-	    val & DREF_NONSPREAD_SOURCE_ENABLE ? "enable" : "disable";
-	const char *superspread_source =
-	    val & DREF_SUPERSPREAD_SOURCE_ENABLE ? "enable" : "disable";
-	const char *ssc4_mode =
-	    val & DREF_SSC4_CENTERSPREAD ? "centerspread" : "downspread";
-	const char *ssc1 = val & DREF_SSC1_ENABLE ? "enable" : "disable";
-	const char *ssc4 = val & DREF_SSC4_ENABLE ? "enable" : "disable";
-
-	switch (val & DREF_CPU_SOURCE_OUTPUT_NONSPREAD) {
-	case DREF_CPU_SOURCE_OUTPUT_DISABLE:
-		cpu_source = "disable";
-		break;
-	case DREF_CPU_SOURCE_OUTPUT_DOWNSPREAD:
-		cpu_source = "downspread";
-		break;
-	case DREF_CPU_SOURCE_OUTPUT_NONSPREAD:
-		cpu_source = "nonspread";
-		break;
-	default:
-		cpu_source = "reserved";
-	}
-	snprintf(result, len, "cpu source %s, ssc_source %s, nonspread_source %s, "
-		 "superspread_source %s, ssc4_mode %s, ssc1 %s, ssc4 %s",
-		 cpu_source, ssc_source, nonspread_source,
-		 superspread_source, ssc4_mode, ssc1, ssc4);
-}
-
-DEBUGSTRING(ironlake_debug_rawclk_freq)
-{
-	const char *tp1 = NULL, *tp2 = NULL;
-
-	switch (val & FDL_TP1_TIMER_MASK) {
-	case 0:
-		tp1 = "0.5us";
-		break;
-	case (1 << 12):
-		tp1 = "1.0us";
-		break;
-	case (2 << 12):
-		tp1 = "2.0us";
-		break;
-	case (3 << 12):
-		tp1 = "4.0us";
-		break;
-	}
-	switch (val & FDL_TP2_TIMER_MASK) {
-	case 0:
-		tp2 = "1.5us";
-		break;
-	case (1 << 10):
-		tp2 = "3.0us";
-		break;
-	case (2 << 10):
-		tp2 = "6.0us";
-		break;
-	case (3 << 10):
-		tp2 = "12.0us";
-		break;
-	}
-	snprintf(result, len, "FDL_TP1 timer %s, FDL_TP2 timer %s, freq %d",
-		 tp1, tp2, val & RAWCLK_FREQ_MASK);
-
-}
-
-DEBUGSTRING(ironlake_debug_fdi_rx_misc)
-{
-	snprintf(result, len, "FDI Delay %d", val & ((1 << 13) - 1));
-}
-
-DEBUGSTRING(ironlake_debug_transconf)
-{
-	const char *enable = val & TRANS_ENABLE ? "enable" : "disable";
-	const char *state = val & TRANS_STATE_ENABLE ? "active" : "inactive";
-	const char *interlace;
-
-	switch ((val >> 21) & 7) {
-	case 0:
-		interlace = "progressive";
-		break;
-	case 2:
-		if (IS_GEN5(devid))
-			interlace = "interlaced sdvo";
-		else
-			interlace = "rsvd";
-		break;
-	case 3:
-		interlace = "interlaced";
-		break;
-	default:
-		interlace = "rsvd";
-	}
-
-	snprintf(result, len, "%s, %s, %s", enable, state, interlace);
-}
-
-DEBUGSTRING(ironlake_debug_panel_fitting)
-{
-	const char *vadapt = NULL, *filter_sel = NULL;
-
-	switch (val & (3 << 25)) {
-	case 0:
-		vadapt = "least";
-		break;
-	case (1 << 25):
-		vadapt = "moderate";
-		break;
-	case (2 << 25):
-		vadapt = "reserved";
-		break;
-	case (3 << 25):
-		vadapt = "most";
-		break;
-	}
-
-	switch (val & (3 << 23)) {
-	case 0:
-		filter_sel = "programmed";
-		break;
-	case (1 << 23):
-		filter_sel = "hardcoded";
-		break;
-	case (2 << 23):
-		filter_sel = "edge_enhance";
-		break;
-	case (3 << 23):
-		filter_sel = "edge_soften";
-		break;
-	}
-
-	snprintf(result, len,
-		 "%s, auto_scale %s, auto_scale_cal %s, v_filter %s, vadapt %s, mode %s, filter_sel %s,"
-		 "chroma pre-filter %s, vert3tap %s, v_inter_invert %s",
-		 val & PF_ENABLE ? "enable" : "disable",
-		 val & (1 << 30) ? "no" : "yes",
-		 val & (1 << 29) ? "yes" : "no",
-		 val & (1 << 28) ? "bypass" : "enable",
-		 val & (1 << 27) ? "enable" : "disable",
-		 vadapt,
-		 filter_sel,
-		 val & (1 << 22) ? "enable" : "disable",
-		 val & (1 << 21) ? "force" : "auto",
-		 val & (1 << 20) ? "field 0" : "field 1");
-}
-
-DEBUGSTRING(ironlake_debug_panel_fitting_2)
-{
-	snprintf(result, len,
-		 "vscale %f",
-		 val / (float) (1<<15));
-}
-
-DEBUGSTRING(ironlake_debug_panel_fitting_3)
-{
-	snprintf(result, len,
-		 "vscale initial phase %f",
-		 val / (float) (1<<15));
-}
-
-DEBUGSTRING(ironlake_debug_panel_fitting_4)
-{
-	snprintf(result, len,
-		 "hscale %f",
-		 val / (float) (1<<15));
-}
-
-DEBUGSTRING(ironlake_debug_pf_win)
-{
-	int a, b;
-
-	a = (val >> 16) & 0x1fff;
-	b = val & 0xfff;
-
-	snprintf(result, len, "%d, %d", a, b);
-}
-
-DEBUGSTRING(ironlake_debug_hdmi)
-{
-	int disp_pipe;
-	const char *enable, *bpc = NULL, *encoding;
-	const char *mode, *audio, *vsync, *hsync, *detect;
-
-	if (val & PORT_ENABLE)
-		enable = "enabled";
-	else
-		enable = "disabled";
-
-	if (HAS_CPT)
-		disp_pipe = (val & (3<<29)) >> 29;
-	else
-		disp_pipe = (val & TRANSCODER_B) >> 29;
-
-	switch (val & (7 << 26)) {
-	case COLOR_FORMAT_8bpc:
-		bpc = "8bpc";
-		break;
-	case COLOR_FORMAT_12bpc:
-		bpc = "12bpc";
-		break;
-	}
-
-	if ((val & (3 << 10)) == TMDS_ENCODING)
-		encoding = "TMDS";
-	else
-		encoding = "SDVO";
-
-	if (val & (1 << 9))
-		mode = "HDMI";
-	else
-		mode = "DVI";
-
-	if (val & AUDIO_ENABLE)
-		audio = "enabled";
-	else
-		audio = "disabled";
-
-	if (val & VSYNC_ACTIVE_HIGH)
-		vsync = "+vsync";
-	else
-		vsync = "-vsync";
-
-	if (val & HSYNC_ACTIVE_HIGH)
-		hsync = "+hsync";
-	else
-		hsync = "-hsync";
-
-	if (val & PORT_DETECTED)
-		detect = "detected";
-	else
-		detect = "non-detected";
-
-	snprintf(result, len, "%s pipe %c %s %s %s audio %s %s %s %s",
-		 enable, disp_pipe + 'A', bpc, encoding, mode, audio, vsync, hsync, detect);
-}
-
-DEBUGSTRING(snb_debug_dpll_sel)
-{
-	const char *transa, *transb;
-	const char *dplla = NULL, *dpllb = NULL;
-
-	if (!HAS_CPT)
-		return;
-
-	if (val & TRANSA_DPLL_ENABLE) {
-		transa = "enable";
-		if (val & TRANSA_DPLLB_SEL)
-			dplla = "B";
-		else
-			dplla = "A";
-	} else
-		transa = "disable";
-
-	if (val & TRANSB_DPLL_ENABLE) {
-		transb = "enable";
-		if (val & TRANSB_DPLLB_SEL)
-			dpllb = "B";
-		else
-			dpllb = "A";
-	} else
-		transb = "disable";
-
-	snprintf(result, len, "TransA DPLL %s (DPLL %s), TransB DPLL %s (DPLL %s)",
-		 transa, dplla, transb, dpllb);
-}
-
-DEBUGSTRING(snb_debug_trans_dp_ctl)
-{
-	const char *enable, *port = NULL, *bpc = NULL, *vsync, *hsync;
-
-	if (!HAS_CPT)
-		return;
-
-	if (val & TRANS_DP_OUTPUT_ENABLE)
-		enable = "enable";
-	else
-		enable = "disable";
-
-	switch (val & TRANS_DP_PORT_SEL_MASK) {
-	case TRANS_DP_PORT_SEL_B:
-		port = "B";
-		break;
-	case TRANS_DP_PORT_SEL_C:
-		port = "C";
-		break;
-	case TRANS_DP_PORT_SEL_D:
-		port = "D";
-		break;
-	default:
-		port = "none";
-		break;
-	}
-
-	switch (val & (7<<9)) {
-	case TRANS_DP_8BPC:
-		bpc = "8bpc";
-		break;
-	case TRANS_DP_10BPC:
-		bpc = "10bpc";
-		break;
-	case TRANS_DP_6BPC:
-		bpc = "6bpc";
-		break;
-	case TRANS_DP_12BPC:
-		bpc = "12bpc";
-		break;
-	}
-
-	if (val & TRANS_DP_VSYNC_ACTIVE_HIGH)
-		vsync = "+vsync";
-	else
-		vsync = "-vsync";
-
-	if (val & TRANS_DP_HSYNC_ACTIVE_HIGH)
-		hsync = "+hsync";
-	else
-		hsync = "-hsync";
-
-	snprintf(result, len, "%s port %s %s %s %s",
-		 enable, port, bpc, vsync, hsync);
-}
-
-DEBUGSTRING(ilk_debug_pp_control)
-{
-	snprintf(result, len, "blacklight %s, %spower down on reset, panel %s",
-		 (val & (1 << 2)) ? "enabled" : "disabled",
-		 (val & (1 << 1)) ? "" : "do not ",
-		 (val & (1 << 0)) ? "on" : "off");
-}
-
-DEBUGSTRING(hsw_debug_port_clk_sel)
-{
-	const char *clock = NULL;
-
-	switch ((val >> 29 ) & 7) {
-	case 0:
-		clock = "LCPLL 2700";
-		break;
-	case 1:
-		clock = "LCPLL 1350";
-		break;
-	case 2:
-		clock = "LCPLL 810";
-		break;
-	case 3:
-		clock = "SPLL";
-		break;
-	case 4:
-		clock = "WRPLL 1";
-		break;
-	case 5:
-		clock = "WRPLL 2";
-		break;
-	case 6:
-		clock = "Reserved";
-		break;
-	case 7:
-		clock = "None";
-		break;
-	}
-
-	snprintf(result, len, "%s", clock);
-}
-
-DEBUGSTRING(hsw_debug_pipe_clk_sel)
-{
-	const char *clock;
-
-	switch ((val >> 29) & 7) {
-	case 0:
-		clock = "None";
-		break;
-	case 2:
-		clock = "DDIB";
-		break;
-	case 3:
-		clock = "DDIC";
-		break;
-	case 4:
-		clock = "DDID";
-		break;
-	case 5:
-		clock = "DDIE";
-		break;
-	default:
-		clock = "Reserved";
-		break;
-	}
-
-	snprintf(result, len, "%s", clock);
-}
-
-DEBUGSTRING(hsw_debug_ddi_buf_ctl)
-{
-	const char *enable, *reversal, *width, *detected;
-
-	enable = (val & (1<<31)) ? "enabled" : "disabled";
-	reversal = (val & (1<<16)) ? "reversed" : "not reversed";
-
-	switch ((val >> 1) & 7) {
-	case 0:
-		width = "x1";
-		break;
-	case 1:
-		width = "x2";
-		break;
-	case 3:
-		width = "x4";
-		break;
-	default:
-		width = "reserved";
-		break;
-	}
-
-	detected = (val & 1) ? "detected" : "not detected";
-
-	snprintf(result, len, "%s %s %s %s", enable, reversal, width, detected);
-}
-
-DEBUGSTRING(hsw_debug_sfuse_strap)
-{
-	const char *display, *crt, *lane_reversal, *portb, *portc, *portd;
-
-	display = (val & (1<<7)) ? "disabled" : "enabled";
-	crt = (val & (1<<6)) ? "yes" : "no";
-	lane_reversal = (val & (1<<4)) ? "yes" : "no";
-	portb = (val & (1<<2)) ? "yes" : "no";
-	portc = (val & (1<<1)) ? "yes" : "no";
-	portd = (val & (1<<0)) ? "yes" : "no";
-
-	snprintf(result, len, "display %s, crt %s, lane reversal %s, "
-		 "port b %s, port c %s, port d %s", display, crt, lane_reversal,
-		 portb, portc, portd);
-}
-
-DEBUGSTRING(hsw_debug_pipe_ddi_func_ctl)
-{
-	const char *enable, *port, *mode, *bpc, *vsync, *hsync, *edp_input;
-	const char *width;
-
-	enable = (val & (1<<31)) ? "enabled" : "disabled";
-
-	switch ((val >> 28) & 7) {
-	case 0:
-		port = "no port";
-		break;
-	case 1:
-		port = "DDIB";
-		break;
-	case 2:
-		port = "DDIC";
-		break;
-	case 3:
-		port = "DDID";
-		break;
-	case 4:
-		port = "DDIE";
-		break;
-	default:
-		port = "port reserved";
-		break;
-	}
-
-	switch ((val >> 24) & 7) {
-	case 0:
-		mode = "HDMI";
-		break;
-	case 1:
-		mode = "DVI";
-		break;
-	case 2:
-		mode = "DP SST";
-		break;
-	case 3:
-		mode = "DP MST";
-		break;
-	case 4:
-		mode = "FDI";
-		break;
-	case 5:
-	default:
-		mode = "mode reserved";
-		break;
-	}
-
-	switch ((val >> 20) & 7) {
-	case 0:
-		bpc = "8 bpc";
-		break;
-	case 1:
-		bpc = "10 bpc";
-		break;
-	case 2:
-		bpc = "6 bpc";
-		break;
-	case 3:
-		bpc = "12 bpc";
-		break;
-	default:
-		bpc = "bpc reserved";
-		break;
-	}
-
-	hsync = (val & (1<<16)) ? "+HSync" : "-HSync";
-	vsync = (val & (1<<17)) ? "+VSync" : "-VSync";
-
-	switch ((val >> 12) & 7) {
-	case 0:
-		edp_input = "EDP A ON";
-		break;
-	case 4:
-		edp_input = "EDP A ONOFF";
-		break;
-	case 5:
-		edp_input = "EDP B ONOFF";
-		break;
-	case 6:
-		edp_input = "EDP C ONOFF";
-		break;
-	default:
-		edp_input = "EDP input reserved";
-		break;
-	}
-
-	switch ((val >> 1) & 7) {
-	case 0:
-		width = "x1";
-		break;
-	case 1:
-		width = "x2";
-		break;
-	case 3:
-		width = "x4";
-		break;
-	default:
-		width = "reserved width";
-		break;
-	}
-
-	snprintf(result, len, "%s, %s, %s, %s, %s, %s, %s, %s", enable,
-		 port, mode, bpc, vsync, hsync, edp_input, width);
-}
-
-DEBUGSTRING(hsw_debug_wm_pipe)
-{
-	uint32_t primary, sprite, cursor;
-
-	primary = (val >> 16) & 0x7F;
-	sprite = (val >> 8) & 0x7F;
-	cursor = val & 0x3F;
-
-	snprintf(result, len, "primary %d, sprite %d, pipe %d", primary,
-		 sprite, cursor);
-}
-
-DEBUGSTRING(hsw_debug_lp_wm)
-{
-	const char *enable;
-	uint32_t latency, fbc, pri, cur;
-
-	enable = ((val >> 31) & 1) ? "enabled" : "disabled";
-	latency = (val >> 24) & 0x7F;
-	fbc = (val >> 20) & 0xF;
-	pri = (val >> 8) & 0x3FF;
-	cur = val & 0xFF;
-
-	snprintf(result, len, "%s, latency %d, fbc %d, pri %d, cur %d",
-		 enable, latency, fbc, pri, cur);
-}
-
-DEBUGSTRING(hsw_debug_sinterrupt)
-{
-	int portd, portc, portb, crt;
-
-	portd = (val >> 23) & 1;
-	portc = (val >> 22) & 1;
-	portb = (val >> 21) & 1;
-	crt = (val >> 19) & 1;
-
-	snprintf(result, len, "port d:%d, port c:%d, port b:%d, crt:%d",
-		 portd, portc, portb, crt);
-}
-
-DEBUGSTRING(ilk_debug_blc_pwm_cpu_ctl2)
-{
-	int enable, blinking, granularity;
-	const char *pipe;
-
-	enable = (val >> 31) & 1;
-
-	if (IS_GEN5(devid) || IS_GEN6(devid)) {
-		pipe = ((val >> 29) & 1) ? "B" : "A";
-	} else {
-		switch ((val >> 29) & 3) {
-		case 0:
-			pipe = "A";
-			break;
-		case 1:
-			pipe = "B";
-			break;
-		case 2:
-			pipe = "C";
-			break;
-		case 3:
-			if (IS_IVYBRIDGE(devid))
-				pipe = "reserved";
-			else
-				pipe = "EDP";
-			break;
-		}
-	}
-
-	if (IS_GEN5(devid) || IS_GEN6(devid) || IS_IVYBRIDGE(devid)) {
-		snprintf(result, len, "enable %d, pipe %s", enable, pipe);
-	} else {
-		blinking = (val >> 28) & 1;
-		granularity = ((val >> 27) & 1) ? 8 : 128;
-
-		snprintf(result, len, "enable %d, pipe %s, blinking %d, "
-			 "granularity %d", enable, pipe, blinking,
-			 granularity);
-	}
-}
-
-DEBUGSTRING(ilk_debug_blc_pwm_cpu_ctl)
-{
-	int cycle, freq;
-
-	cycle = (val & 0xFFFF);
-
-	if (IS_GEN5(devid) || IS_GEN6(devid) || IS_IVYBRIDGE(devid)) {
-		snprintf(result, len, "cycle %d", cycle);
-	} else {
-		freq = (val >> 16) & 0xFFFF;
-
-		snprintf(result, len, "cycle %d, freq %d", cycle, freq);
-	}
-}
-
-DEBUGSTRING(ibx_debug_blc_pwm_ctl1)
-{
-	int enable, override, inverted_polarity;
-
-	enable = (val >> 31) & 1;
-	override = (val >> 30) & 1;
-	inverted_polarity = (val >> 29) & 1;
-
-	snprintf(result, len, "enable %d, override %d, inverted polarity %d",
-		 enable, override, inverted_polarity);
-}
-
-DEBUGSTRING(ibx_debug_blc_pwm_ctl2)
-{
-	int freq, cycle;
-
-	freq = (val >> 16) & 0xFFFF;
-	cycle = val & 0xFFFF;
-
-	snprintf(result, len, "freq %d, cycle %d", freq, cycle);
-}
-
-DEBUGSTRING(hsw_debug_blc_misc_ctl)
-{
-	const char *sel;
-
-	sel = (val & 1) ? "PWM1-CPU PWM2-PCH" : "PWM1-PCH PWM2-CPU";
-
-	snprintf(result, len, "%s", sel);
-}
-
-DEBUGSTRING(hsw_debug_util_pin_ctl)
-{
-	int enable, data, inverted_polarity;
-	const char *transcoder, *mode;
-
-	enable = (val >> 31) & 1;
-
-	switch ((val >> 29) & 3) {
-	case 0:
-		transcoder = "A";
-		break;
-	case 1:
-		transcoder = "B";
-		break;
-	case 2:
-		transcoder = "C";
-		break;
-	case 3:
-		transcoder = "EDP";
-		break;
-	}
-
-	switch ((val >> 24) & 0xF) {
-	case 0:
-		mode = "data";
-		break;
-	case 1:
-		mode = "PWM";
-		break;
-	case 4:
-		mode = "Vblank";
-		break;
-	case 5:
-		mode = "Vsync";
-		break;
-	default:
-		mode = "reserved";
-		break;
-	}
-
-	data = (val >> 23) & 1;
-	inverted_polarity = (val >> 22) & 1;
-
-	snprintf(result, len, "enable %d, transcoder %s, mode %s, data %d "
-		 "inverted polarity %d", enable, transcoder, mode, data,
-		 inverted_polarity);
-}
-
-static struct reg_debug gen6_fences[] = {
-#define DEFINEFENCE_SNB(i) \
-	{ FENCE_REG_SANDYBRIDGE_0 + (i) * 8, "FENCE START "#i, NULL, 0 }, \
-	{ FENCE_REG_SANDYBRIDGE_0 + (i) * 8 + 4, "FENCE END "#i, NULL, 0 }
-	DEFINEFENCE_SNB(0),
-	DEFINEFENCE_SNB(1),
-	DEFINEFENCE_SNB(2),
-	DEFINEFENCE_SNB(3),
-	DEFINEFENCE_SNB(4),
-	DEFINEFENCE_SNB(5),
-	DEFINEFENCE_SNB(6),
-	DEFINEFENCE_SNB(7),
-	DEFINEFENCE_SNB(8),
-	DEFINEFENCE_SNB(9),
-	DEFINEFENCE_SNB(10),
-	DEFINEFENCE_SNB(11),
-	DEFINEFENCE_SNB(12),
-	DEFINEFENCE_SNB(13),
-	DEFINEFENCE_SNB(14),
-	DEFINEFENCE_SNB(15),
-	DEFINEFENCE_SNB(16),
-	DEFINEFENCE_SNB(17),
-	DEFINEFENCE_SNB(18),
-	DEFINEFENCE_SNB(19),
-	DEFINEFENCE_SNB(20),
-	DEFINEFENCE_SNB(20),
-	DEFINEFENCE_SNB(21),
-	DEFINEFENCE_SNB(22),
-	DEFINEFENCE_SNB(23),
-	DEFINEFENCE_SNB(24),
-	DEFINEFENCE_SNB(25),
-	DEFINEFENCE_SNB(26),
-	DEFINEFENCE_SNB(27),
-	DEFINEFENCE_SNB(28),
-	DEFINEFENCE_SNB(29),
-	DEFINEFENCE_SNB(30),
-	DEFINEFENCE_SNB(31),
-};
-
-static struct reg_debug ironlake_debug_regs[] = {
-	DEFINEREG(PGETBL_CTL),
-	DEFINEREG(INSTDONE_I965),
-	DEFINEREG(INSTDONE_1),
-	DEFINEREG2(CPU_VGACNTRL, i830_debug_vgacntrl),
-	DEFINEREG(DIGITAL_PORT_HOTPLUG_CNTRL),
-
-	DEFINEREG2(RR_HW_CTL, ironlake_debug_rr_hw_ctl),
-
-	DEFINEREG(FDI_PLL_BIOS_0),
-	DEFINEREG(FDI_PLL_BIOS_1),
-	DEFINEREG(FDI_PLL_BIOS_2),
-
-	DEFINEREG(DISPLAY_PORT_PLL_BIOS_0),
-	DEFINEREG(DISPLAY_PORT_PLL_BIOS_1),
-	DEFINEREG(DISPLAY_PORT_PLL_BIOS_2),
-
-	DEFINEREG(FDI_PLL_FREQ_CTL),
-
-	/* pipe B */
-
-	DEFINEREG2(PIPEACONF, i830_debug_pipeconf),
-
-	DEFINEREG2(HTOTAL_A, i830_debug_hvtotal),
-	DEFINEREG2(HBLANK_A, i830_debug_hvsyncblank),
-	DEFINEREG2(HSYNC_A, i830_debug_hvsyncblank),
-	DEFINEREG2(VTOTAL_A, i830_debug_hvtotal),
-	DEFINEREG2(VBLANK_A, i830_debug_hvsyncblank),
-	DEFINEREG2(VSYNC_A, i830_debug_hvsyncblank),
-	DEFINEREG(VSYNCSHIFT_A),
-	DEFINEREG2(PIPEASRC, i830_debug_yxminus1),
-
-	DEFINEREG2(PIPEA_DATA_M1, ironlake_debug_m_tu),
-	DEFINEREG2(PIPEA_DATA_N1, ironlake_debug_n),
-	DEFINEREG2(PIPEA_DATA_M2, ironlake_debug_m_tu),
-	DEFINEREG2(PIPEA_DATA_N2, ironlake_debug_n),
-
-	DEFINEREG2(PIPEA_LINK_M1, ironlake_debug_n),
-	DEFINEREG2(PIPEA_LINK_N1, ironlake_debug_n),
-	DEFINEREG2(PIPEA_LINK_M2, ironlake_debug_n),
-	DEFINEREG2(PIPEA_LINK_N2, ironlake_debug_n),
-
-	DEFINEREG2(DSPACNTR, i830_debug_dspcntr),
-	DEFINEREG(DSPABASE),
-	DEFINEREG2(DSPASTRIDE, ironlake_debug_dspstride),
-	DEFINEREG(DSPASURF),
-	DEFINEREG2(DSPATILEOFF, i830_debug_xy),
-
-	/* pipe B */
-
-	DEFINEREG2(PIPEBCONF, i830_debug_pipeconf),
-
-	DEFINEREG2(HTOTAL_B, i830_debug_hvtotal),
-	DEFINEREG2(HBLANK_B, i830_debug_hvsyncblank),
-	DEFINEREG2(HSYNC_B, i830_debug_hvsyncblank),
-	DEFINEREG2(VTOTAL_B, i830_debug_hvtotal),
-	DEFINEREG2(VBLANK_B, i830_debug_hvsyncblank),
-	DEFINEREG2(VSYNC_B, i830_debug_hvsyncblank),
-	DEFINEREG(VSYNCSHIFT_B),
-	DEFINEREG2(PIPEBSRC, i830_debug_yxminus1),
-
-	DEFINEREG2(PIPEB_DATA_M1, ironlake_debug_m_tu),
-	DEFINEREG2(PIPEB_DATA_N1, ironlake_debug_n),
-	DEFINEREG2(PIPEB_DATA_M2, ironlake_debug_m_tu),
-	DEFINEREG2(PIPEB_DATA_N2, ironlake_debug_n),
-
-	DEFINEREG2(PIPEB_LINK_M1, ironlake_debug_n),
-	DEFINEREG2(PIPEB_LINK_N1, ironlake_debug_n),
-	DEFINEREG2(PIPEB_LINK_M2, ironlake_debug_n),
-	DEFINEREG2(PIPEB_LINK_N2, ironlake_debug_n),
-
-	DEFINEREG2(DSPBCNTR, i830_debug_dspcntr),
-	DEFINEREG(DSPBBASE),
-	DEFINEREG2(DSPBSTRIDE, ironlake_debug_dspstride),
-	DEFINEREG(DSPBSURF),
-	DEFINEREG2(DSPBTILEOFF, i830_debug_xy),
-
-	/* pipe C */
-
-	DEFINEREG2(PIPECCONF, i830_debug_pipeconf),
-
-	DEFINEREG2(HTOTAL_C, i830_debug_hvtotal),
-	DEFINEREG2(HBLANK_C, i830_debug_hvsyncblank),
-	DEFINEREG2(HSYNC_C, i830_debug_hvsyncblank),
-	DEFINEREG2(VTOTAL_C, i830_debug_hvtotal),
-	DEFINEREG2(VBLANK_C, i830_debug_hvsyncblank),
-	DEFINEREG2(VSYNC_C, i830_debug_hvsyncblank),
-	DEFINEREG(VSYNCSHIFT_C),
-	DEFINEREG2(PIPECSRC, i830_debug_yxminus1),
-
-	DEFINEREG2(PIPEC_DATA_M1, ironlake_debug_m_tu),
-	DEFINEREG2(PIPEC_DATA_N1, ironlake_debug_n),
-	DEFINEREG2(PIPEC_DATA_M2, ironlake_debug_m_tu),
-	DEFINEREG2(PIPEC_DATA_N2, ironlake_debug_n),
-
-	DEFINEREG2(PIPEC_LINK_M1, ironlake_debug_n),
-	DEFINEREG2(PIPEC_LINK_N1, ironlake_debug_n),
-	DEFINEREG2(PIPEC_LINK_M2, ironlake_debug_n),
-	DEFINEREG2(PIPEC_LINK_N2, ironlake_debug_n),
-
-	DEFINEREG2(DSPCCNTR, i830_debug_dspcntr),
-	DEFINEREG(DSPCBASE),
-	DEFINEREG2(DSPCSTRIDE, ironlake_debug_dspstride),
-	DEFINEREG(DSPCSURF),
-	DEFINEREG2(DSPCTILEOFF, i830_debug_xy),
-
-	/* Panel fitter */
-
-	DEFINEREG2(PFA_CTL_1, ironlake_debug_panel_fitting),
-	DEFINEREG2(PFA_CTL_2, ironlake_debug_panel_fitting_2),
-	DEFINEREG2(PFA_CTL_3, ironlake_debug_panel_fitting_3),
-	DEFINEREG2(PFA_CTL_4, ironlake_debug_panel_fitting_4),
-	DEFINEREG2(PFA_WIN_POS, ironlake_debug_pf_win),
-	DEFINEREG2(PFA_WIN_SIZE, ironlake_debug_pf_win),
-	DEFINEREG2(PFB_CTL_1, ironlake_debug_panel_fitting),
-	DEFINEREG2(PFB_CTL_2, ironlake_debug_panel_fitting_2),
-	DEFINEREG2(PFB_CTL_3, ironlake_debug_panel_fitting_3),
-	DEFINEREG2(PFB_CTL_4, ironlake_debug_panel_fitting_4),
-	DEFINEREG2(PFB_WIN_POS, ironlake_debug_pf_win),
-	DEFINEREG2(PFB_WIN_SIZE, ironlake_debug_pf_win),
-	DEFINEREG2(PFC_CTL_1, ironlake_debug_panel_fitting),
-	DEFINEREG2(PFC_CTL_2, ironlake_debug_panel_fitting_2),
-	DEFINEREG2(PFC_CTL_3, ironlake_debug_panel_fitting_3),
-	DEFINEREG2(PFC_CTL_4, ironlake_debug_panel_fitting_4),
-	DEFINEREG2(PFC_WIN_POS, ironlake_debug_pf_win),
-	DEFINEREG2(PFC_WIN_SIZE, ironlake_debug_pf_win),
-
-	/* PCH */
-
-	DEFINEREG2(PCH_DREF_CONTROL, ironlake_debug_dref_ctl),
-	DEFINEREG2(PCH_RAWCLK_FREQ, ironlake_debug_rawclk_freq),
-	DEFINEREG(PCH_DPLL_TMR_CFG),
-	DEFINEREG(PCH_SSC4_PARMS),
-	DEFINEREG(PCH_SSC4_AUX_PARMS),
-	DEFINEREG2(PCH_DPLL_SEL, snb_debug_dpll_sel),
-	DEFINEREG(PCH_DPLL_ANALOG_CTL),
-
-	DEFINEREG2(PCH_DPLL_A, ironlake_debug_pch_dpll),
-	DEFINEREG2(PCH_DPLL_B, ironlake_debug_pch_dpll),
-	DEFINEREG2(PCH_FPA0, i830_debug_fp),
-	DEFINEREG2(PCH_FPA1, i830_debug_fp),
-	DEFINEREG2(PCH_FPB0, i830_debug_fp),
-	DEFINEREG2(PCH_FPB1, i830_debug_fp),
-
-	DEFINEREG2(TRANS_HTOTAL_A, i830_debug_hvtotal),
-	DEFINEREG2(TRANS_HBLANK_A, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_HSYNC_A, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_VTOTAL_A, i830_debug_hvtotal),
-	DEFINEREG2(TRANS_VBLANK_A, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_VSYNC_A, i830_debug_hvsyncblank),
-	DEFINEREG(TRANS_VSYNCSHIFT_A),
-
-	DEFINEREG2(TRANSA_DATA_M1, ironlake_debug_m_tu),
-	DEFINEREG2(TRANSA_DATA_N1, ironlake_debug_n),
-	DEFINEREG2(TRANSA_DATA_M2, ironlake_debug_m_tu),
-	DEFINEREG2(TRANSA_DATA_N2, ironlake_debug_n),
-	DEFINEREG2(TRANSA_DP_LINK_M1, ironlake_debug_n),
-	DEFINEREG2(TRANSA_DP_LINK_N1, ironlake_debug_n),
-	DEFINEREG2(TRANSA_DP_LINK_M2, ironlake_debug_n),
-	DEFINEREG2(TRANSA_DP_LINK_N2, ironlake_debug_n),
-
-	DEFINEREG2(TRANS_HTOTAL_B, i830_debug_hvtotal),
-	DEFINEREG2(TRANS_HBLANK_B, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_HSYNC_B, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_VTOTAL_B, i830_debug_hvtotal),
-	DEFINEREG2(TRANS_VBLANK_B, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_VSYNC_B, i830_debug_hvsyncblank),
-	DEFINEREG(TRANS_VSYNCSHIFT_B),
-
-	DEFINEREG2(TRANSB_DATA_M1, ironlake_debug_m_tu),
-	DEFINEREG2(TRANSB_DATA_N1, ironlake_debug_n),
-	DEFINEREG2(TRANSB_DATA_M2, ironlake_debug_m_tu),
-	DEFINEREG2(TRANSB_DATA_N2, ironlake_debug_n),
-	DEFINEREG2(TRANSB_DP_LINK_M1, ironlake_debug_n),
-	DEFINEREG2(TRANSB_DP_LINK_N1, ironlake_debug_n),
-	DEFINEREG2(TRANSB_DP_LINK_M2, ironlake_debug_n),
-	DEFINEREG2(TRANSB_DP_LINK_N2, ironlake_debug_n),
-
-	DEFINEREG2(TRANS_HTOTAL_C, i830_debug_hvtotal),
-	DEFINEREG2(TRANS_HBLANK_C, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_HSYNC_C, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_VTOTAL_C, i830_debug_hvtotal),
-	DEFINEREG2(TRANS_VBLANK_C, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_VSYNC_C, i830_debug_hvsyncblank),
-	DEFINEREG(TRANS_VSYNCSHIFT_C),
-
-	DEFINEREG2(TRANSC_DATA_M1, ironlake_debug_m_tu),
-	DEFINEREG2(TRANSC_DATA_N1, ironlake_debug_n),
-	DEFINEREG2(TRANSC_DATA_M2, ironlake_debug_m_tu),
-	DEFINEREG2(TRANSC_DATA_N2, ironlake_debug_n),
-	DEFINEREG2(TRANSC_DP_LINK_M1, ironlake_debug_n),
-	DEFINEREG2(TRANSC_DP_LINK_N1, ironlake_debug_n),
-	DEFINEREG2(TRANSC_DP_LINK_M2, ironlake_debug_n),
-	DEFINEREG2(TRANSC_DP_LINK_N2, ironlake_debug_n),
-
-	DEFINEREG2(TRANSACONF, ironlake_debug_transconf),
-	DEFINEREG2(TRANSBCONF, ironlake_debug_transconf),
-	DEFINEREG2(TRANSCCONF, ironlake_debug_transconf),
-
-	DEFINEREG2(FDI_TXA_CTL, ironlake_debug_fdi_tx_ctl),
-	DEFINEREG2(FDI_TXB_CTL, ironlake_debug_fdi_tx_ctl),
-	DEFINEREG2(FDI_TXC_CTL, ironlake_debug_fdi_tx_ctl),
-	DEFINEREG2(FDI_RXA_CTL, ironlake_debug_fdi_rx_ctl),
-	DEFINEREG2(FDI_RXB_CTL, ironlake_debug_fdi_rx_ctl),
-	DEFINEREG2(FDI_RXC_CTL, ironlake_debug_fdi_rx_ctl),
-
-	DEFINEREG(DPAFE_BMFUNC),
-	DEFINEREG(DPAFE_DL_IREFCAL0),
-	DEFINEREG(DPAFE_DL_IREFCAL1),
-	DEFINEREG(DPAFE_DP_IREFCAL),
-
-	DEFINEREG(PCH_DSPCLK_GATE_D),
-	DEFINEREG(PCH_DSP_CHICKEN1),
-	DEFINEREG(PCH_DSP_CHICKEN2),
-	DEFINEREG(PCH_DSP_CHICKEN3),
-
-	DEFINEREG2(FDI_RXA_MISC, ironlake_debug_fdi_rx_misc),
-	DEFINEREG2(FDI_RXB_MISC, ironlake_debug_fdi_rx_misc),
-	DEFINEREG2(FDI_RXC_MISC, ironlake_debug_fdi_rx_misc),
-	DEFINEREG(FDI_RXA_TUSIZE1),
-	DEFINEREG(FDI_RXA_TUSIZE2),
-	DEFINEREG(FDI_RXB_TUSIZE1),
-	DEFINEREG(FDI_RXB_TUSIZE2),
-	DEFINEREG(FDI_RXC_TUSIZE1),
-	DEFINEREG(FDI_RXC_TUSIZE2),
-
-	DEFINEREG(FDI_PLL_CTL_1),
-	DEFINEREG(FDI_PLL_CTL_2),
-
-	DEFINEREG(FDI_RXA_IIR),
-	DEFINEREG(FDI_RXA_IMR),
-	DEFINEREG(FDI_RXB_IIR),
-	DEFINEREG(FDI_RXB_IMR),
-
-	DEFINEREG2(PCH_ADPA, i830_debug_adpa),
-	DEFINEREG2(HDMIB, ironlake_debug_hdmi),
-	DEFINEREG2(HDMIC, ironlake_debug_hdmi),
-	DEFINEREG2(HDMID, ironlake_debug_hdmi),
-	DEFINEREG2(PCH_LVDS, i830_debug_lvds),
-	DEFINEREG(CPU_eDP_A),
-	DEFINEREG(PCH_DP_B),
-	DEFINEREG(PCH_DP_C),
-	DEFINEREG(PCH_DP_D),
-	DEFINEREG2(TRANS_DP_CTL_A, snb_debug_trans_dp_ctl),
-	DEFINEREG2(TRANS_DP_CTL_B, snb_debug_trans_dp_ctl),
-	DEFINEREG2(TRANS_DP_CTL_C, snb_debug_trans_dp_ctl),
-
-	DEFINEREG2(BLC_PWM_CPU_CTL2, ilk_debug_blc_pwm_cpu_ctl2),
-	DEFINEREG2(BLC_PWM_CPU_CTL, ilk_debug_blc_pwm_cpu_ctl),
-	DEFINEREG2(BLC_PWM_PCH_CTL1, ibx_debug_blc_pwm_ctl1),
-	DEFINEREG2(BLC_PWM_PCH_CTL2, ibx_debug_blc_pwm_ctl2),
-
-	DEFINEREG2(PCH_PP_STATUS, i830_debug_pp_status),
-	DEFINEREG2(PCH_PP_CONTROL, ilk_debug_pp_control),
-	DEFINEREG(PCH_PP_ON_DELAYS),
-	DEFINEREG(PCH_PP_OFF_DELAYS),
-	DEFINEREG(PCH_PP_DIVISOR),
-
-	DEFINEREG2(PORT_DBG, ivb_debug_port),
-
-	DEFINEREG(RC6_RESIDENCY_TIME),
-	DEFINEREG(RC6p_RESIDENCY_TIME),
-	DEFINEREG(RC6pp_RESIDENCY_TIME),
-};
-
-static struct reg_debug haswell_debug_regs[] = {
-	/* Power wells */
-	DEFINEREG(HSW_PWR_WELL_CTL1),
-	DEFINEREG(HSW_PWR_WELL_CTL2),
-	DEFINEREG(HSW_PWR_WELL_CTL3),
-	DEFINEREG(HSW_PWR_WELL_CTL4),
-	DEFINEREG(HSW_PWR_WELL_CTL5),
-	DEFINEREG(HSW_PWR_WELL_CTL6),
-
-	/* DDI pipe function */
-	DEFINEREG2(PIPE_DDI_FUNC_CTL_A, hsw_debug_pipe_ddi_func_ctl),
-	DEFINEREG2(PIPE_DDI_FUNC_CTL_B, hsw_debug_pipe_ddi_func_ctl),
-	DEFINEREG2(PIPE_DDI_FUNC_CTL_C, hsw_debug_pipe_ddi_func_ctl),
-	DEFINEREG2(PIPE_DDI_FUNC_CTL_EDP, hsw_debug_pipe_ddi_func_ctl),
-
-	/* DP transport control */
-	DEFINEREG(DP_TP_CTL_A),
-	DEFINEREG(DP_TP_CTL_B),
-	DEFINEREG(DP_TP_CTL_C),
-	DEFINEREG(DP_TP_CTL_D),
-	DEFINEREG(DP_TP_CTL_E),
-
-	/* DP status */
-	DEFINEREG(DP_TP_STATUS_B),
-	DEFINEREG(DP_TP_STATUS_C),
-	DEFINEREG(DP_TP_STATUS_D),
-	DEFINEREG(DP_TP_STATUS_E),
-
-	/* DDI buffer control */
-	DEFINEREG2(DDI_BUF_CTL_A, hsw_debug_ddi_buf_ctl),
-	DEFINEREG2(DDI_BUF_CTL_B, hsw_debug_ddi_buf_ctl),
-	DEFINEREG2(DDI_BUF_CTL_C, hsw_debug_ddi_buf_ctl),
-	DEFINEREG2(DDI_BUF_CTL_D, hsw_debug_ddi_buf_ctl),
-	DEFINEREG2(DDI_BUF_CTL_E, hsw_debug_ddi_buf_ctl),
-
-	/* Clocks */
-	DEFINEREG(SPLL_CTL),
-	DEFINEREG(LCPLL_CTL),
-	DEFINEREG(WRPLL_CTL1),
-	DEFINEREG(WRPLL_CTL2),
-
-	/* DDI port clock control */
-	DEFINEREG2(PORT_CLK_SEL_A, hsw_debug_port_clk_sel),
-	DEFINEREG2(PORT_CLK_SEL_B, hsw_debug_port_clk_sel),
-	DEFINEREG2(PORT_CLK_SEL_C, hsw_debug_port_clk_sel),
-	DEFINEREG2(PORT_CLK_SEL_D, hsw_debug_port_clk_sel),
-	DEFINEREG2(PORT_CLK_SEL_E, hsw_debug_port_clk_sel),
-
-	/* Pipe clock control */
-	DEFINEREG2(PIPE_CLK_SEL_A, hsw_debug_pipe_clk_sel),
-	DEFINEREG2(PIPE_CLK_SEL_B, hsw_debug_pipe_clk_sel),
-	DEFINEREG2(PIPE_CLK_SEL_C, hsw_debug_pipe_clk_sel),
-
-	/* Watermarks */
-	DEFINEREG2(WM_PIPE_A, hsw_debug_wm_pipe),
-	DEFINEREG2(WM_PIPE_B, hsw_debug_wm_pipe),
-	DEFINEREG2(WM_PIPE_C, hsw_debug_wm_pipe),
-	DEFINEREG2(WM_LP1, hsw_debug_lp_wm),
-	DEFINEREG2(WM_LP2, hsw_debug_lp_wm),
-	DEFINEREG2(WM_LP3, hsw_debug_lp_wm),
-	DEFINEREG(WM_LP1_SPR),
-	DEFINEREG(WM_LP2_SPR),
-	DEFINEREG(WM_LP3_SPR),
-	DEFINEREG(WM_MISC),
-	DEFINEREG(WM_SR_CNT),
-	DEFINEREG(PIPE_WM_LINETIME_A),
-	DEFINEREG(PIPE_WM_LINETIME_B),
-	DEFINEREG(PIPE_WM_LINETIME_C),
-	DEFINEREG(WM_DBG),
-
-	/* Fuses */
-	DEFINEREG2(SFUSE_STRAP, hsw_debug_sfuse_strap),
-
-	/* Pipe A */
-	DEFINEREG2(PIPEASRC, i830_debug_yxminus1),
-	DEFINEREG2(DSPACNTR, i830_debug_dspcntr),
-	DEFINEREG2(DSPASTRIDE, ironlake_debug_dspstride),
-	DEFINEREG(DSPASURF),
-	DEFINEREG2(DSPATILEOFF, i830_debug_xy),
-
-	/* Pipe B */
-	DEFINEREG2(PIPEBSRC, i830_debug_yxminus1),
-	DEFINEREG2(DSPBCNTR, i830_debug_dspcntr),
-	DEFINEREG2(DSPBSTRIDE, ironlake_debug_dspstride),
-	DEFINEREG(DSPBSURF),
-	DEFINEREG2(DSPBTILEOFF, i830_debug_xy),
-
-	/* Pipe C */
-	DEFINEREG2(PIPECSRC, i830_debug_yxminus1),
-	DEFINEREG2(DSPCCNTR, i830_debug_dspcntr),
-	DEFINEREG2(DSPCSTRIDE, ironlake_debug_dspstride),
-	DEFINEREG(DSPCSURF),
-	DEFINEREG2(DSPCTILEOFF, i830_debug_xy),
-
-	/* Transcoder A */
-	DEFINEREG2(PIPEACONF, i830_debug_pipeconf),
-	DEFINEREG2(HTOTAL_A, i830_debug_hvtotal),
-	DEFINEREG2(HBLANK_A, i830_debug_hvsyncblank),
-	DEFINEREG2(HSYNC_A, i830_debug_hvsyncblank),
-	DEFINEREG2(VTOTAL_A, i830_debug_hvtotal),
-	DEFINEREG2(VBLANK_A, i830_debug_hvsyncblank),
-	DEFINEREG2(VSYNC_A, i830_debug_hvsyncblank),
-	DEFINEREG(VSYNCSHIFT_A),
-	DEFINEREG2(PIPEA_DATA_M1, ironlake_debug_m_tu),
-	DEFINEREG2(PIPEA_DATA_N1, ironlake_debug_n),
-	DEFINEREG2(PIPEA_LINK_M1, ironlake_debug_n),
-	DEFINEREG2(PIPEA_LINK_N1, ironlake_debug_n),
-
-	/* Transcoder B */
-	DEFINEREG2(PIPEBCONF, i830_debug_pipeconf),
-	DEFINEREG2(HTOTAL_B, i830_debug_hvtotal),
-	DEFINEREG2(HBLANK_B, i830_debug_hvsyncblank),
-	DEFINEREG2(HSYNC_B, i830_debug_hvsyncblank),
-	DEFINEREG2(VTOTAL_B, i830_debug_hvtotal),
-	DEFINEREG2(VBLANK_B, i830_debug_hvsyncblank),
-	DEFINEREG2(VSYNC_B, i830_debug_hvsyncblank),
-	DEFINEREG(VSYNCSHIFT_B),
-	DEFINEREG2(PIPEB_DATA_M1, ironlake_debug_m_tu),
-	DEFINEREG2(PIPEB_DATA_N1, ironlake_debug_n),
-	DEFINEREG2(PIPEB_LINK_M1, ironlake_debug_n),
-	DEFINEREG2(PIPEB_LINK_N1, ironlake_debug_n),
-
-	/* Transcoder C */
-	DEFINEREG2(PIPECCONF, i830_debug_pipeconf),
-	DEFINEREG2(HTOTAL_C, i830_debug_hvtotal),
-	DEFINEREG2(HBLANK_C, i830_debug_hvsyncblank),
-	DEFINEREG2(HSYNC_C, i830_debug_hvsyncblank),
-	DEFINEREG2(VTOTAL_C, i830_debug_hvtotal),
-	DEFINEREG2(VBLANK_C, i830_debug_hvsyncblank),
-	DEFINEREG2(VSYNC_C, i830_debug_hvsyncblank),
-	DEFINEREG(VSYNCSHIFT_C),
-	DEFINEREG2(PIPEC_DATA_M1, ironlake_debug_m_tu),
-	DEFINEREG2(PIPEC_DATA_N1, ironlake_debug_n),
-	DEFINEREG2(PIPEC_LINK_M1, ironlake_debug_n),
-	DEFINEREG2(PIPEC_LINK_N1, ironlake_debug_n),
-
-	/* Transcoder EDP */
-	DEFINEREG2(PIPEEDPCONF, i830_debug_pipeconf),
-	DEFINEREG2(HTOTAL_EDP, i830_debug_hvtotal),
-	DEFINEREG2(HBLANK_EDP, i830_debug_hvsyncblank),
-	DEFINEREG2(HSYNC_EDP, i830_debug_hvsyncblank),
-	DEFINEREG2(VTOTAL_EDP, i830_debug_hvtotal),
-	DEFINEREG2(VBLANK_EDP, i830_debug_hvsyncblank),
-	DEFINEREG2(VSYNC_EDP, i830_debug_hvsyncblank),
-	DEFINEREG(VSYNCSHIFT_EDP),
-	DEFINEREG2(PIPEEDP_DATA_M1, ironlake_debug_m_tu),
-	DEFINEREG2(PIPEEDP_DATA_N1, ironlake_debug_n),
-	DEFINEREG2(PIPEEDP_LINK_M1, ironlake_debug_n),
-	DEFINEREG2(PIPEEDP_LINK_N1, ironlake_debug_n),
-
-	/* Panel fitter */
-	DEFINEREG2(PFA_CTL_1, ironlake_debug_panel_fitting),
-	DEFINEREG2(PFA_WIN_POS, ironlake_debug_pf_win),
-	DEFINEREG2(PFA_WIN_SIZE, ironlake_debug_pf_win),
-
-	DEFINEREG2(PFB_CTL_1, ironlake_debug_panel_fitting),
-	DEFINEREG2(PFB_WIN_POS, ironlake_debug_pf_win),
-	DEFINEREG2(PFB_WIN_SIZE, ironlake_debug_pf_win),
-
-	DEFINEREG2(PFC_CTL_1, ironlake_debug_panel_fitting),
-	DEFINEREG2(PFC_WIN_POS, ironlake_debug_pf_win),
-	DEFINEREG2(PFC_WIN_SIZE, ironlake_debug_pf_win),
-
-	/* LPT */
-
-	DEFINEREG2(TRANS_HTOTAL_A, i830_debug_hvtotal),
-	DEFINEREG2(TRANS_HBLANK_A, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_HSYNC_A, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_VTOTAL_A, i830_debug_hvtotal),
-	DEFINEREG2(TRANS_VBLANK_A, i830_debug_hvsyncblank),
-	DEFINEREG2(TRANS_VSYNC_A, i830_debug_hvsyncblank),
-	DEFINEREG(TRANS_VSYNCSHIFT_A),
-
-	DEFINEREG2(TRANSACONF, ironlake_debug_transconf),
-
-	DEFINEREG2(FDI_RXA_MISC, ironlake_debug_fdi_rx_misc),
-	DEFINEREG(FDI_RXA_TUSIZE1),
-	DEFINEREG(FDI_RXA_IIR),
-	DEFINEREG(FDI_RXA_IMR),
-
-	DEFINEREG2(BLC_PWM_CPU_CTL2, ilk_debug_blc_pwm_cpu_ctl2),
-	DEFINEREG2(BLC_PWM_CPU_CTL, ilk_debug_blc_pwm_cpu_ctl),
-	DEFINEREG2(BLC_PWM2_CPU_CTL2, ilk_debug_blc_pwm_cpu_ctl2),
-	DEFINEREG2(BLC_PWM2_CPU_CTL, ilk_debug_blc_pwm_cpu_ctl),
-	DEFINEREG2(BLC_MISC_CTL, hsw_debug_blc_misc_ctl),
-	DEFINEREG2(BLC_PWM_PCH_CTL1, ibx_debug_blc_pwm_ctl1),
-	DEFINEREG2(BLC_PWM_PCH_CTL2, ibx_debug_blc_pwm_ctl2),
-
-	DEFINEREG2(UTIL_PIN_CTL, hsw_debug_util_pin_ctl),
-
-	DEFINEREG2(PCH_PP_STATUS, i830_debug_pp_status),
-	DEFINEREG2(PCH_PP_CONTROL, ilk_debug_pp_control),
-	DEFINEREG(PCH_PP_ON_DELAYS),
-	DEFINEREG(PCH_PP_OFF_DELAYS),
-	DEFINEREG(PCH_PP_DIVISOR),
-
-	DEFINEREG(PIXCLK_GATE),
-
-	DEFINEREG2(SDEISR, hsw_debug_sinterrupt),
-
-	DEFINEREG(RC6_RESIDENCY_TIME),
-};
-
-static struct reg_debug i945gm_mi_regs[] = {
-	DEFINEREG(PGETBL_CTL),
-	DEFINEREG(PGTBL_ER),
-	DEFINEREG(EXCC),
-	DEFINEREG(HWS_PGA),
-	DEFINEREG(IPEIR),
-	DEFINEREG(IPEHR),
-	DEFINEREG(INSTDONE),
-	DEFINEREG(NOP_ID),
-	DEFINEREG(HWSTAM),
-	DEFINEREG(SCPD0),
-	DEFINEREG(IER),
-	DEFINEREG(IIR),
-	DEFINEREG(IMR),
-	DEFINEREG(ISR),
-	DEFINEREG(EIR),
-	DEFINEREG(EMR),
-	DEFINEREG(ESR),
-	DEFINEREG(INST_PM),
-	DEFINEREG(ECOSKPD),
-};
-
-static void
-_intel_dump_reg(struct reg_debug *reg, uint32_t val)
-{
-	char debug[1024];
-
-	if (reg->debug_output != NULL) {
-		reg->debug_output(debug, sizeof(debug), reg->reg, val);
-		printf("%30.30s: 0x%08x (%s)\n",
-		       reg->name, val, debug);
-	} else {
-		printf("%30.30s: 0x%08x\n", reg->name, val);
-	}
-}
-
-#define intel_dump_regs(regs) _intel_dump_regs(regs, ARRAY_SIZE(regs))
-
-static void
-_intel_dump_regs(struct reg_debug *regs, int count)
-{
-	int i;
-
-	for (i = 0; i < count; i++) {
-		uint32_t val = INREG(regs[i].reg);
-
-		_intel_dump_reg(&regs[i], val);
-	}
-}
-
-DEBUGSTRING(gen6_rp_control)
-{
-	snprintf(result, len, "%s",
-		 (val & (1 << 7)) ? "enabled" : "disabled");
-}
-
-static struct reg_debug gen6_rp_debug_regs[] = {
-	DEFINEREG2(GEN6_RP_CONTROL, gen6_rp_control),
-	DEFINEREG(GEN6_RPNSWREQ),
-	DEFINEREG(GEN6_RP_DOWN_TIMEOUT),
-	DEFINEREG(GEN6_RP_INTERRUPT_LIMITS),
-	DEFINEREG(GEN6_RP_UP_THRESHOLD),
-	DEFINEREG(GEN6_RP_UP_EI),
-	DEFINEREG(GEN6_RP_DOWN_EI),
-	DEFINEREG(GEN6_RP_IDLE_HYSTERSIS),
-	DEFINEREG(GEN6_RC_STATE),
-	DEFINEREG(GEN6_RC_CONTROL),
-	DEFINEREG(GEN6_RC1_WAKE_RATE_LIMIT),
-	DEFINEREG(GEN6_RC6_WAKE_RATE_LIMIT),
-	DEFINEREG(GEN6_RC_EVALUATION_INTERVAL),
-	DEFINEREG(GEN6_RC_IDLE_HYSTERSIS),
-	DEFINEREG(GEN6_RC_SLEEP),
-	DEFINEREG(GEN6_RC1e_THRESHOLD),
-	DEFINEREG(GEN6_RC6_THRESHOLD),
-	DEFINEREG(GEN6_RC_VIDEO_FREQ),
-	DEFINEREG(GEN6_PMIER),
-	DEFINEREG(GEN6_PMIMR),
-	DEFINEREG(GEN6_PMINTRMSK),
-};
-
-#define DECLARE_REGS(d,r)	\
-	{ .description = d, .regs = r, .count = ARRAY_SIZE(r) }
-static struct {
-	const char *description;
-	struct reg_debug *regs;
-	int count;
-} known_registers[] = {
-	DECLARE_REGS("Gen5",   ironlake_debug_regs),
-	DECLARE_REGS("i945GM", i945gm_mi_regs),
-	DECLARE_REGS("Gen2",   intel_debug_regs),
-	DECLARE_REGS("Gen6",   gen6_rp_debug_regs),
-	DECLARE_REGS("Gen7.5", haswell_debug_regs),
-	DECLARE_REGS("Gen6+", gen6_fences),
-};
-#undef DECLARE_REGS
-
-static void
-dump_reg(struct reg_debug *reg, uint32_t val, const char *prefix)
-{
-	char debug[1024];
-
-	if (reg->debug_output != NULL) {
-		reg->debug_output(debug, sizeof(debug), reg->reg, val);
-		printf("%s: %s (0x%x): 0x%08x (%s)\n",
-		       prefix, reg->name, reg->reg, val, debug);
-	} else {
-		printf("%s: %s (0x%x): 0x%08x\n",
-		       prefix, reg->name, reg->reg, val);
-	}
-}
-
-static void
-str_to_upper(char *str)
-{
-	while(*str) {
-		*str = toupper(*str);
-		str++;
-	}
-}
-
-static void
-decode_register_name(char *name, uint32_t val)
-{
-	int i, j;
-
-	str_to_upper(name);
-
-	for (i = 0; i < ARRAY_SIZE(known_registers); i++) {
-		struct reg_debug *regs = known_registers[i].regs;
-
-		for (j = 0; j < known_registers[i].count; j++)
-			if (strstr(regs[j].name, name))
-				dump_reg(&regs[j], val,
-					 known_registers[i].description);
-	}
-}
-
-static void
-decode_register_address(int address, uint32_t val)
-{
-	int i, j;
-
-	for (i = 0; i < ARRAY_SIZE(known_registers); i++) {
-		struct reg_debug *regs = known_registers[i].regs;
-
-		for (j = 0; j < known_registers[i].count; j++)
-			if (regs[j].reg == address)
-				dump_reg(&regs[j], val,
-					 known_registers[i].description);
-	}
-}
-
-static void
-decode_register(char *name, uint32_t val)
-{
-	long int address;
-	char *end;
-
-	address = strtoul(name, &end, 0);
-
-	/* found a register address */
-	if (address && *end == '\0')
-		decode_register_address(address, val);
-	else
-		decode_register_name(name, val);
-}
-
-static void
-intel_dump_other_regs(void)
-{
-	int i;
-	int fp, dpll;
-	int disp_pipe;
-	int n, m1, m2, m, p1, p2;
-	int ref;
-	int dot;
-	int phase;
-#if 0
-	int msr;
-	int crt;
-#endif
-
-#if 0
-	i830DumpIndexed(pScrn, "SR", 0x3c4, 0x3c5, 0, 7);
-	msr = INREG8(0x3cc);
-	printf("%20.20s: 0x%02x\n",
-		   "MSR", (unsigned int)msr);
-
-	i830DumpAR(pScrn);
-	if (msr & 1)
-		crt = 0x3d0;
-	else
-		crt = 0x3b0;
-	i830DumpIndexed(pScrn, "CR", crt + 4, crt + 5, 0, 0x24);
-#endif
-	for (disp_pipe = 0; disp_pipe <= 1; disp_pipe++) {
-		fp = INREG(disp_pipe == 0 ? FPA0 : FPB0);
-		dpll = INREG(disp_pipe == 0 ? DPLL_A : DPLL_B);
-		if (IS_GEN2(devid)) {
-			uint32_t lvds = INREG(LVDS);
-			if (devid == PCI_CHIP_I855_GM &&
-			    (lvds & LVDS_PORT_EN) &&
-			    (lvds & LVDS_PIPEB_SELECT) == (disp_pipe << 30)) {
-				if ((lvds & LVDS_CLKB_POWER_MASK) ==
-				    LVDS_CLKB_POWER_UP)
-					p2 = 7;
-				else
-					p2 = 14;
-				switch ((dpll >> 16) & 0x3f) {
-				case 0x01:
-					p1 = 1;
-					break;
-				case 0x02:
-					p1 = 2;
-					break;
-				case 0x04:
-					p1 = 3;
-					break;
-				case 0x08:
-					p1 = 4;
-					break;
-				case 0x10:
-					p1 = 5;
-					break;
-				case 0x20:
-					p1 = 6;
-					break;
-				default:
-					p1 = 1;
-					printf("LVDS P1 0x%x invalid encoding\n",
-					       (dpll >> 16) & 0x3f);
-					break;
-				}
-			} else {
-				if (dpll & (1 << 23))
-					p2 = 4;
-				else
-					p2 = 2;
-				if (dpll & PLL_P1_DIVIDE_BY_TWO)
-					p1 = 2;
-				else
-					p1 = ((dpll >> 16) & 0x3f) + 2;
-			}
-
-			switch ((dpll >> 13) & 0x3) {
-			case 0:
-				ref = 48000;
-				break;
-			case 3:
-				ref = 66000;
-				break;
-			default:
-				ref = 0;
-				printf("ref out of range\n");
-				break;
-			}
-		} else {
-			uint32_t lvds = INREG(LVDS);
-			if ((lvds & LVDS_PORT_EN) &&
-			    (lvds & LVDS_PIPEB_SELECT) == (disp_pipe << 30)) {
-				if ((lvds & LVDS_CLKB_POWER_MASK) ==
-				    LVDS_CLKB_POWER_UP)
-					p2 = 7;
-				else
-					p2 = 14;
-			} else {
-				switch ((dpll >> 24) & 0x3) {
-				case 0:
-					p2 = 10;
-					break;
-				case 1:
-					p2 = 5;
-					break;
-				default:
-					p2 = 1;
-					printf("p2 out of range\n");
-					break;
-				}
-			}
-			if (IS_IGD(devid))
-				i = (dpll >> DPLL_FPA01_P1_POST_DIV_SHIFT_IGD) &
-				    0x1ff;
-			else
-				i = (dpll >> DPLL_FPA01_P1_POST_DIV_SHIFT) &
-				    0xff;
-			switch (i) {
-			case 1:
-				p1 = 1;
-				break;
-			case 2:
-				p1 = 2;
-				break;
-			case 4:
-				p1 = 3;
-				break;
-			case 8:
-				p1 = 4;
-				break;
-			case 16:
-				p1 = 5;
-				break;
-			case 32:
-				p1 = 6;
-				break;
-			case 64:
-				p1 = 7;
-				break;
-			case 128:
-				p1 = 8;
-				break;
-			case 256:
-				if (IS_IGD(devid)) {
-					p1 = 9;
-					break;
-				}	/* fallback */
-			default:
-				p1 = 1;
-				printf("p1 out of range\n");
-				break;
-			}
-
-			switch ((dpll >> 13) & 0x3) {
-			case 0:
-				ref = 96000;
-				break;
-			case 3:
-				ref = 100000;
-				break;
-			default:
-				ref = 0;
-				printf("ref out of range\n");
-				break;
-			}
-		}
-		if (IS_965(devid)) {
-			phase = (dpll >> 9) & 0xf;
-			switch (phase) {
-			case 6:
-				break;
-			default:
-				printf("SDVO phase shift %d out of range -- probobly not "
-				       "an issue.\n", phase);
-				break;
-			}
-		}
-		switch ((dpll >> 8) & 1) {
-		case 0:
-			break;
-		default:
-			printf("fp select out of range\n");
-			break;
-		}
-		m1 = ((fp >> 8) & 0x3f);
-		if (IS_IGD(devid)) {
-			n = ffs((fp & FP_N_IGD_DIV_MASK) >> FP_N_DIV_SHIFT) - 1;
-			m2 = (fp & FP_M2_IGD_DIV_MASK) >> FP_M2_DIV_SHIFT;
-			m = m2 + 2;
-			dot = (ref * m) / n / (p1 * p2);
-		} else {
-			n = ((fp >> 16) & 0x3f);
-			m2 = ((fp >> 0) & 0x3f);
-			//m = 5 * (m1 + 2) + (m2 + 2);
-			dot =
-			    (ref * (5 * (m1 + 2) + (m2 + 2)) / (n + 2)) / (p1 *
-									   p2);
-		}
-
-		printf("pipe %s dot %d n %d m1 %d m2 %d p1 %d p2 %d\n",
-		       disp_pipe == 0 ? "A" : "B", dot, n, m1, m2, p1, p2);
-	}
-}
-
-/*
- * This program reads a lot of display registers. If we don't turn on the power
- * well, dmesg will get flooded with tons of messages about unclaimed registers.
- * So here we enable the "Debug" power well register and then restore its state
- * later. It's impossible to guarantee that other things won't mess with the
- * debug register between our put and get calls, but at least we're trying our
- * best to keep things working fine, and it's the debug register anyway.
- */
-static uint32_t power_well_get(void)
-{
-	uint32_t ret;
-	int i;
-
-	if (!IS_HASWELL(devid))
-		return 0;
-
-	ret = INREG(HSW_PWR_WELL_CTL4) & HSW_PWR_WELL_ENABLE_REQUEST;
-
-	OUTREG(HSW_PWR_WELL_CTL4, HSW_PWR_WELL_ENABLE_REQUEST);
-
-	for (i = 0; i < 20; i++) {
-		if (INREG(HSW_PWR_WELL_CTL4) & HSW_PWR_WELL_STATE_ENABLED)
-			break;
-		usleep(1000);
-	}
-
-	return ret;
-}
-
-static void power_well_put(uint32_t power_well)
-{
-	if (!IS_HASWELL(devid))
-		return;
-
-	OUTREG(HSW_PWR_WELL_CTL4, power_well);
-}
-
-static void print_usage(void)
-{
-	printf("Usage: intel_reg_dumper [options] [file]\n"
-	       "       intel_reg_dumper [options] register value\n"
-	       "Options:\n"
-	       "  -d id   when a dump file is used, use 'id' as device id (in "
-	       "hex)\n"
-	       "  -h      prints this help\n");
-}
-
-int main(int argc, char** argv)
-{
-	struct pci_device *pci_dev;
-	int opt, n_args;
-	char *file = NULL, *reg_name = NULL;
-	uint32_t reg_val, power_well;
-
-	fprintf(stderr, "WARNING: Use of %s has been deprecated and replaced by"
-		" intel_reg.\n", argv[0]);
-
-	while ((opt = getopt(argc, argv, "d:h")) != -1) {
-		switch (opt) {
-		case 'd':
-			devid = strtol(optarg, NULL, 16);
-			break;
-		case 'h':
-			print_usage();
-			return 0;
-		default:
-			print_usage();
-			return 1;
-		}
-	}
-
-	n_args = argc - optind;
-	if (n_args == 1) {
-		file = argv[optind];
-	} else if (n_args == 2) {
-		reg_name = argv[optind];
-		reg_val = strtoul(argv[optind + 1], NULL, 0);
-	} else if (n_args) {
-		print_usage();
-		return 1;
-	}
-
-	/* the tool operates in "single" mode, decode a single register given
-	 * on the command line: intel_reg_dumper PCH_PP_CONTROL 0xabcd0002 */
-	if (reg_name) {
-		decode_register(reg_name, reg_val);
-		return 0;
-	}
-
-	if (file) {
-		intel_mmio_use_dump_file(file);
-		if (devid) {
-			if (IS_GEN5(devid))
-				intel_pch = PCH_IBX;
-			else if (IS_GEN6(devid) || IS_IVYBRIDGE(devid))
-				intel_pch = PCH_CPT;
-			else if (IS_HASWELL(devid))
-				intel_pch = PCH_LPT;
-			else
-				intel_pch = PCH_NONE;
-		} else {
-			printf("Dumping from file without -d argument. "
-			       "Assuming Ironlake machine.\n");
-			devid = 0x0042;
-			intel_pch = PCH_IBX;
-		}
-	} else {
-		pci_dev = intel_get_pci_device();
-		devid = pci_dev->device_id;
-
-		intel_register_access_init(pci_dev, 1);
-
-		if (HAS_PCH_SPLIT(devid))
-			intel_check_pch();
-	}
-
-	power_well = power_well_get();
-
-	if (IS_HASWELL(devid) || IS_BROADWELL(devid)) {
-		intel_dump_regs(haswell_debug_regs);
-	} else if (IS_GEN5(devid) || IS_GEN6(devid) || IS_IVYBRIDGE(devid)) {
-		intel_dump_regs(ironlake_debug_regs);
-	} else if (IS_945GM(devid)) {
-		intel_dump_regs(i945gm_mi_regs);
-		intel_dump_regs(intel_debug_regs);
-		intel_dump_other_regs();
-	} else {
-		intel_dump_regs(intel_debug_regs);
-		intel_dump_other_regs();
-	}
-
-	if (intel_gen(devid) >= 6) {
-		intel_dump_regs(gen6_fences);
-		intel_dump_regs(gen6_rp_debug_regs);
-	}
-
-	power_well_put(power_well);
-
-	intel_register_access_fini();
-	return 0;
-}
diff --git a/tools/intel_reg_read.c b/tools/intel_reg_read.c
deleted file mode 100644
index 39671ff7afa6..000000000000
--- a/tools/intel_reg_read.c
+++ /dev/null
@@ -1,145 +0,0 @@ 
-/*
- * Copyright © 2010 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:
- *	Zhenyu Wang <zhenyuw@linux.intel.com>
- *
- */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <err.h>
-#include <string.h>
-#include "intel_io.h"
-#include "intel_chipset.h"
-
-static void bit_decode(uint32_t reg)
-{
-	int i;
-
-	for (i=31; i >= 0; i--)
-		printf(" %2d", i);
-	printf("\n");
-
-	for (i=31; i >= 0; i--)
-		printf(" %2d", (reg & (1 << i)) && 1);
-	printf("\n");
-}
-
-static void dump_range(uint32_t start, uint32_t end)
-{
-	int i;
-
-	for (i = start; i < end; i += 4)
-		printf("0x%X : 0x%X\n", i, INREG(i));
-}
-
-static void usage(char *cmdname)
-{
-	printf("Usage: %s [-f|-d] [addr1] [addr2] .. [addrN]\n", cmdname);
-	printf("\t -f : read back full range of registers.\n");
-	printf("\t      WARNING! This option may result in a machine hang!\n");
-	printf("\t -d : decode register bits.\n");
-	printf("\t -c : number of dwords to dump (can't be used with -f/-d).\n");
-	printf("\t addr : in 0xXXXX format\n");
-}
-
-int main(int argc, char** argv)
-{
-	int ret = 0;
-	uint32_t reg;
-	int i, ch;
-	char *cmdname = strdup(argv[0]);
-	int full_dump = 0;
-	int decode_bits = 0;
-	int dwords = 1;
-
-	fprintf(stderr, "WARNING: Use of %s has been deprecated and replaced by"
-		" intel_reg.\n", argv[0]);
-
-	while ((ch = getopt(argc, argv, "dfhc:")) != -1) {
-		switch(ch) {
-		case 'd':
-			decode_bits = 1;
-			break;
-		case 'f':
-			full_dump = 1;
-			break;
-		case 'h':
-			usage(cmdname);
-			ret = 1;
-			goto out;
-		case 'c':
-			dwords = strtol(optarg, NULL, 0);
-			break;
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	if (argc < 1) {
-		usage(cmdname);
-		ret = 1;
-		goto out;
-	}
-
-	if ((dwords > 1) && (argc != 1 || full_dump || decode_bits)) {
-		usage(cmdname);
-		ret = 1;
-		goto out;
-	}
-
-	intel_register_access_init(intel_get_pci_device(), 0);
-
-	if (full_dump) {
-		dump_range(0x00000, 0x00fff);   /* VGA registers */
-		dump_range(0x02000, 0x02fff);   /* instruction, memory, interrupt control registers */
-		dump_range(0x03000, 0x031ff);   /* FENCE and PPGTT control registers */
-		dump_range(0x03200, 0x03fff);   /* frame buffer compression registers */
-		dump_range(0x05000, 0x05fff);   /* I/O control registers */
-		dump_range(0x06000, 0x06fff);   /* clock control registers */
-		dump_range(0x07000, 0x07fff);   /* 3D internal debug registers */
-		dump_range(0x07400, 0x088ff);   /* GPE debug registers */
-		dump_range(0x0a000, 0x0afff);   /* display palette registers */
-		dump_range(0x10000, 0x13fff);   /* MMIO MCHBAR */
-		dump_range(0x30000, 0x3ffff);   /* overlay registers */
-		dump_range(0x60000, 0x6ffff);   /* display engine pipeline registers */
-		dump_range(0x70000, 0x72fff);   /* display and cursor registers */
-		dump_range(0x73000, 0x73fff);   /* performance counters */
-	} else {
-		for (i=0; i < argc; i++) {
-			sscanf(argv[i], "0x%x", &reg);
-			dump_range(reg, reg + (dwords * 4));
-
-			if (decode_bits)
-				bit_decode(INREG(reg));
-		}
-	}
-
-	intel_register_access_fini();
-
-out:
-	free(cmdname);
-	return ret;
-}
-
diff --git a/tools/intel_reg_snapshot.c b/tools/intel_reg_snapshot.c
deleted file mode 100644
index 8b097e6880b4..000000000000
--- a/tools/intel_reg_snapshot.c
+++ /dev/null
@@ -1,56 +0,0 @@ 
-/*
- * Copyright © 2010 Red Hat, Inc.
- *
- * 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:
- *	Adam Jackson <ajax@redhat.com>
- */
-
-#include <unistd.h>
-#include <assert.h>
-#include <stdio.h>
-#include "intel_io.h"
-#include "intel_chipset.h"
-
-int main(int argc, char** argv)
-{
-	struct pci_device *pci_dev;
-	uint32_t devid;
-	int mmio_bar;
-	int ret;
-
-	fprintf(stderr, "WARNING: Use of %s has been deprecated and replaced by"
-		" intel_reg.\n", argv[0]);
-
-	pci_dev = intel_get_pci_device();
-	devid = pci_dev->device_id;
-	intel_mmio_use_pci_bar(pci_dev);
-
-	if (IS_GEN2(devid))
-		mmio_bar = 1;
-	else
-		mmio_bar = 0;
-
-	ret = write(1, igt_global_mmio, pci_dev->regions[mmio_bar].size);
-	assert(ret > 0);
-
-	return 0;
-}
diff --git a/tools/intel_reg_write.c b/tools/intel_reg_write.c
deleted file mode 100644
index 127519c905fd..000000000000
--- a/tools/intel_reg_write.c
+++ /dev/null
@@ -1,60 +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:
- *    Ben Gamari <bgamari.foss@gmail.com>
- *
- */
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <err.h>
-#include "intel_io.h"
-#include "intel_chipset.h"
-
-int main(int argc, char** argv)
-{
-	uint32_t reg, value;
-
-	fprintf(stderr, "WARNING: Use of %s has been deprecated and replaced by"
-		" intel_reg.\n", argv[0]);
-
-	if (argc < 3) {
-		printf("Usage: %s addr value\n", argv[0]);
-		printf("  WARNING: This is dangerous to you and your system's health.\n");
-		printf("           Only for use in debugging.\n");
-		exit(1);
-	}
-
-	intel_register_access_init(intel_get_pci_device(), 0);
-	sscanf(argv[1], "0x%x", &reg);
-	sscanf(argv[2], "0x%x", &value);
-
-	printf("Value before: 0x%X\n", INREG(reg));
-	OUTREG(reg, value);
-	printf("Value after: 0x%X\n", INREG(reg));
-
-	intel_register_access_fini();
-	return 0;
-}
-
diff --git a/tools/intel_vga_read.c b/tools/intel_vga_read.c
deleted file mode 100644
index 8305fb86d626..000000000000
--- a/tools/intel_vga_read.c
+++ /dev/null
@@ -1,97 +0,0 @@ 
-/*
- * Copyright © 2013 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:
- *	Ville Syrjälä <ville.syrjala@linux.intel.com>
- *
- */
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/io.h>
-#include "intel_io.h"
-#include "intel_chipset.h"
-
-static uint8_t read_reg(uint32_t reg, bool use_mmio)
-{
-	if (use_mmio)
-		return INREG8(reg);
-	else
-		return inb(reg);
-}
-
-static void usage(const char *cmdname)
-{
-	printf("Usage: %s [-m] [addr1] [addr2] .. [addrN]\n", cmdname);
-	printf("\t -m : use MMIO instead of port IO\n");
-	printf("\t addr : in 0xXXXX format\n");
-}
-
-int main(int argc, char *argv[])
-{
-	bool use_mmio = false;
-	int ret = 0;
-	uint32_t reg;
-	int i, ch;
-	const char *cmdname = argv[0];
-
-	fprintf(stderr, "WARNING: Use of %s has been deprecated and replaced by"
-		" intel_reg.\n", argv[0]);
-
-	while ((ch = getopt(argc, argv, "m")) != -1) {
-		switch(ch) {
-		case 'm':
-			use_mmio = true;
-			break;
-		default:
-			break;
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	if (argc < 1) {
-		usage(cmdname);
-		return 1;
-	}
-
-	if (use_mmio)
-		intel_register_access_init(intel_get_pci_device(), 0);
-	else
-		assert(iopl(3) == 0);
-
-	for (i = 0; i < argc; i++) {
-		sscanf(argv[i], "0x%x", &reg);
-		printf("0x%X : 0x%X\n", reg, read_reg(reg, use_mmio));
-	}
-
-	if (use_mmio)
-		intel_register_access_fini();
-	else
-		iopl(0);
-
-	return ret;
-}
-
diff --git a/tools/intel_vga_write.c b/tools/intel_vga_write.c
deleted file mode 100644
index cb1ed98bdc8a..000000000000
--- a/tools/intel_vga_write.c
+++ /dev/null
@@ -1,97 +0,0 @@ 
-/*
- * Copyright © 2013 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:
- *	Ville Syrjälä <ville.syrjala@linux.intel.com>
- *
- */
-
-#include <assert.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/io.h>
-#include "intel_io.h"
-#include "intel_chipset.h"
-
-static void write_reg(uint32_t reg, uint8_t val, bool use_mmio)
-{
-	if (use_mmio)
-		OUTREG8(reg, val);
-	else
-		outb(val, reg);
-}
-
-static void usage(const char *cmdname)
-{
-	printf("Usage: %s [-m] addr value\n", cmdname);
-	printf("\t -m : use MMIO instead of port IO\n");
-	printf("\t addr,value : in 0xXXXX format\n");
-}
-
-int main(int argc, char *argv[])
-{
-	bool use_mmio = false;
-	int ret = 0;
-	uint32_t reg, val;
-	int ch;
-	const char *cmdname = argv[0];
-
-	fprintf(stderr, "WARNING: Use of %s has been deprecated and replaced by"
-		" intel_reg.\n", argv[0]);
-
-	while ((ch = getopt(argc, argv, "m")) != -1) {
-		switch(ch) {
-		case 'm':
-			use_mmio = true;
-			break;
-		default:
-			break;
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	if (argc < 2) {
-		usage(cmdname);
-		return 1;
-	}
-
-	sscanf(argv[0], "0x%x", &reg);
-	sscanf(argv[1], "0x%x", &val);
-
-	if (use_mmio)
-		intel_register_access_init(intel_get_pci_device(), 0);
-	else
-		assert(iopl(3) == 0);
-
-	write_reg(reg, val, use_mmio);
-
-	if (use_mmio)
-		intel_register_access_fini();
-	else
-		iopl(0);
-
-	return ret;
-}
-