Remove DRI support to fix build after devPrivates rework

This driver uses devprivates of all kinds, but this is
only done in deprecated and unused code so we can simply
remove it all.

DRM/DRI support has been commented out for years, and was
done during the conversion over to XAA acceleration.  This
code would need to be essentially rewritten to work again,
so we can just remove this stuff for now.

The rest were either:

1) DRI/DRM related uses
2) the private allocation code
3) cases that could index to the pScrn to get the FFB private

And that's all fixed up here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 52 deletions

diff --git a/src/ffb.h b/src/ffb.h
index cb21251..ea1b7fc 100644
--- a/src/ffb.h
+++ b/src/ffb.h
@@ -39,10 +39,6 @@
 #include "ffb_regs.h"
 #include "xf86sbusBus.h"
 #include "ffb_dac.h"
-#ifdef XF86DRI
-#include "xf86drm.h"
-#include "ffb_drishare.h"
-#endif
 #ifndef  DPMS_SERVER
 #define  DPMS_SERVER
 #endif   /* DPMS_SERVER */
@@ -97,14 +93,6 @@ typedef struct {
 	unsigned int bits[32];			/* The stipple bits themselves	*/
 } CreatorStippleRec, *CreatorStipplePtr;
 
-typedef struct {
-	int type;
-	unsigned int linepat;
-	CreatorStipplePtr stipple;
-	void (*PolySegment)(DrawablePtr, GCPtr, int, xSegment *);
-	void (*Polylines)(DrawablePtr, GCPtr, int, int, DDXPointPtr);
-} CreatorPrivGCRec, *CreatorPrivGCPtr;
-
 /* WID and framebuffer controls are a property of the
  * window.
  */
@@ -135,12 +123,6 @@ enum ffb_chip_type {
 	afb_m6			/* FCS Elite3D, 6 float chips */
 };
 
-#ifdef XF86DRI
-typedef struct {
-	int	index;
-} FFBConfigPrivRec, *FFBConfigPrivPtr;
-#endif
-
 typedef struct {
 	unsigned short fifo_cache;
 	unsigned short rp_active;
@@ -221,16 +203,6 @@ typedef struct {
 	void *I2C;
 	struct ffb_dac_info dac_info;
 
-#ifdef XF86DRI
-	void *pDRIInfo;
-	int numVisualConfigs;
-	void *pVisualConfigs;
-	FFBConfigPrivPtr pVisualConfigsPriv;
-	int drmSubFD;
-	Bool dri_enabled;
-	ffb_dri_state_t *pFfbSarea;
-#endif
-
 	OptionInfoPtr Options;
 } FFBRec, *FFBPtr;
 
@@ -261,18 +233,10 @@ extern void FFBWidFree(FFBPtr, unsigned int);
 extern unsigned int FFBWidUnshare(FFBPtr, unsigned int);
 extern unsigned int FFBWidReshare(FFBPtr, unsigned int);
 extern void FFBWidChangeBuffer(FFBPtr, unsigned int, int);
-extern Bool FFBWidIsShared(FFBPtr pFfb, unsigned int wid);
 
 /* Accelerated double-buffering. */
 extern Bool FFBDbePreInit(ScreenPtr);
 
-#ifdef XF86DRI
-/* DRI support */
-extern Bool FFBDRIScreenInit(ScreenPtr);
-extern Bool FFBDRIFinishScreenInit(ScreenPtr);
-extern void FFBDRICloseScreen(ScreenPtr);
-#endif
-
 /* The fastfill and pagefill buffer sizes change based upon
  * the resolution.
  */
@@ -290,24 +254,8 @@ extern struct fastfill_parms ffb_fastfill_parms[];
 
 #define FFB_FFPARMS(__fpriv)	(ffb_fastfill_parms[(__fpriv)->ffb_res])
 
-extern int  CreatorScreenPrivateIndex;
-extern int  CreatorGCPrivateIndex;
-extern int  CreatorWindowPrivateIndex;
-
 #define GET_FFB_FROM_SCRN(p)	((FFBPtr)((p)->driverPrivate))
 
-#define GET_FFB_FROM_SCREEN(s)						\
-((FFBPtr)(s)->devPrivates[CreatorScreenPrivateIndex].ptr)
-
-#define CreatorGetGCPrivate(g)						\
-((CreatorPrivGCPtr) (g)->devPrivates [CreatorGCPrivateIndex].ptr)
-
-#define CreatorGetWindowPrivate(w)					\
-((CreatorPrivWinPtr) (w)->devPrivates[CreatorWindowPrivateIndex].ptr)
-                            
-#define CreatorSetWindowPrivate(w,p) 					\
-((w)->devPrivates[CreatorWindowPrivateIndex].ptr = (pointer) p)
-
 #undef DEBUG_FFB
 
 #ifdef DEBUG_FFB