Remove dead i830_ring.h.

4 files changed, 0 insertions, 96 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 04bb95cc..c98e720b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,7 +77,6 @@ intel_drv_la_SOURCES = \
          i830_video.c \
          i830_video.h \
 	 i830_reg.h \
-         i830_ring.h \
 	 i915_3d.c \
 	 i915_3d.h \
 	 i915_reg.h \
diff --git a/src/i830_accel.c b/src/i830_accel.c
index 74808fd8..da7e773c 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -43,7 +43,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86.h"
 #include "i830.h"
 #include "i810_reg.h"
-#include "i830_ring.h"
 #include "i915_drm.h"
 
 unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap)
diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index ed80f149..b8995e27 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -35,7 +35,6 @@
 
 #include "xf86.h"
 #include "i830.h"
-#include "i830_ring.h"
 #include "i915_drm.h"
 
 #define DUMP_BATCHBUFFERS NULL /* "/tmp/i915-batchbuffers.dump" */
diff --git a/src/i830_ring.h b/src/i830_ring.h
deleted file mode 100644
index 994b6d24..00000000
--- a/src/i830_ring.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright © 2002 David Dawes
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-#ifndef _INTEL_RING_H
-#define _INTEL_RING_H
-
-#define OUT_RING(n) do {						\
-    if (I810_DEBUG & DEBUG_VERBOSE_RING)				\
-	ErrorF("OUT_RING 0x%08x: 0x%08x, (mask %x)\n",			\
-	       intel->ring_next, (unsigned int)(n),			\
-	       intel->ring.tail_mask);					\
-    *(volatile uint32_t *)(intel->ring.virtual_start +			\
-			   intel->ring_next) = n;			\
-    intel->ring_used += 4;						\
-    intel->ring_next += 4;						\
-    intel->ring_next &= intel->ring.tail_mask;				\
-} while (0)
-
-#define OUT_RING_F(x) do {			\
-	union intfloat tmp;			\
-	tmp.f = (float)(x);			\
-	OUT_RING(tmp.ui);			\
-} while(0)
-
-#define ADVANCE_LP_RING() do {						\
-    if (intel->ring_emitting == 0)					\
-	FatalError("%s: ADVANCE_LP_RING called with no matching "	\
-		   "BEGIN_LP_RING\n", __FUNCTION__);			\
-    if (intel->ring_used > intel->ring_emitting)			\
-	FatalError("%s: ADVANCE_LP_RING: exceeded allocation %d/%d\n ",	\
-		   __FUNCTION__, intel->ring_used,			\
-		   intel->ring_emitting);				\
-    if (intel->ring_used < intel->ring_emitting)			\
-	FatalError("%s: ADVANCE_LP_RING: under-used allocation %d/%d\n ", \
-		   __FUNCTION__, intel->ring_used,			\
-		   intel->ring_emitting);				\
-    intel->ring.tail = intel->ring_next;				\
-    intel->ring.space -= intel->ring_used;				\
-    if (intel->ring_next & 0x07)					\
-	FatalError("%s: ADVANCE_LP_RING: "				\
-		   "ring_next (0x%x) isn't on a QWord boundary\n",	\
-		   __FUNCTION__, intel->ring_next);			\
-    OUTREG(LP_RING + RING_TAIL, intel->ring_next);			\
-    intel->ring_emitting = 0;						\
-} while (0)
-
-#define BEGIN_LP_RING(n)						\
-do {									\
-    if (intel->ring_emitting != 0)					\
-	FatalError("%s: BEGIN_LP_RING called without closing "		\
-		   "ADVANCE_LP_RING\n", __FUNCTION__);			\
-    if ((n) > 2 && (I810_DEBUG&DEBUG_ALWAYS_SYNC))			\
-	i830_wait_ring_idle(scrn);					\
-    intel->ring_emitting = (n) * 4;					\
-    if ((n) & 1)							\
-	intel->ring_emitting += 4;					\
-    if (intel->ring.space < intel->ring_emitting)			\
-	WaitRingFunc(scrn, intel->ring_emitting, 0);			\
-    intel->ring_next = intel->ring.tail;				\
-    if (I810_DEBUG & DEBUG_VERBOSE_RING)				\
-	ErrorF( "BEGIN_LP_RING %d in %s\n", n, FUNCTION_NAME);		\
-    intel->ring_used = 0;						\
-    if ((n) & 1)							\
-	OUT_RING(MI_NOOP);						\
-} while (0)
-
-#endif /* _INTEL_RING_H */