Remove all code that pretends to work if we lack drm and gem.

It doesn't work, and just adds extra complexity for no real gain by this
point.

1 files changed, 0 insertions, 34 deletions

diff --git a/src/i830.h b/src/i830.h
index e535537e..32792836 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -276,15 +276,6 @@ struct _i830_memory {
 	Bool lifetime_fixed_offset;
 };
 
-typedef struct {
-	int tail_mask;
-	i830_memory *mem;
-	unsigned char *virtual_start;
-	int head;
-	int tail;
-	int space;
-} I830RingBuffer;
-
 /* store information about an Ixxx DVO */
 /* The i830->i865 use multiple DVOs with multiple i2cs */
 /* the i915, i945 have a single sDVO i2c bus - which is different */
@@ -469,18 +460,6 @@ typedef struct intel_screen_private {
 	i830_memory *cursor_mem_classic[2];
 	/* One big buffer for all cursors for kernels that support this */
 	i830_memory *cursor_mem_argb[2];
-	i830_memory *fake_bufmgr_mem;
-
-	/* Regions allocated either from the above pools, or from agpgart. */
-	I830RingBuffer ring;
-
-	/** Number of bytes being emitted in the current BEGIN_LP_RING */
-	unsigned int ring_emitting;
-	/** Number of bytes that have been emitted in the current BEGIN_LP_RING */
-	unsigned int ring_used;
-	/** Offset in the ring for the next DWORD emit */
-	uint32_t ring_next;
-
 
 	dri_bufmgr *bufmgr;
 
@@ -518,8 +497,6 @@ typedef struct intel_screen_private {
 
 	i830_memory *memory_manager;	/**< DRI memory manager aperture */
 
-	Bool have_gem;
-
 	Bool need_mi_flush;
 
 	Bool tiling;
@@ -660,8 +637,6 @@ typedef struct intel_screen_private {
 
 	unsigned int SaveGeneration;
 
-	OsTimerPtr devicesTimer;
-
 	int ddc2;
 
 	enum backlight_control backlight_control_method;
@@ -791,7 +766,6 @@ unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap);
 #include "i830_batchbuffer.h"
 
 /* I830 specific functions */
-extern int I830WaitLpRing(ScrnInfoPtr scrn, int n, int timeout_millis);
 extern void I830SetPIOAccess(intel_screen_private *intel);
 extern void I830SetMMIOAccess(intel_screen_private *intel);
 extern void I830InitHWCursor(ScrnInfoPtr scrn);
@@ -988,14 +962,6 @@ void i830_enter_render(ScrnInfoPtr);
 
 extern void intel_sync(ScrnInfoPtr scrn);
 
-static inline void
-i830_wait_ring_idle(ScrnInfoPtr scrn)
-{
-   intel_screen_private *intel = intel_get_screen_private(scrn);
-
-   I830WaitLpRing(scrn, intel->ring.mem->size - 8, 0);
-}
-
 static inline int i830_fb_compression_supported(intel_screen_private *intel)
 {
     if (!IS_MOBILE(intel))