vserver 1.9.3

[linux-2.6.git] / drivers / char / drm / radeon.h

diff --git a/drivers/char/drm/radeon.h b/drivers/char/drm/radeon.h
index 83902f8..43723d5 100644 (file)
--- a/drivers/char/drm/radeon.h
+++ b/drivers/char/drm/radeon.h
@@ -37,12 +37,6 @@
 
 /* General customization:
  */
-#define __HAVE_AGP             1
-#define __MUST_HAVE_AGP                0
-#define __HAVE_MTRR            1
-#define __HAVE_CTX_BITMAP      1
-#define __HAVE_SG              1
-#define __HAVE_PCI_DMA         1
 
 #define DRIVER_AUTHOR          "Gareth Hughes, Keith Whitwell, others."
 
@@ -115,59 +109,4 @@
  [DRM_IOCTL_NR(DRM_IOCTL_RADEON_IRQ_WAIT)]   = { radeon_irq_wait,    1, 0 }, \
  [DRM_IOCTL_NR(DRM_IOCTL_RADEON_SETPARAM)]   = { radeon_cp_setparam, 1, 0 }, \
 
-#define DRIVER_FILE_FIELDS                                             \
-       int64_t radeon_fb_delta;                                        \
-
-#define DRIVER_OPEN_HELPER( filp_priv, dev )                           \
-do {                                                                   \
-       drm_radeon_private_t *dev_priv = dev->dev_private;              \
-       if ( dev_priv )                                                 \
-               filp_priv->radeon_fb_delta = dev_priv->fb_location;     \
-       else                                                            \
-               filp_priv->radeon_fb_delta = 0;                         \
-} while( 0 )
-
-/* When a client dies:
- *    - Check for and clean up flipped page state
- *    - Free any alloced GART memory.
- *
- * DRM infrastructure takes care of reclaiming dma buffers.
- */
-#define DRIVER_PRERELEASE()                                            \
-do {                                                                   \
-       if ( dev->dev_private ) {                                       \
-               drm_radeon_private_t *dev_priv = dev->dev_private;      \
-               if ( dev_priv->page_flipping ) {                        \
-                       radeon_do_cleanup_pageflip( dev );              \
-               }                                                       \
-               radeon_mem_release( filp, dev_priv->gart_heap );        \
-               radeon_mem_release( filp, dev_priv->fb_heap );          \
-       }                                                               \
-} while (0)
-
-/* When the last client dies, shut down the CP and free dev->dev_priv.
- */
-/* #define __HAVE_RELEASE 1 */
-#define DRIVER_PRETAKEDOWN()                   \
-do {                                           \
-    radeon_do_release( dev );                  \
-} while (0)
-
-
-
-/* DMA customization:
- */
-#define __HAVE_DMA             1
-#define __HAVE_IRQ             1
-#define __HAVE_VBL_IRQ         1
-#define __HAVE_SHARED_IRQ       1
-
-
-/* Buffer customization:
- */
-#define DRIVER_BUF_PRIV_T      drm_radeon_buf_priv_t
-
-#define DRIVER_AGP_BUFFERS_MAP( dev )                          \
-       ((drm_radeon_private_t *)((dev)->dev_private))->buffers
-
 #endif