Update the intel driver to a more recent version based on more recent

upsteam code.

Backporting keeping UMS changes by me, some bugfixes from kettenis@.

Has been in snapshots for a while, committed on request so we can be
sure what people are running. This is a prerequesite for sandybridge
support but has those chipsets disabled for now until the correct code
has been added.

1 files changed, 0 insertions, 1154 deletions

diff --git a/driver/xf86-video-intel/src/i830.h b/driver/xf86-video-intel/src/i830.h
deleted file mode 100644
index d7a3aa9cd..000000000
--- a/driver/xf86-video-intel/src/i830.h
+++ /dev/null
@@ -1,1154 +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.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <keith@tungstengraphics.com>
- *   David Dawes <dawes@xfree86.org>
- *
- */
-
-#if 0
-#define I830DEBUG
-#endif
-
-#include <stdint.h>
-
-#ifndef REMAP_RESERVED
-#define REMAP_RESERVED 0
-#endif
-
-#ifndef _I830_H_
-#define _I830_H_
-
-#include "xf86_OSproc.h"
-#include "compiler.h"
-#include "xf86PciInfo.h"
-#include "xf86Pci.h"
-#include "i810_reg.h"
-#include "xf86Cursor.h"
-#include "xf86xv.h"
-#include "vgaHW.h"
-#include "xf86Crtc.h"
-#include "xf86RandR12.h"
-
-#include "xf86int10.h"
-
-#include "xorg-server.h"
-#include <pciaccess.h>
-
-#include "xf86drm.h"
-#include "sarea.h"
-#define _XF86DRI_SERVER_
-#include "dri.h"
-#include "GL/glxint.h"
-#include "intel_bufmgr.h"
-#include "i915_drm.h"
-
-#include "uxa.h"
-Bool i830_uxa_init(ScreenPtr pScreen);
-void i830_uxa_create_screen_resources(ScreenPtr pScreen);
-void i830_uxa_block_handler(ScreenPtr pScreen);
-Bool i830_get_aperture_space(ScrnInfoPtr scrn, drm_intel_bo ** bo_table,
-			     int num_bos);
-
-/* XXX
- * The X server gained an *almost* identical implementation in 1.9.
- *
- * Remove this duplicate code either in 2.16 (when we can depend upon 1.9)
- * or the drivers are merged back into the xserver tree, whichever happens
- * earlier.
- */
-
-#ifndef _LIST_H_
-/* classic doubly-link circular list */
-struct list {
-	struct list *next, *prev;
-};
-
-static void
-list_init(struct list *list)
-{
-	list->next = list->prev = list;
-}
-
-static inline void
-__list_add(struct list *entry,
-	    struct list *prev,
-	    struct list *next)
-{
-	next->prev = entry;
-	entry->next = next;
-	entry->prev = prev;
-	prev->next = entry;
-}
-
-static inline void
-list_add(struct list *entry, struct list *head)
-{
-	__list_add(entry, head, head->next);
-}
-
-static inline void
-__list_del(struct list *prev, struct list *next)
-{
-	next->prev = prev;
-	prev->next = next;
-}
-
-static inline void
-list_del(struct list *entry)
-{
-	__list_del(entry->prev, entry->next);
-	list_init(entry);
-}
-
-static inline Bool
-list_is_empty(struct list *head)
-{
-	return head->next == head;
-}
-#endif
-
-#ifndef container_of
-#define container_of(ptr, type, member) \
-	(type *)((char *)(ptr) - (char *) &((type *)0)->member)
-#endif
-
-#ifndef list_entry
-#define list_entry(ptr, type, member) \
-	container_of(ptr, type, member)
-#endif
-
-#ifndef list_first_entry
-#define list_first_entry(ptr, type, member) \
-	list_entry((ptr)->next, type, member)
-#endif
-
-#ifndef list_foreach
-#define list_foreach(pos, head)			\
-	for (pos = (head)->next; pos != (head);	pos = pos->next)
-#endif
-
-/* XXX list.h from xserver-1.9 uses a GCC-ism to avoid having to pass type */
-#ifndef list_foreach_entry
-#define list_foreach_entry(pos, type, head, member)		\
-	for (pos = list_entry((head)->next, type, member);\
-	     &pos->member != (head);					\
-	     pos = list_entry(pos->member.next, type, member))
-#endif
-
-struct intel_pixmap {
-	dri_bo *bo;
-
-	struct list flush, batch, in_flight;
-
-	uint16_t stride;
-	uint8_t tiling;
-	int8_t busy :2;
-	int8_t batch_write :1;
-};
-
-#if HAS_DEVPRIVATEKEYREC
-extern DevPrivateKeyRec uxa_pixmap_index;
-#else
-extern int uxa_pixmap_index;
-#endif
-
-static inline struct intel_pixmap *i830_get_pixmap_intel(PixmapPtr pixmap)
-{
-#if HAS_DEVPRIVATEKEYREC
-	return dixGetPrivate(&pixmap->devPrivates, &uxa_pixmap_index);
-#else
-	return dixLookupPrivate(&pixmap->devPrivates, &uxa_pixmap_index);
-#endif
-}
-
-static inline Bool intel_pixmap_is_busy(struct intel_pixmap *priv)
-{
-	if (priv->busy == -1)
-		priv->busy = drm_intel_bo_busy(priv->bo);
-	return priv->busy;
-}
-
-static inline void i830_set_pixmap_intel(PixmapPtr pixmap, struct intel_pixmap *intel)
-{
-	dixSetPrivate(&pixmap->devPrivates, &uxa_pixmap_index, intel);
-}
-
-static inline Bool i830_uxa_pixmap_is_dirty(PixmapPtr pixmap)
-{
-	return !list_is_empty(&i830_get_pixmap_intel(pixmap)->flush);
-}
-
-static inline Bool i830_pixmap_tiled(PixmapPtr pixmap)
-{
-	return i830_get_pixmap_intel(pixmap)->tiling != I915_TILING_NONE;
-}
-
-dri_bo *i830_get_pixmap_bo(PixmapPtr pixmap);
-void i830_set_pixmap_bo(PixmapPtr pixmap, dri_bo * bo);
-
-typedef struct _I830OutputRec I830OutputRec, *I830OutputPtr;
-
-#include "common.h"
-#include "i830_sdvo.h"
-#include "i2c_vid.h"
-
-#ifdef XvMCExtension
-#ifdef ENABLE_XVMC
-#define INTEL_XVMC 1
-#endif
-#endif
-
-#define ALWAYS_SYNC 0
-#define ALWAYS_FLUSH 0
-
-struct intel_screen_private;
-
-typedef void (*I830WriteIndexedByteFunc) (struct intel_screen_private  *intel,
-					  IOADDRESS addr, uint8_t index,
-					  uint8_t value);
-typedef uint8_t(*I830ReadIndexedByteFunc) (struct intel_screen_private *intel,
-					   IOADDRESS addr, uint8_t index);
-typedef void (*I830WriteByteFunc) (struct intel_screen_private *intel,
-				   IOADDRESS addr, uint8_t value);
-typedef uint8_t(*I830ReadByteFunc) (struct intel_screen_private *intel,
-				    IOADDRESS addr);
-
-enum tile_format {
-	TILE_NONE,
-	TILE_XMAJOR,
-	TILE_YMAJOR
-};
-
-#define PITCH_NONE 0
-
-/** Record of a linear allocation in the aperture. */
-typedef struct _i830_memory i830_memory;
-struct _i830_memory {
-	/** Offset of the allocation in card VM */
-	unsigned long offset;
-	/** End of the allocation in card VM */
-	unsigned long end;
-	/**
-	 * Requested size of the allocation: doesn't count padding.
-	 *
-	 * Any bound memory will cover offset to (offset + size).
-	 */
-	unsigned long size;
-	/**
-	 * Allocated aperture size, taking into account padding to allow for
-	 * tiling.
-	 */
-	unsigned long allocated_size;
-	/**
-	 * Physical (or more properly, bus) address of the allocation.
-	 * Only set if requested during allocation.
-	 */
-	uint64_t bus_addr;
-	/** AGP memory handle */
-	int key;
-	/**
-	 * Whether or not the AGP memory (if any) is currently bound.
-	 */
-	Bool bound;
-	/**
-	 * Offset that the AGP-allocated memory (if any) is to be bound to.
-	 *
-	 * This is either @offset or intel->stolen_size
-	 */
-	unsigned long agp_offset;
-
-	enum tile_format tiling;
-    	/**
-	 * Index of the fence register representing the tiled surface, when
-	 * bound.
-	 */
-	int fence_nr;
-	/** Pitch value in bytes for tiled surfaces */
-	unsigned int pitch;
-
-	/** Description of the allocation, for logging */
-	char *name;
-
-	/** @{
-	 * Memory allocator linked list pointers
-	 */
-	i830_memory *next;
-	i830_memory *prev;
-	/** @} */
-
-	dri_bo *bo;
-	uint32_t alignment;
-	uint32_t gem_name;
-	Bool lifetime_fixed_offset;
-};
-
-/* 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 */
-#define MAX_OUTPUTS 6
-
-#define I830_I2C_BUS_DVO 1
-#define I830_I2C_BUS_SDVO 2
-
-/* these are outputs from the chip - integrated only 
-   external chips are via DVO or SDVO output */
-#define I830_OUTPUT_UNUSED 0
-#define I830_OUTPUT_ANALOG 1
-#define I830_OUTPUT_DVO_TMDS 2
-#define I830_OUTPUT_DVO_LVDS 3
-#define I830_OUTPUT_DVO_TVOUT 4
-#define I830_OUTPUT_SDVO 5
-#define I830_OUTPUT_LVDS 6
-#define I830_OUTPUT_TVOUT 7
-#define I830_OUTPUT_HDMI 8
-
-struct _I830DVODriver {
-	int type;
-	char *modulename;
-	char *fntablename;
-	unsigned int dvo_reg;
-	uint32_t gpio;
-	int address;
-	I830I2CVidOutputRec *vid_rec;
-	void *dev_priv;
-	pointer modhandle;
-};
-
-typedef struct _I830CrtcPrivateRec {
-	int pipe;
-	int plane;
-
-	Bool enabled;
-
-	int dpms_mode;
-
-	int x, y;
-
-	/* Lookup table values to be set when the CRTC is enabled */
-	uint8_t lut_r[256], lut_g[256], lut_b[256];
-
-	i830_memory *rotate_mem;
-	/* Card virtual address of the cursor */
-	unsigned long cursor_offset;
-	unsigned long cursor_argb_offset;
-	/* Physical or virtual addresses of the cursor for setting in the cursor
-	 * registers.
-	 */
-	uint64_t cursor_addr;
-	unsigned long cursor_argb_addr;
-	Bool	cursor_is_argb;
-	int	bpc;
-} I830CrtcPrivateRec, *I830CrtcPrivatePtr;
-
-#define I830CrtcPrivate(c) ((I830CrtcPrivatePtr) (c)->driver_private)
-
-typedef struct _I830OutputPrivateRec {
-   int			    type;
-   I2CBusPtr		    pI2CBus;
-   I2CBusPtr		    pDDCBus;
-   struct _I830DVODriver    *i2c_drv;
-   Bool			    load_detect_temp;
-   Bool			    needs_tv_clock;
-   uint32_t		    lvds_bits;
-   int                      pipe_mask;
-   int			    clone_mask;
-   /** Output-private structure.  Should replace i2c_drv */
-   void			    *dev_priv;
-} I830OutputPrivateRec, *I830OutputPrivatePtr;
-
-#define I830OutputPrivate(o) ((I830OutputPrivatePtr) (o)->driver_private)
-
-/** enumeration of 3d consumers so some can maintain invariant state. */
-enum last_3d {
-	LAST_3D_OTHER,
-	LAST_3D_VIDEO,
-	LAST_3D_RENDER,
-	LAST_3D_ROTATION
-};
-
-/*
- * Backlight control has some unfortunate properties:
- *   - many machines won't give us brightness change notifications
- *     o brightness hotkeys
- *     o events like AC plug/unplug (can be controlled via _DOS setting)
- *     o ambient light sensor triggered changes
- *   - some machines use the so-called "legacy" backlight interface
- *     o resulting brightness is a combo of LBB and PWM values
- *     o LBB sits in config space
- *   - some machines have ACPI methods for changing brightness
- *     o one of the few ways the X server and firmware can stay in sync
- *   - new machines have the IGD OpRegion interface available
- *     o a reliable way of keeping the firmware and X in sync
- *
- * So the real problem is on machines where ACPI or OpRegion methods aren't
- * available.  In that case, problems can occur:
- *   1) the BIOS and X will have different ideas of what the brightness is,
- *      leading to unexpected results when the brightness is increased or
- *      decreased via hotkey or X protocol
- *   2) unless X takes the legacy register into account, machines using it
- *      may prevent X from raising the brightness above 0 if the firmware
- *      set LBB to 0
- * Given these problems, we provide the user with a selection of methods,
- * so they can choose an ideal one for their platform (assuming our quirk
- * code picks the wrong one).
- *
- * Four different backlight control methods are available:
- *   BCM_NATIVE:  only ever touch the native backlight control registers
- *     This method may be susceptible to problem (2) above if the firmware
- *     modifies the legacy registers.
- *   BCM_LEGACY:  only ever touch the legacy backlight control registers
- *     This method may be susceptible to problem (1) above if the firmware
- *     also modifies the legacy registers.
- *   BCM_COMBO:  try to use both sets
- *     In this case, the driver will try to modify both sets of registers
- *     if needed.  To avoid problem (2) above it may set the LBB register
- *     to a non-zero value if the brightness is to be increased.  It's still
- *     susceptible to problem (1), but to a lesser extent than the LEGACY only
- *     method.
- *   BCM_KERNEL:  use kernel methods for controlling the backlight
- *     This is only available on some platforms, but where present this can
- *     provide the best user experience.
- *
- * And, if you're in EL5, a fifth!
- *   BCM_IRONLAKE_NULL: just don't do anything and be quiet about it.  This is
- *     a workaround for an RHGB interaction; you won't hit this at runtime.
- */
-
-enum backlight_control {
-    BCM_NATIVE = 0,
-    BCM_LEGACY,
-    BCM_COMBO,
-    BCM_KERNEL,
-    BCM_IRONLAKE_NULL
-};
-
-enum dri_type {
-	DRI_DISABLED,
-	DRI_NONE,
-	DRI_DRI2
-};
-struct sdvo_device_mapping {
-   uint8_t dvo_port;
-   uint8_t slave_addr;
-   uint8_t dvo_wiring;
-   uint8_t initialized;
-};
-
-typedef struct intel_screen_private {
-	unsigned char *MMIOBase;
-	unsigned char *GTTBase;
-	unsigned char *FbBase;
-	int cpp;
-
-	unsigned int bufferOffset;	/* for I830SelectBuffer */
-
-	/* These are set in PreInit and never changed. */
-	long FbMapSize;
-	long GTTMapSize;
-
-	/**
-	 * Linked list of video memory allocations.  The head and tail are
-	 * dummy entries that bound the allocation area.
-	 */
-	i830_memory *memory_list;
-	/** Linked list of buffer object memory allocations */
-	i830_memory *bo_list;
-	long stolen_size;		/**< bytes of pre-bound stolen memory */
-	int gtt_acquired;		/**< whether we currently own the AGP */
-
-
-	i830_memory *front_buffer;
-	i830_memory *compressed_front_buffer;
-	i830_memory *compressed_ll_buffer;
-	/* One big buffer for all cursors for kernels that support this */
-	i830_memory *cursor_mem;
-	/* separate small buffers for kernels that support this */
-	i830_memory *cursor_mem_classic[2];
-	/* One big buffer for all cursors for kernels that support this */
-	i830_memory *cursor_mem_argb[2];
-
-	dri_bufmgr *bufmgr;
-
-	uint32_t batch_ptr[4096];
-	/** Byte offset in batch_ptr for the next dword to be emitted. */
-	unsigned int batch_used;
-	/** Position in batch_ptr at the start of the current BEGIN_BATCH */
-	unsigned int batch_emit_start;
-	/** Number of bytes to be emitted in the current BEGIN_BATCH. */
-	uint32_t batch_emitting;
-	dri_bo *batch_bo;
-	dri_bo *last_batch_bo;
-	/** Whether we're in a section of code that can't tolerate flushing */
-	Bool in_batch_atomic;
-	/** Ending batch_used that was verified by i830_start_batch_atomic() */
-	int batch_atomic_limit;
-	struct list batch_pixmaps;
-	struct list flush_pixmaps;
-	struct list in_flight;
-
-	/* For Xvideo */
-	i830_memory *overlay_regs;
-	void *offscreenImages;	/**< remembered memory block for release */
-	Bool use_drmmode_overlay;
-#ifdef INTEL_XVMC
-	/* For XvMC */
-	Bool XvMCEnabled;
-#endif
-
-	XF86ModReqInfo shadowReq; /* to test for later libshadow */
-
-	CreateScreenResourcesProcPtr CreateScreenResources;
-
-	i830_memory *power_context;
-
-	i830_memory *memory_manager;	/**< DRI memory manager aperture */
-
-	Bool need_mi_flush;
-
-	Bool tiling;
-	Bool fb_compression;
-	Bool swapbuffers_wait;
-
-	Bool CursorNeedsPhysical;
-
-	int Chipset;
-	unsigned long LinearAddr;
-	unsigned long MMIOAddr;
-	unsigned int MMIOSize;
-	IOADDRESS ioBase;
-	EntityInfoPtr pEnt;
-	struct pci_device *PciInfo;
-	uint8_t variant;
-
-	unsigned int BR[20];
-
-	Bool fence_used[FENCE_NEW_NR];
-
-	CloseScreenProcPtr CloseScreen;
-
-	void (*vertex_flush) (struct intel_screen_private *intel);
-	void (*batch_flush_notify) (ScrnInfoPtr scrn);
-
-	uxa_driver_t *uxa_driver;
-	Bool need_flush;
-	int accel_pixmap_pitch_alignment;
-	int accel_pixmap_offset_alignment;
-	int accel_max_x;
-	int accel_max_y;
-	int max_bo_size;
-	int max_gtt_map_size;
-	int max_tiling_size;
-
-	I830WriteIndexedByteFunc writeControl;
-	I830ReadIndexedByteFunc readControl;
-	I830WriteByteFunc writeStandard;
-	I830ReadByteFunc readStandard;
-
-	Bool XvDisabled;	/* Xv disabled in PreInit. */
-	Bool XvEnabled;		/* Xv enabled for this generation. */
-	Bool XvPreferOverlay;
-
-	int colorKey;
-	XF86VideoAdaptorPtr adaptor;
-	ScreenBlockHandlerProcPtr BlockHandler;
-	Bool overlayOn;
-
-	struct {
-		drm_intel_bo *gen4_vs_bo;
-		drm_intel_bo *gen4_sf_bo;
-		drm_intel_bo *gen4_wm_packed_bo;
-		drm_intel_bo *gen4_wm_planar_bo;
-		drm_intel_bo *gen4_cc_bo;
-		drm_intel_bo *gen4_cc_vp_bo;
-		drm_intel_bo *gen4_sampler_bo;
-		drm_intel_bo *gen4_sip_kernel_bo;
-	} video;
-
-	/* Render accel state */
-	float scale_units[2][2];
-	/** Transform pointers for src/mask, or NULL if identity */
-	PictTransform *transform[2];
-
-	PixmapPtr render_source, render_mask, render_dest;
-	PicturePtr render_source_picture, render_mask_picture, render_dest_picture;
-	CARD32 render_source_solid;
-	CARD32 render_mask_solid;
-	PixmapPtr render_current_dest;
-	Bool render_source_is_solid;
-	Bool render_mask_is_solid;
-	Bool needs_render_state_emit;
-	Bool needs_render_vertex_emit;
-	Bool needs_render_ca_pass;
-
-	/* i830 render accel state */
-	uint32_t render_dest_format;
-	uint32_t cblend, ablend, s8_blendctl;
-
-	/* i915 render accel state */
-	PixmapPtr texture[2];
-	uint32_t mapstate[6];
-	uint32_t samplerstate[6];
-
-	struct {
-		int op;
-		uint32_t dst_format;
-	} i915_render_state;
-
-	uint32_t prim_offset;
-	void (*prim_emit)(PixmapPtr dest,
-			  int srcX, int srcY,
-			  int maskX, int maskY,
-			  int dstX, int dstY,
-			  int w, int h);
-	int floats_per_vertex;
-	int last_floats_per_vertex;
-	uint32_t vertex_count;
-	uint32_t vertex_index;
-	uint32_t vertex_used;
-	float vertex_ptr[4*1024];
-	dri_bo *vertex_bo;
-
-	/* 965 render acceleration state */
-	struct gen4_render_state *gen4_render_state;
-
-	enum dri_type directRenderingType;	/* DRI enabled this generation. */
-
-	Bool directRenderingOpen;
-	int drmSubFD;
-#ifdef notyet
-	drmEventContext event_context;
-#endif
-	char *deviceName;
-
-	/* Broken-out options. */
-	OptionInfoPtr Options;
-
-	Bool lvds_24_bit_mode;
-	Bool lvds_use_ssc;
-	int lvds_ssc_freq; /* in MHz */
-	Bool lvds_dither;
-	DisplayModePtr lvds_fixed_mode;
-	DisplayModePtr sdvo_lvds_fixed_mode;
-	Bool skip_panel_detect;
-	Bool integrated_lvds; /* LVDS config from driver feature BDB */
-
-	Bool tv_present; /* TV connector present (from VBIOS) */
-
-	/* Driver phase/state information */
-	Bool preinit;
-	Bool starting;
-	Bool closing;
-	Bool suspended;
-	Bool leaving;
-
-	unsigned int SaveGeneration;
-
-	int ddc2;
-
-	enum backlight_control backlight_control_method;
-
-	uint32_t saveDSPARB;
-	uint32_t saveDSPACNTR;
-	uint32_t saveDSPBCNTR;
-	uint32_t savePIPEACONF;
-	uint32_t savePIPEBCONF;
-	uint32_t savePIPEASRC;
-	uint32_t savePIPEBSRC; uint32_t saveFPA0;
-	uint32_t saveFPA1;
-	uint32_t saveDPLL_A;
-	uint32_t saveDPLL_A_MD;
-	uint32_t saveHTOTAL_A;
-	uint32_t saveHBLANK_A;
-	uint32_t saveHSYNC_A;
-	uint32_t saveVTOTAL_A;
-	uint32_t saveVBLANK_A;
-	uint32_t saveVSYNC_A;
-	uint32_t saveBCLRPAT_A;
-	uint32_t saveDSPASTRIDE;
-	uint32_t saveDSPASIZE;
-	uint32_t saveDSPAPOS;
-	uint32_t saveDSPABASE;
-	uint32_t saveDSPASURF;
-	uint32_t saveDSPATILEOFF;
-	uint32_t saveFPB0;
-	uint32_t saveFPB1;
-	uint32_t saveDPLL_B;
-	uint32_t saveDPLL_B_MD;
-	uint32_t saveHTOTAL_B;
-	uint32_t saveHBLANK_B;
-	uint32_t saveHSYNC_B;
-	uint32_t saveVTOTAL_B;
-	uint32_t saveVBLANK_B;
-	uint32_t saveVSYNC_B;
-	uint32_t saveBCLRPAT_B;
-	uint32_t saveDSPBSTRIDE;
-	uint32_t saveDSPBSIZE;
-	uint32_t saveDSPBPOS;
-	uint32_t saveDSPBBASE;
-	uint32_t saveDSPBSURF;
-	uint32_t saveDSPBTILEOFF;
-	uint32_t saveVCLK_DIVISOR_VGA0;
-	uint32_t saveVCLK_DIVISOR_VGA1;
-	uint32_t saveVCLK_POST_DIV;
-	uint32_t saveVGACNTRL;
-	uint32_t saveCURSOR_A_CONTROL;
-	uint32_t saveCURSOR_A_BASE;
-	uint32_t saveCURSOR_A_POSITION;
-	uint32_t saveCURSOR_B_CONTROL;
-	uint32_t saveCURSOR_B_BASE;
-	uint32_t saveCURSOR_B_POSITION;
-	uint32_t saveADPA;
-	uint32_t saveLVDS;
-	uint32_t saveDVOA;
-	uint32_t saveDVOB;
-	uint32_t saveDVOC;
-	uint32_t savePP_ON;
-	uint32_t savePP_OFF;
-	uint32_t savePP_CONTROL;
-	uint32_t savePP_DIVISOR;
-	uint32_t savePFIT_CONTROL;
-	uint32_t savePaletteA[256];
-	uint32_t savePaletteB[256];
-	uint32_t saveSWF[17];
-	uint32_t saveBLC_PWM_CTL;
-	uint32_t saveBLC_PWM_CTL2;
-	uint32_t saveFBC_CFB_BASE;
-	uint32_t saveFBC_LL_BASE;
-	uint32_t saveFBC_CONTROL2;
-	uint32_t saveFBC_CONTROL;
-	uint32_t saveFBC_FENCE_OFF;
-	uint32_t saveRENCLK_GATE_D1;
-	uint32_t saveRENCLK_GATE_D2;
-	uint32_t saveDSPCLK_GATE_D;
-	uint32_t saveRAMCLK_GATE_D;
-	uint32_t savePWRCTXA;
-
-	enum last_3d last_3d;
-
-	Bool use_drm_mode;
-
-	/** Enables logging of debug output related to mode switching. */
-	Bool debug_modes;
-	unsigned int quirk_flag;
-
-	/**
-	 * User option to print acceleration fallback info to the server log.
-	 */
-	Bool fallback_debug;
-	struct sdvo_device_mapping sdvo_mappings[2];
-	unsigned debug_flush;
-
-	   /* ironlake vt restore hack */
-	   xf86Int10InfoPtr int10;
-	   int int10Mode;
-} intel_screen_private;
-
-enum {
-	DEBUG_FLUSH_BATCHES = 0x1,
-	DEBUG_FLUSH_CACHES = 0x2,
-	DEBUG_FLUSH_WAIT = 0x4,
-};
-
-
-static inline intel_screen_private *
-intel_get_screen_private(ScrnInfoPtr scrn)
-{
-	return (intel_screen_private *)(scrn->driverPrivate);
-}
-
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
-#define ALIGN(i,m)	(((i) + (m) - 1) & ~((m) - 1))
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-
-#define I830_SELECT_FRONT	0
-#define I830_SELECT_BACK	1
-#define I830_SELECT_DEPTH	2
-#define I830_SELECT_THIRD	3
-
-unsigned long intel_get_pixmap_offset(PixmapPtr pixmap);
-unsigned long intel_get_pixmap_pitch(PixmapPtr pixmap);
-
-/* Batchbuffer support macros and functions */
-#include "i830_batchbuffer.h"
-
-/* I830 specific functions */
-extern void I830SetPIOAccess(intel_screen_private *intel);
-extern void I830SetMMIOAccess(intel_screen_private *intel);
-extern void I830InitHWCursor(ScrnInfoPtr scrn);
-extern void I830SetPipeCursor (xf86CrtcPtr crtc, Bool force);
-extern Bool I830CursorInit(ScreenPtr pScreen);
-extern void IntelEmitInvarientState(ScrnInfoPtr scrn);
-extern void I830EmitInvarientState(ScrnInfoPtr scrn);
-extern void I915EmitInvarientState(ScrnInfoPtr scrn);
-extern Bool I830SelectBuffer(ScrnInfoPtr scrn, int buffer);
-void i830_update_cursor_offsets(ScrnInfoPtr scrn);
-
-/* CRTC-based cursor functions */
-void
-i830_crtc_load_cursor_image (xf86CrtcPtr crtc, unsigned char *src);
-
-#ifdef ARGB_CURSOR
-void
-i830_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image);
-#endif
-
-void
-i830_crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y);
-
-void
-i830_crtc_show_cursor (xf86CrtcPtr crtc);
-
-void
-i830_crtc_hide_cursor (xf86CrtcPtr crtc);
-
-void
-i830_crtc_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg);
-
-extern void i830_refresh_ring(ScrnInfoPtr scrn);
-extern void I830EmitFlush(ScrnInfoPtr scrn);
-
-extern void I830InitVideo(ScreenPtr pScreen);
-extern void i830_crtc_dpms_video(xf86CrtcPtr crtc, Bool on);
-extern xf86CrtcPtr i830_covering_crtc(ScrnInfoPtr scrn, BoxPtr box,
-				      xf86CrtcPtr desired, BoxPtr crtc_box_ret);
-int
-i830_crtc_pipe (xf86CrtcPtr crtc);
-
-extern xf86CrtcPtr i830_pipe_to_crtc(ScrnInfoPtr scrn, int pipe);
-
-Bool
-i830_pipe_a_require_activate (ScrnInfoPtr scrn);
-
-void
-i830_pipe_a_require_deactivate (ScrnInfoPtr scrn);
-
-Bool I830DRI2ScreenInit(ScreenPtr pScreen);
-void I830DRI2CloseScreen(ScreenPtr pScreen);
-void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec,
-			       unsigned int tv_usec, void *user_data);
-
-extern Bool drmmode_pre_init(ScrnInfoPtr scrn, int fd, int cpp);
-extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr * bufmgr,
-					 xf86CrtcPtr crtc);
-extern void drmmode_closefb(ScrnInfoPtr scrn);
-extern int drmmode_output_dpms_status(xf86OutputPtr output);
-extern int drmmode_crtc_id(xf86CrtcPtr crtc);
-void drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo * cursor);
-
-extern Bool i830_crtc_on(xf86CrtcPtr crtc);
-extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);
-extern Bool I830AccelInit(ScreenPtr pScreen);
-extern void I830SetupForScreenToScreenCopy(ScrnInfoPtr scrn, int xdir,
-					   int ydir, int rop,
-					   unsigned int planemask,
-					   int trans_color);
-extern void I830SubsequentScreenToScreenCopy(ScrnInfoPtr scrn, int srcX,
-					     int srcY, int dstX, int dstY,
-					     int w, int h);
-extern void I830SetupForSolidFill(ScrnInfoPtr scrn, int color, int rop,
-				  unsigned int planemask);
-extern void I830SubsequentSolidFillRect(ScrnInfoPtr scrn, int x, int y,
-					int w, int h);
-
-Bool i830_allocator_init(ScrnInfoPtr scrn, unsigned long size);
-void i830_allocator_fini(ScrnInfoPtr scrn);
-i830_memory *i830_allocate_memory(ScrnInfoPtr scrn, const char *name,
-				  unsigned long size, unsigned long pitch,
-				  unsigned long alignment, int flags,
-				  enum tile_format tile_format);
-void i830_describe_allocations(ScrnInfoPtr scrn, int verbosity,
-			       const char *prefix);
-void i830_reset_allocations(ScrnInfoPtr scrn);
-void i830_free_3d_memory(ScrnInfoPtr scrn);
-void i830_free_memory(ScrnInfoPtr scrn, i830_memory *mem);
-extern long I830CheckAvailableMemory(ScrnInfoPtr scrn);
-Bool i830_allocate_2d_memory(ScrnInfoPtr scrn);
-Bool i830_allocate_pwrctx(ScrnInfoPtr scrn);
-Bool i830_allocate_3d_memory(ScrnInfoPtr scrn);
-void i830_init_bufmgr(ScrnInfoPtr scrn);
-#ifdef INTEL_XVMC
-Bool i830_allocate_xvmc_buffer(ScrnInfoPtr scrn, const char *name,
-			       i830_memory ** buffer, unsigned long size,
-			       int flags);
-void i830_free_xvmc_buffer(ScrnInfoPtr scrn, i830_memory * buffer);
-#endif
-extern uint32_t i830_create_new_fb(ScrnInfoPtr scrn, int width, int height,
-				   int *pitch);
-
-Bool i830_tiled_width(intel_screen_private *intel, int *width, int cpp);
-
-extern Bool I830I2CInit(ScrnInfoPtr scrn, I2CBusPtr *bus_ptr, int i2c_reg,
-			char *name);
-
-/* i830_display.c */
-Bool
-i830PipeHasType (xf86CrtcPtr crtc, int type);
-
-/* i830_crt.c */
-void i830_crt_init(ScrnInfoPtr scrn);
-
-/* i830_dvo.c */
-void i830_dvo_init(ScrnInfoPtr scrn);
-
-/* i830_hdmi.c */
-void i830_hdmi_init(ScrnInfoPtr scrn, int output_reg);
-
-/* i830_lvds.c */
-void i830_lvds_init(ScrnInfoPtr scrn);
-
-/* i830_memory.c */
-Bool i830_bind_all_memory(ScrnInfoPtr scrn);
-Bool i830_unbind_all_memory(ScrnInfoPtr scrn);
-unsigned long i830_get_fence_size(intel_screen_private *intel, unsigned long size);
-unsigned long i830_get_fence_pitch(intel_screen_private *intel, unsigned long pitch,
-				   int format);
-void i830_set_gem_max_sizes(ScrnInfoPtr scrn);
-
-i830_memory *i830_allocate_framebuffer(ScrnInfoPtr scrn);
-
-/* i830_modes.c */
-DisplayModePtr i830_ddc_get_modes(xf86OutputPtr output);
-
-/* i830_tv.c */
-void i830_tv_init(ScrnInfoPtr scrn);
-
-/* i830_render.c */
-Bool i830_check_composite(int op,
-			  PicturePtr sourcec, PicturePtr mask, PicturePtr dest,
-			  int width, int height);
-Bool i830_check_composite_target(PixmapPtr pixmap);
-Bool i830_check_composite_texture(ScreenPtr screen, PicturePtr picture);
-Bool i830_prepare_composite(int op, PicturePtr sourcec, PicturePtr mask,
-			    PicturePtr dest, PixmapPtr sourcecPixmap,
-			    PixmapPtr maskPixmap, PixmapPtr destPixmap);
-Bool i830_transform_is_affine(PictTransformPtr t);
-
-void i830_composite(PixmapPtr dest, int srcX, int srcY,
-		    int maskX, int maskY, int dstX, int dstY, int w, int h);
-void i830_done_composite(PixmapPtr dest);
-/* i915_render.c */
-Bool i915_check_composite(int op,
-			  PicturePtr sourcec, PicturePtr mask, PicturePtr dest,
-			  int width, int height);
-Bool i915_check_composite_target(PixmapPtr pixmap);
-Bool i915_check_composite_texture(ScreenPtr screen, PicturePtr picture);
-Bool i915_prepare_composite(int op, PicturePtr sourcec, PicturePtr mask,
-			    PicturePtr dest, PixmapPtr sourcecPixmap,
-			    PixmapPtr maskPixmap, PixmapPtr destPixmap);
-void i915_composite(PixmapPtr dest, int srcX, int srcY,
-		    int maskX, int maskY, int dstX, int dstY, int w, int h);
-void i915_vertex_flush(intel_screen_private *intel);
-void i915_batch_flush_notify(ScrnInfoPtr scrn);
-void i830_batch_flush_notify(ScrnInfoPtr scrn);
-/* i965_render.c */
-unsigned int gen4_render_state_size(ScrnInfoPtr scrn);
-void gen4_render_state_init(ScrnInfoPtr scrn);
-void gen4_render_state_cleanup(ScrnInfoPtr scrn);
-Bool i965_check_composite(int op,
-			  PicturePtr sourcec, PicturePtr mask, PicturePtr dest,
-			  int width, int height);
-Bool i965_check_composite_texture(ScreenPtr screen, PicturePtr picture);
-Bool i965_prepare_composite(int op, PicturePtr sourcec, PicturePtr mask,
-			    PicturePtr dest, PixmapPtr sourcecPixmap,
-			    PixmapPtr maskPixmap, PixmapPtr destPixmap);
-void i965_composite(PixmapPtr dest, int srcX, int srcY,
-		    int maskX, int maskY, int dstX, int dstY, int w, int h);
-
-void i965_batch_flush_notify(ScrnInfoPtr scrn);
-
-Bool
-i830_get_transformed_coordinates(int x, int y, PictTransformPtr transform,
-				 float *x_out, float *y_out);
-
-Bool
-i830_get_transformed_coordinates_3d(int x, int y, PictTransformPtr transform,
-				    float *x_out, float *y_out, float *z_out);
-
-void i830_enter_render(ScrnInfoPtr);
-
-extern void intel_sync(ScrnInfoPtr scrn);
-
-static inline int i830_fb_compression_supported(intel_screen_private *intel)
-{
-    if (!IS_MOBILE(intel))
-	return FALSE;
-    if (IS_I810(intel) || IS_I815(intel) || IS_I830(intel))
-	return FALSE;
-    if (IS_IGD(intel))
-	return FALSE;
-    if (IS_IGDNG(intel))
-	return FALSE;
-    /* fbc depends on tiled surface.
-     */
-    if (!intel->tiling)
-	return FALSE;
-    /* We have not gotten FBC to work consistently on 965GM. Our best
-     * working theory right now is that FBC simply isn't reliable on
-     * that device. See this bug report for more details:
-     * https://bugs.freedesktop.org/show_bug.cgi?id=16257
-     */
-    if (IS_I965GM(intel) || IS_I915GM(intel) || IS_I945GM(intel))
-	return FALSE;
-    return TRUE;
-}
-
-static inline void
-intel_debug_fallback(ScrnInfoPtr scrn, char *format, ...)
-{
-	intel_screen_private *intel = intel_get_screen_private(scrn);
-	va_list ap;
-
-	va_start(ap, format);
-	if (intel->fallback_debug) {
-		xf86DrvMsg(scrn->scrnIndex, X_INFO, "fallback: ");
-		LogVMessageVerb(X_INFO, 1, format, ap);
-	}
-	va_end(ap);
-}
-
-Bool i830_pixmap_tiled(PixmapPtr p);
-
-static inline Bool
-intel_check_pitch_2d(PixmapPtr pixmap)
-{
-	uint32_t pitch = intel_get_pixmap_pitch(pixmap);
-	if (pitch > KB(32)) {
-		ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
-		intel_debug_fallback(scrn, "pitch exceeds 2d limit 32K\n");
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/* For pre-965 chip only, as they have 8KB limit for 3D */
-static inline Bool
-intel_check_pitch_3d(PixmapPtr pixmap)
-{
-	uint32_t pitch = intel_get_pixmap_pitch(pixmap);
-	if (pitch > KB(8)) {
-		ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
-		intel_debug_fallback(scrn, "pitch exceeds 3d limit 8K\n");
-		return FALSE;
-	}
-	return TRUE;
-}
-
-/**
- * Little wrapper around drm_intel_bo_reloc to return the initial value you
- * should stuff into the relocation entry.
- *
- * If only we'd done this before settling on the library API.
- */
-static inline uint32_t
-intel_emit_reloc(drm_intel_bo * bo, uint32_t offset,
-		 drm_intel_bo * target_bo, uint32_t target_offset,
-		 uint32_t read_domains, uint32_t write_domain)
-{
-	drm_intel_bo_emit_reloc(bo, offset, target_bo, target_offset,
-				read_domains, write_domain);
-
-	return target_bo->offset + target_offset;
-}
-
-static inline drm_intel_bo *intel_bo_alloc_for_data(ScrnInfoPtr scrn,
-						    void *data,
-						    unsigned int size,
-						    char *name)
-{
-	intel_screen_private *intel = intel_get_screen_private(scrn);
-	drm_intel_bo *bo;
-
-	bo = drm_intel_bo_alloc(intel->bufmgr, name, size, 4096);
-	if (!bo)
-		return NULL;
-	drm_intel_bo_subdata(bo, 0, size, data);
-
-	return bo;
-}
-
-extern const int I830PatternROP[16];
-extern const int I830CopyROP[16];
-
-/* Flags for memory allocation function */
-#define NEED_PHYSICAL_ADDR		0x00000001
-#define ALIGN_BOTH_ENDS			0x00000002
-#define NEED_NON_STOLEN			0x00000004
-#define NEED_LIFETIME_FIXED		0x00000008
-#define ALLOW_SHARING			0x00000010
-#define DISABLE_REUSE			0x00000020
-
-/* Chipset registers for VIDEO BIOS memory RW access */
-#define _855_DRAM_RW_CONTROL 0x58
-#define _845_DRAM_RW_CONTROL 0x90
-#define DRAM_WRITE    0x33330000
-
-/* quirk flag definition */
-#define QUIRK_IGNORE_TV			0x00000001
-#define QUIRK_IGNORE_LVDS		0x00000002
-#define QUIRK_IGNORE_MACMINI_LVDS 	0x00000004
-#define QUIRK_PIPEA_FORCE		0x00000008
-#define QUIRK_IVCH_NEED_DVOB		0x00000010
-#define QUIRK_RESET_MODES		0x00000020
-#define QUIRK_PFIT_SAFE			0x00000040
-#define QUIRK_IGNORE_CRT		0x00000080
-#define QUIRK_BROKEN_ACPI_LID		0x00000100
-extern void i830_fixup_devices(ScrnInfoPtr);
-
-void i830_debug_flush(ScrnInfoPtr scrn);
-
-static inline PixmapPtr get_drawable_pixmap(DrawablePtr drawable)
-{
-	ScreenPtr screen = drawable->pScreen;
-
-	if (drawable->type == DRAWABLE_PIXMAP)
-		return (PixmapPtr) drawable;
-	else
-		return screen->GetWindowPixmap((WindowPtr) drawable);
-}
-
-static inline Bool pixmap_is_scanout(PixmapPtr pixmap)
-{
-	ScreenPtr screen = pixmap->drawable.pScreen;
-
-	return pixmap == screen->GetScreenPixmap(screen);
-}
-
-/*
- * Pad to accelerator requirement
- */
-static inline int i830_pad_drawable_width(int width)
-{
-	return (width + 63) & ~63;
-}
-
-
-#endif /* _I830_H_ */