Merge commit 'origin/master' into modesetting-gem
authorKristian Høgsberg <krh@redhat.com>
Thu, 31 Jul 2008 19:18:32 +0000 (15:18 -0400)
committerKristian Høgsberg <krh@redhat.com>
Thu, 31 Jul 2008 19:18:32 +0000 (15:18 -0400)
Conflicts:
linux-core/Makefile.kernel
linux-core/ati_pcigart.c
linux-core/drm_compat.h
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h

21 files changed:
1  2 
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_compat.h
linux-core/drm_drv.c
linux-core/drm_irq.c
linux-core/drm_memory.c
linux-core/i915_drv.c
linux-core/i915_opregion.c
linux-core/radeon_drv.c
linux-core/radeon_reg.h
shared-core/drm.h
shared-core/drm_pciids.txt
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_init.c
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/r300_cmdbuf.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
shared-core/radeon_irq.c

@@@ -12,20 -12,16 +12,21 @@@ drm-objs    := drm_auth.o drm_bufs.o dr
                drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \
                drm_sysfs.o drm_pci.o drm_agpsupport.o drm_scatter.o \
                drm_memory_debug.o ati_pcigart.o drm_sman.o \
 -              drm_hashtab.o drm_mm.o drm_object.o drm_compat.o \
 +              drm_hashtab.o drm_memrange.o drm_object.o drm_compat.o \
                drm_fence.o drm_ttm.o drm_bo.o drm_bo_move.o drm_bo_lock.o \
 -              drm_regman.o drm_vm_nopage_compat.o
 +              drm_crtc.o drm_edid.o drm_modes.o drm_crtc_helper.o \
 +              drm_regman.o drm_vm_nopage_compat.o drm_gem.o
  tdfx-objs   := tdfx_drv.o
  r128-objs   := r128_drv.o r128_cce.o r128_state.o r128_irq.o
  mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
  i810-objs   := i810_drv.o i810_dma.o
  i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_fence.o \
-               i915_buffer.o i915_execbuf.o i915_gem.o \
+               i915_buffer.o i915_compat.o i915_execbuf.o i915_suspend.o \
 -              i915_opregion.o
++              i915_gem.o i915_opregion.o \
 +              intel_display.o intel_crt.o intel_lvds.o intel_bios.o \
 +              intel_sdvo.o intel_modes.o intel_i2c.o i915_init.o intel_fb.o \
-               intel_tv.o i915_compat.o intel_dvo.o dvo_ch7xxx.o \
++              intel_tv.o intel_dvo.o dvo_ch7xxx.o \
 +              dvo_ch7017.o dvo_ivch.o dvo_tfp410.o dvo_sil164.o
  nouveau-objs := nouveau_drv.o nouveau_state.o nouveau_fifo.o nouveau_mem.o \
                nouveau_object.o nouveau_irq.o nouveau_notifier.o nouveau_swmthd.o \
                nouveau_sgdma.o nouveau_dma.o nouveau_bo.o nouveau_fence.o \
                nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \
                nv04_graph.o nv10_graph.o nv20_graph.o \
                nv40_graph.o nv50_graph.o \
 -              nv04_instmem.o nv50_instmem.o
 -radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
 +              nv04_instmem.o nv50_instmem.o \
 +              nouveau_bios.o \
 +              nv50_crtc.o nv50_cursor.o nv50_lut.o nv50_fb.o nv50_output.o nv50_sor.o nv50_dac.o nv50_connector.o nv50_i2c.o nv50_display.o \
 +              nv50_kms_wrapper.o \
 +              nv50_fbcon.o
 +radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o radeon_gem.o \
 +       radeon_buffer.o radeon_fence.o atom.o radeon_display.o radeon_atombios.o radeon_i2c.o radeon_connectors.o \
 +      atombios_crtc.o radeon_encoders.o radeon_fb.o radeon_combios.o
  sis-objs    := sis_drv.o sis_mm.o
  ffb-objs    := ffb_drv.o ffb_context.o
  savage-objs := savage_drv.o savage_bci.o savage_state.o
@@@ -56,7 -46,6 +57,7 @@@ xgi-objs    := xgi_cmdlist.o xgi_drv.o 
  ifeq ($(CONFIG_COMPAT),y)
  drm-objs    += drm_ioc32.o
  radeon-objs += radeon_ioc32.o
 +radeon_ms-objs += radeon_ms_compat.o
  mga-objs    += mga_ioc32.o
  r128-objs   += r128_ioc32.o
  i915-objs   += i915_ioc32.o
@@@ -79,4 -68,3 +80,4 @@@ obj-$(CONFIG_DRM_MACH64)+= mach64.
  obj-$(CONFIG_DRM_NV)    += nv.o
  obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o
  obj-$(CONFIG_DRM_XGI)   += xgi.o
 +obj-$(CONFIG_DRM_RADEON_MS) += radeon_ms.o
diff --combined linux-core/drmP.h
@@@ -54,8 -54,6 +54,8 @@@
  #include <linux/smp_lock.h>   /* For (un)lock_kernel */
  #include <linux/dma-mapping.h>
  #include <linux/mm.h>
 +#include <linux/swap.h>
 +#include <linux/kref.h>
  #include <linux/pagemap.h>
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
  #include <linux/mutex.h>
  struct drm_device;
  struct drm_file;
  
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
 +typedef unsigned long uintptr_t;
 +#endif
 +
  /* If you want the memory alloc debug functionality, change define below */
  /* #define DEBUG_MEMORY */
  
  #define DRIVER_IRQ_SHARED  0x80
  #define DRIVER_DMA_QUEUE   0x100
  #define DRIVER_FB_DMA      0x200
 -
 +#define DRIVER_MODESET     0x400
 +#define DRIVER_GEM       0x800
  
  /*@}*/
  
   */
  #define LOCK_TEST_WITH_RETURN( dev, file_priv )                               \
  do {                                                                  \
 -      if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) ||           \
 -           dev->lock.file_priv != file_priv ) {                       \
 +      if ( !_DRM_LOCK_IS_HELD( file_priv->master->lock.hw_lock->lock ) ||             \
 +           file_priv->master->lock.file_priv != file_priv )   {                       \
                DRM_ERROR( "%s called without lock held, held  %d owner %p %p\n",\
 -                         __FUNCTION__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\
 -                         dev->lock.file_priv, file_priv );            \
 +                         __FUNCTION__, _DRM_LOCK_IS_HELD( file_priv->master->lock.hw_lock->lock ),\
 +                         file_priv->master->lock.file_priv, file_priv );              \
                return -EINVAL;                                         \
        }                                                               \
  } while (0)
@@@ -306,7 -299,6 +306,7 @@@ typedef int drm_ioctl_compat_t(struct f
  #define DRM_AUTH        0x1
  #define DRM_MASTER      0x2
  #define DRM_ROOT_ONLY   0x4
 +#define DRM_CONTROL_ALLOW 0x8 // allow ioctl to operate on control node 
  
  struct drm_ioctl_desc {
        unsigned int cmd;
@@@ -416,12 -408,14 +416,12 @@@ enum drm_ref_type 
  /** File private data */
  struct drm_file {
        int authenticated;
 -      int master;
        pid_t pid;
        uid_t uid;
        drm_magic_t magic;
        unsigned long ioctl_count;
        struct list_head lhead;
        struct drm_minor *minor;
 -      int remove_auth_on_close;
        unsigned long lock_count;
  
        /*
  
        struct list_head refd_objects;
  
 +      /** Mapping of mm object handles to object pointers. */
 +      struct idr object_idr;
 +      /** Lock for synchronization of access to object_idr. */
 +      spinlock_t table_lock;
 +
        struct drm_open_hash refd_object_hash[_DRM_NO_REF_TYPES];
        struct file *filp;
        void *driver_priv;
 +
 +      int is_master; /* this file private is a master for a minor */
 +      struct drm_master *master; /* master this node is currently associated with
 +                                    N.B. not always minor->master */
 +      struct list_head fbs;
  };
  
  /** Wait queue */
@@@ -480,11 -464,6 +480,11 @@@ struct drm_lock_data 
        uint32_t kernel_waiters;
        uint32_t user_waiters;
        int idle_has_lock;
 +      /**
 +       * Boolean signaling that the lock is held on behalf of the
 +       * file_priv client by the kernel in an ioctl handler.
 +       */
 +      int kernel_held;
  };
  
  /**
@@@ -560,17 -539,17 +560,17 @@@ struct drm_sigdata 
   * Generic memory manager structs
   */
  
 -struct drm_mm_node {
 +struct drm_memrange_node {
        struct list_head fl_entry;
        struct list_head ml_entry;
        int free;
        unsigned long start;
        unsigned long size;
 -      struct drm_mm *mm;
 +      struct drm_memrange *mm;
        void *private;
  };
  
 -struct drm_mm {
 +struct drm_memrange {
        struct list_head fl_entry;
        struct list_head ml_entry;
  };
@@@ -584,9 -563,7 +584,9 @@@ struct drm_map_list 
        struct drm_hash_item hash;
        struct drm_map *map;                    /**< mapping */
        uint64_t user_token;
 -      struct drm_mm_node *file_offset_node;
 +      struct drm_master *master; /** if this map is associated with a specific
 +                                     master */
 +      struct drm_memrange_node *file_offset_node;
  };
  
  typedef struct drm_map drm_local_map_t;
@@@ -607,13 -584,6 +607,13 @@@ struct drm_vbl_sig 
        struct task_struct *task;
  };
  
 +struct drm_hotplug_sig {
 +      struct list_head head;
 +      unsigned int counter;
 +      struct siginfo info;
 +      struct task_struct *task;
 +};
 +
  /* location of GART table */
  #define DRM_ATI_GART_MAIN 1
  #define DRM_ATI_GART_FB   2
@@@ -634,80 -604,7 +634,80 @@@ struct drm_ati_pcigart_info 
        int table_size;
  };
  
 +/**
 + * This structure defines the drm_mm memory object, which will be used by the
 + * DRM for its buffer objects.
 + */
 +struct drm_gem_object {
 +      /** Reference count of this object */
 +      struct kref refcount;
 +
 +      /** Handle count of this object. Each handle also holds a reference */
 +      struct kref handlecount;
 +
 +      /** Related drm device */
 +      struct drm_device *dev;
 +      
 +      /** File representing the shmem storage */
 +      struct file *filp;
 +
 +      /**
 +       * Size of the object, in bytes.  Immutable over the object's
 +       * lifetime.
 +       */
 +      size_t size;
 +
 +      /**
 +       * Global name for this object, starts at 1. 0 means unnamed.
 +       * Access is covered by the object_name_lock in the related drm_device
 +       */
 +      int name;
 +
 +      /**
 +       * Memory domains. These monitor which caches contain read/write data
 +       * related to the object. When transitioning from one set of domains
 +       * to another, the driver is called to ensure that caches are suitably
 +       * flushed and invalidated
 +       */
 +      uint32_t        read_domains;
 +      uint32_t        write_domain;
 +
 +      /**
 +       * While validating an exec operation, the
 +       * new read/write domain values are computed here.
 +       * They will be transferred to the above values
 +       * at the point that any cache flushing occurs
 +       */
 +      uint32_t        pending_read_domains;
 +      uint32_t        pending_write_domain;
 +
 +      void *driver_private;
 +};
 +
  #include "drm_objects.h"
 +#include "drm_crtc.h"
 +
 +/* per-master structure */
 +struct drm_master {
 +      
 +      struct list_head head; /**< each minor contains a list of masters */
 +      struct drm_minor *minor; /**< link back to minor we are a master for */
 +
 +      char *unique;                   /**< Unique identifier: e.g., busid */
 +      int unique_len;                 /**< Length of unique field */
 +
 +      int blocked;                    /**< Blocked due to VC switch? */
 +
 +      /** \name Authentication */
 +      /*@{ */
 +      struct drm_open_hash magiclist;
 +      struct list_head magicfree;
 +      /*@} */
 +
 +      struct drm_lock_data lock;              /**< Information on hardware lock */
 +
 +      void *driver_priv; /**< Private structure for driver to use */
 +};
  
  /**
   * DRM driver structure. This structure represent the common code for
@@@ -808,22 -705,6 +808,22 @@@ struct drm_driver 
        void (*set_version) (struct drm_device *dev,
                             struct drm_set_version *sv);
  
 +      /* Master routines */
 +      int (*master_create)(struct drm_device *dev, struct drm_master *master);
 +      void (*master_destroy)(struct drm_device *dev, struct drm_master *master);
 +
 +      int (*proc_init)(struct drm_minor *minor);
 +      void (*proc_cleanup)(struct drm_minor *minor);
 +
 +      /**
 +       * Driver-specific constructor for drm_gem_objects, to set up
 +       * obj->driver_private.
 +       *
 +       * Returns 0 on success.
 +       */
 +      int (*gem_init_object) (struct drm_gem_object *obj);
 +      void (*gem_free_object) (struct drm_gem_object *obj);
 +
        struct drm_fence_driver *fence_driver;
        struct drm_bo_driver *bo_driver;
  
  
  #define DRM_MINOR_UNASSIGNED 0
  #define DRM_MINOR_LEGACY 1
 +#define DRM_MINOR_CONTROL 2
 +#define DRM_MINOR_RENDER 3
  
  /**
   * DRM minor structure. This structure represents a drm minor number.
@@@ -857,15 -736,8 +857,15 @@@ struct drm_minor 
        dev_t device;                   /**< Device number for mknod */
        struct device kdev;             /**< Linux device */
        struct drm_device *dev;
 +      /* for render nodes */
        struct proc_dir_entry *dev_root;  /**< proc directory entry */
        struct class_device *dev_class;
 +
 +      /* for control nodes - a pointer to the current master for this control node */
 +      struct drm_master *master; /* currently active master for this node */
 +      struct list_head master_list;
 +
 +      struct drm_mode_group mode_group;
  };
  
  
   * may contain multiple heads.
   */
  struct drm_device {
 -      char *unique;                   /**< Unique identifier: e.g., busid */
 -      int unique_len;                 /**< Length of unique field */
        char *devname;                  /**< For /proc/interrupts */
        int if_version;                 /**< Highest interface version set */
  
 -      int blocked;                    /**< Blocked due to VC switch? */
 -
        /** \name Locks */
        /*@{ */
        spinlock_t count_lock;          /**< For inuse, drm_device::open_count, drm_device::buf_use */
        atomic_t counts[15];
        /*@} */
  
 -      /** \name Authentication */
 -      /*@{ */
 -      struct list_head filelist;
 -      struct drm_open_hash magiclist;
 -      struct list_head magicfree;
 -      /*@} */
  
        /** \name Memory management */
        /*@{ */
        struct list_head maplist;       /**< Linked list of regions */
        int map_count;                  /**< Number of mappable regions */
        struct drm_open_hash map_hash;       /**< User token hash table for maps */
 -      struct drm_mm offset_manager;        /**< User token manager */
 +      struct drm_memrange offset_manager;  /**< User token manager */
        struct drm_open_hash object_hash;    /**< User token hash table for objects */
        struct address_space *dev_mapping;  /**< For unmap_mapping_range() */
        struct page *ttm_dummy_page;
        struct idr ctx_idr;
  
        struct list_head vmalist;       /**< List of vmas (for debugging) */
 -      struct drm_lock_data lock;              /**< Information on hardware lock */
 +
 +      struct list_head filelist;
 +
        /*@} */
  
        /** \name DMA queues (contexts) */
        struct drm_device_dma *dma;             /**< Optional pointer for DMA support */
        /*@} */
  
 +
        /** \name Context support */
        /*@{ */
        int irq;                        /**< Interrupt used by board */
  
        struct work_struct work;
  
 +      /** \name HOTPLUG IRQ support */
 +      /*@{ */
 +      wait_queue_head_t hotplug_queue;        /**< HOTPLUG wait queue */
 +      spinlock_t hotplug_lock;
 +      struct list_head *hotplug_sigs;         /**< signal list to send on HOTPLUG */
 +      atomic_t hotplug_signal_pending;        /* number of signals pending on all crtcs*/
 +
 +      /*@} */
 +
        /** \name VBLANK IRQ support */
        /*@{ */
  
+       /*
+        * At load time, disabling the vblank interrupt won't be allowed since
+        * old clients may not call the modeset ioctl and therefore misbehave.
+        * Once the modeset ioctl *has* been called though, we can safely
+        * disable them when unused.
+        */
+       int vblank_disable_allowed;
        wait_queue_head_t *vbl_queue;   /**< VBLANK wait queue */
        atomic_t *_vblank_count;        /**< number of VBLANK interrupts (driver must alloc the right number of counters) */
        spinlock_t vbl_lock;
        atomic_t *vblank_refcount;      /* number of users of vblank interrupts per crtc */
        u32 *last_vblank;               /* protected by dev->vbl_lock, used */
                                        /* for wraparound handling */
-       u32 *vblank_offset;             /* used to track how many vblanks */
        int *vblank_enabled;            /* so we don't call enable more than
                                           once per disable */
-       u32 *vblank_premodeset;         /*  were lost during modeset */
+       int *vblank_inmodeset;          /* Display driver is setting mode */
        struct timer_list vblank_disable_timer;
  
-       unsigned long max_vblank_count; /**< size of vblank counter register */
+       u32 max_vblank_count;           /**< size of vblank counter register */
        spinlock_t tasklet_lock;        /**< For drm_locked_tasklet */
        void (*locked_tasklet_func)(struct drm_device *dev);
  
        struct drm_driver *driver;
        drm_local_map_t *agp_buffer_map;
        unsigned int agp_buffer_token;
 +
 +      /* minor number for control node */
 +      struct drm_minor *control;
        struct drm_minor *primary;              /**< render type primary screen head */
  
        struct drm_fence_manager fm;
        spinlock_t drw_lock;
        struct idr drw_idr;
        /*@} */
 +
 +      /* DRM mode setting */
 +      struct drm_mode_config mode_config;
 +
 +      /** \name GEM information */
 +      /*@{ */
 +      spinlock_t object_name_lock;
 +      struct idr object_name_idr;
 +      atomic_t object_count;
 +      atomic_t object_memory;
 +      atomic_t pin_count;
 +      atomic_t pin_memory;
 +      atomic_t gtt_count;
 +      atomic_t gtt_memory;
 +      uint32_t gtt_total;
 +      uint32_t invalidate_domains;    /* domains pending invalidation */
 +      uint32_t flush_domains;         /* domains pending flush */
 +      /*@} */
  };
  
  #if __OS_HAS_AGP
@@@ -1046,18 -902,7 +1053,18 @@@ struct drm_agp_ttm_backend 
        int populated;
  };
  #endif
 -
 +struct ati_pcigart_ttm_backend {
 +      struct drm_ttm_backend backend;
 +      int populated;
 +      void (*gart_flush_fn)(struct drm_device *dev);
 +      struct drm_ati_pcigart_info *gart_info;
 +      unsigned long offset;
 +      struct page **pages;
 +      int num_pages;
 +      int bound;
 +      struct drm_device *dev;
 +};
 +extern struct drm_ttm_backend *ati_pcigart_init_ttm(struct drm_device *dev, struct drm_ati_pcigart_info *info, void (*gart_flush_fn)(struct drm_device *dev));
  
  static __inline__ int drm_core_check_feature(struct drm_device *dev,
                                             int feature)
@@@ -1162,10 -1007,6 +1169,10 @@@ extern void drm_free_pages(unsigned lon
  extern DRM_AGP_MEM *drm_alloc_agp(struct drm_device *dev, int pages, u32 type);
  extern int drm_free_agp(DRM_AGP_MEM * handle, int pages);
  extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
 +extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
 +                                            struct page **pages,
 +                                            unsigned long num_pages,
 +                                            uint32_t gtt_offset);
  extern int drm_unbind_agp(DRM_AGP_MEM * handle);
  
  extern void drm_free_memctl(size_t size);
@@@ -1306,17 -1147,12 +1313,16 @@@ extern void drm_driver_irq_preinstall(s
  extern void drm_driver_irq_postinstall(struct drm_device *dev);
  extern void drm_driver_irq_uninstall(struct drm_device *dev);
  
 +extern int drm_hotplug_init(struct drm_device *dev);
 +extern int drm_wait_hotplug(struct drm_device *dev, void *data, struct drm_file *filp);
  extern int drm_vblank_init(struct drm_device *dev, int num_crtcs);
  extern int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *filp);
 +extern int drm_wait_hotplug(struct drm_device *dev, void *data, struct drm_file *filp);
  extern int drm_vblank_wait(struct drm_device * dev, unsigned int *vbl_seq);
  extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_device*));
  extern u32 drm_vblank_count(struct drm_device *dev, int crtc);
- extern void drm_update_vblank_count(struct drm_device *dev, int crtc);
  extern void drm_handle_vblank(struct drm_device *dev, int crtc);
 +extern void drm_handle_hotplug(struct drm_device *dev);
  extern int drm_vblank_get(struct drm_device *dev, int crtc);
  extern void drm_vblank_put(struct drm_device *dev, int crtc);
  
@@@ -1361,16 -1197,10 +1367,16 @@@ extern int drm_agp_unbind_memory(DRM_AG
  extern struct drm_ttm_backend *drm_agp_init_ttm(struct drm_device *dev);
  extern void drm_agp_chipset_flush(struct drm_device *dev);
                                /* Stub support (drm_stub.h) */
 +extern int drm_setmaster_ioctl(struct drm_device *dev, void *data,
 +                             struct drm_file *file_priv);
 +extern int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
 +                              struct drm_file *file_priv);
 +extern struct drm_master *drm_get_master(struct drm_minor *minor);
 +extern void drm_put_master(struct drm_master *master);
  extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
                     struct drm_driver *driver);
  extern int drm_put_dev(struct drm_device *dev);
 -extern int drm_put_minor(struct drm_minor **minor);
 +extern int drm_put_minor(struct drm_device *dev, struct drm_minor **p);
  extern unsigned int drm_debug; /* 1 to enable debug output */
  
  extern struct class *drm_class;
@@@ -1396,8 -1226,6 +1402,8 @@@ extern int drm_sg_free(struct drm_devic
                               /* ATI PCIGART support (ati_pcigart.h) */
  extern int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info);
  extern int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info);
 +extern int drm_ati_alloc_pcigart_table(struct drm_device *dev,
 +                                     struct drm_ati_pcigart_info *gart_info);
  
  extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
                           size_t align, dma_addr_t maxaddr);
@@@ -1409,102 -1237,31 +1415,103 @@@ struct drm_sysfs_class
  extern struct class *drm_sysfs_create(struct module *owner, char *name);
  extern void drm_sysfs_destroy(void);
  extern int drm_sysfs_device_add(struct drm_minor *minor);
 +extern void drm_sysfs_hotplug_event(struct drm_device *dev);
  extern void drm_sysfs_device_remove(struct drm_minor *minor);
 +extern char *drm_get_connector_status_name(enum drm_connector_status status);
 +extern int drm_sysfs_connector_add(struct drm_connector *connector);
 +extern void drm_sysfs_connector_remove(struct drm_connector *connector);
  
  /*
 - * Basic memory manager support (drm_mm.c)
 + * Basic memory manager support (drm_memrange.c)
   */
  
 -extern struct drm_mm_node * drm_mm_get_block(struct drm_mm_node * parent, unsigned long size,
 -                                             unsigned alignment);
 -extern void drm_mm_put_block(struct drm_mm_node *cur);
 -extern struct drm_mm_node *drm_mm_search_free(const struct drm_mm *mm, unsigned long size,
 -                                              unsigned alignment, int best_match);
 -extern int drm_mm_init(struct drm_mm *mm, unsigned long start, unsigned long size);
 -extern void drm_mm_takedown(struct drm_mm *mm);
 -extern int drm_mm_clean(struct drm_mm *mm);
 -extern unsigned long drm_mm_tail_space(struct drm_mm *mm);
 -extern int drm_mm_remove_space_from_tail(struct drm_mm *mm, unsigned long size);
 -extern int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size);
 -
 -static inline struct drm_mm *drm_get_mm(struct drm_mm_node *block)
 +extern struct drm_memrange_node *drm_memrange_get_block(struct drm_memrange_node * parent,
 +                                                      unsigned long size,
 +                                                      unsigned alignment);
 +extern void drm_memrange_put_block(struct drm_memrange_node *cur);
 +extern struct drm_memrange_node *drm_memrange_search_free(const struct drm_memrange *mm,
 +                                                        unsigned long size,
 +                                                        unsigned alignment, int best_match);
 +extern int drm_memrange_init(struct drm_memrange *mm,
 +                           unsigned long start, unsigned long size);
 +extern void drm_memrange_takedown(struct drm_memrange *mm);
 +extern int drm_memrange_clean(struct drm_memrange *mm);
 +extern unsigned long drm_memrange_tail_space(struct drm_memrange *mm);
 +extern int drm_memrange_remove_space_from_tail(struct drm_memrange *mm,
 +                                             unsigned long size);
 +extern int drm_memrange_add_space_to_tail(struct drm_memrange *mm,
 +                                        unsigned long size);
 +static inline struct drm_memrange *drm_get_mm(struct drm_memrange_node *block)
  {
        return block->mm;
  }
  
 +/* Graphics Execution Manager library functions (drm_gem.c) */
 +int
 +drm_gem_init (struct drm_device *dev);
 +
 +void
 +drm_gem_object_free (struct kref *kref);
 +
 +struct drm_gem_object *
 +drm_gem_object_alloc(struct drm_device *dev, size_t size);
 +
 +void
 +drm_gem_object_handle_free (struct kref *kref);
 +    
 +static inline void drm_gem_object_reference(struct drm_gem_object *obj)
 +{
 +      kref_get(&obj->refcount);
 +}
 +
 +static inline void drm_gem_object_unreference(struct drm_gem_object *obj)
 +{
 +      if (obj == NULL)
 +              return;
 +
 +      kref_put (&obj->refcount, drm_gem_object_free);
 +}
 +
 +int
 +drm_gem_handle_create(struct drm_file *file_priv,
 +                    struct drm_gem_object *obj,
 +                    int *handlep);
 +
 +static inline void drm_gem_object_handle_reference (struct drm_gem_object *obj)
 +{
 +      drm_gem_object_reference (obj);
 +      kref_get(&obj->handlecount);
 +}
 +
 +static inline void drm_gem_object_handle_unreference (struct drm_gem_object *obj)
 +{
 +      if (obj == NULL)
 +              return;
 +      
 +      /*
 +       * Must bump handle count first as this may be the last
 +       * ref, in which case the object would disappear before we
 +       * checked for a name
 +       */
 +      kref_put (&obj->handlecount, drm_gem_object_handle_free);
 +      drm_gem_object_unreference (obj);
 +}
 +
 +struct drm_gem_object *
 +drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp,
 +                    int handle);
 +int drm_gem_close_ioctl(struct drm_device *dev, void *data,
 +                      struct drm_file *file_priv);
 +int drm_gem_flink_ioctl(struct drm_device *dev, void *data,
 +                      struct drm_file *file_priv);
 +int drm_gem_open_ioctl(struct drm_device *dev, void *data,
 +                     struct drm_file *file_priv);
 +
 +void drm_gem_open(struct drm_device *dev, struct drm_file *file_private);
 +void drm_gem_release(struct drm_device *dev, struct drm_file *file_private);
 +
  extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev);
+ extern void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev);
  extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev);
  
  static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev,
diff --combined linux-core/drm_compat.h
  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
  #undef DRM_IRQ_ARGS
  #define DRM_IRQ_ARGS          int irq, void *arg, struct pt_regs *regs
 +
 +typedef _Bool bool;
 +enum {
 +        false   = 0,
 +        true    = 1
 +};
 +
  #endif
  
  #ifndef list_for_each_safe
@@@ -159,7 -152,7 +159,7 @@@ static __inline__ void *kcalloc(size_t 
  
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
  #define vmalloc_user(_size) ({void * tmp = vmalloc(_size);   \
 -      if (tmp) memset(tmp, 0, size);                       \
 +      if (tmp) memset(tmp, 0, _size);                      \
        (tmp);})
  #endif
  
@@@ -332,28 -325,11 +332,28 @@@ void *idr_replace(struct idr *idp, voi
  #endif
  
  #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
 -typedef _Bool                   bool;
 +extern unsigned long round_jiffies_relative(unsigned long j);
  #endif
  
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
 +extern struct pci_dev * pci_get_bus_and_slot(unsigned int bus, unsigned int devfn);
 +#endif
  
 -#if (defined(CONFIG_X86) && defined(CONFIG_X86_32) && defined(CONFIG_HIMEM))
 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
 +static inline int kobject_uevent_env(struct kobject *kobj,
 +                                     enum kobject_action action,
 +                                     char *envp[])
 +{
 +    return 0;
 +}
 +#endif
 +
 +#ifndef PM_EVENT_PRETHAW 
 +#define PM_EVENT_PRETHAW 3
 +#endif
 +
 +
 +#if (defined(CONFIG_X86) && defined(CONFIG_X86_32) && defined(CONFIG_HIGHMEM))
  #define DRM_KMAP_ATOMIC_PROT_PFN
  extern void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type,
                                  pgprot_t protection);
@@@ -386,12 -362,8 +386,16 @@@ extern struct page *drm_vm_sg_nopage(st
                                     unsigned long address, int *type);
  #endif
  
 +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26)
 +#define drm_on_each_cpu(handler, data, wait) \
 +      on_each_cpu(handler, data, wait)
 +#else
 +#define drm_on_each_cpu(handler, data, wait) \
 +      on_each_cpu(handler, data, wait, 1)
 +#endif
 +
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
+ #define drm_core_ioremap_wc drm_core_ioremap
+ #endif
  #endif
diff --combined linux-core/drm_drv.c
@@@ -56,29 -56,26 +56,29 @@@ static int drm_version(struct drm_devic
  
  /** Ioctl table */
  static struct drm_ioctl_desc drm_ioctls[] = {
 -      DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version, 0),
 +      DRM_IOCTL_DEF(DRM_IOCTL_VERSION, drm_version, DRM_CONTROL_ALLOW),
        DRM_IOCTL_DEF(DRM_IOCTL_GET_UNIQUE, drm_getunique, 0),
        DRM_IOCTL_DEF(DRM_IOCTL_GET_MAGIC, drm_getmagic, 0),
 -      DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid, DRM_MASTER|DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_IOCTL_IRQ_BUSID, drm_irq_by_busid, DRM_MASTER),
        DRM_IOCTL_DEF(DRM_IOCTL_GET_MAP, drm_getmap, 0),
        DRM_IOCTL_DEF(DRM_IOCTL_GET_CLIENT, drm_getclient, 0),
        DRM_IOCTL_DEF(DRM_IOCTL_GET_STATS, drm_getstats, 0),
 -      DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER|DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_IOCTL_SET_VERSION, drm_setversion, DRM_MASTER),
  
 -      DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_setunique, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_IOCTL_SET_UNIQUE, drm_setunique, DRM_AUTH|DRM_MASTER),
        DRM_IOCTL_DEF(DRM_IOCTL_BLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
        DRM_IOCTL_DEF(DRM_IOCTL_UNBLOCK, drm_noop, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 -      DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_IOCTL_AUTH_MAGIC, drm_authmagic, DRM_AUTH|DRM_MASTER),
  
 -      DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_addmap_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_IOCTL_ADD_MAP, drm_addmap_ioctl, DRM_AUTH|DRM_MASTER),
        DRM_IOCTL_DEF(DRM_IOCTL_RM_MAP, drm_rmmap_ioctl, DRM_AUTH),
  
        DRM_IOCTL_DEF(DRM_IOCTL_SET_SAREA_CTX, drm_setsareactx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
        DRM_IOCTL_DEF(DRM_IOCTL_GET_SAREA_CTX, drm_getsareactx, DRM_AUTH),
  
 +      DRM_IOCTL_DEF(DRM_IOCTL_SET_MASTER, drm_setmaster_ioctl, DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_IOCTL_DROP_MASTER, drm_dropmaster_ioctl, DRM_ROOT_ONLY),
 +
        DRM_IOCTL_DEF(DRM_IOCTL_ADD_CTX, drm_addctx, DRM_AUTH|DRM_ROOT_ONLY),
        DRM_IOCTL_DEF(DRM_IOCTL_RM_CTX, drm_rmctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
        DRM_IOCTL_DEF(DRM_IOCTL_MOD_CTX, drm_modctx, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
        /* The DRM_IOCTL_DMA ioctl should be defined by the driver. */
        DRM_IOCTL_DEF(DRM_IOCTL_DMA, NULL, DRM_AUTH),
  
 -      DRM_IOCTL_DEF(DRM_IOCTL_CONTROL, drm_control, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_IOCTL_CONTROL, drm_control, DRM_AUTH|DRM_MASTER),
  
  #if __OS_HAS_AGP
        DRM_IOCTL_DEF(DRM_IOCTL_AGP_ACQUIRE, drm_agp_acquire_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
  
        DRM_IOCTL_DEF(DRM_IOCTL_UPDATE_DRAW, drm_update_drawable_info, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
  
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCONNECTOR, drm_mode_getconnector, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETCRTC, drm_mode_setcrtc, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_CURSOR, drm_mode_cursor_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_MASTER|DRM_CONTROL_ALLOW),
 +
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_mode_connector_property_set_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_mode_attachmode_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_mode_detachmode_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl, DRM_MASTER | DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_HOTPLUG, drm_mode_hotplug_ioctl, DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_WAIT_HOTPLUG, drm_wait_hotplug, 0),
 +
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_REPLACEFB, drm_mode_replacefb, DRM_MASTER|DRM_ROOT_ONLY|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETENCODER, drm_mode_getencoder, DRM_MASTER|DRM_CONTROL_ALLOW),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETGAMMA, drm_mode_gamma_get_ioctl, DRM_MASTER),
 +      DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETGAMMA, drm_mode_gamma_set_ioctl, DRM_MASTER),
 +
        DRM_IOCTL_DEF(DRM_IOCTL_MM_INIT, drm_mm_init_ioctl,
                      DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
        DRM_IOCTL_DEF(DRM_IOCTL_MM_TAKEDOWN, drm_mm_takedown_ioctl,
        DRM_IOCTL_DEF(DRM_IOCTL_BO_VERSION, drm_bo_version_ioctl, 0),
  
        DRM_IOCTL_DEF(DRM_IOCTL_MM_INFO, drm_mm_info_ioctl, 0),
 +
 +      DRM_IOCTL_DEF(DRM_IOCTL_GEM_CLOSE, drm_gem_close_ioctl, 0),
 +      DRM_IOCTL_DEF(DRM_IOCTL_GEM_FLINK, drm_gem_flink_ioctl, DRM_AUTH),
 +      DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH),
  };
  
  #define DRM_CORE_IOCTL_COUNT  ARRAY_SIZE( drm_ioctls )
   */
  int drm_lastclose(struct drm_device * dev)
  {
 -      struct drm_magic_entry *pt, *next;
 -      struct drm_map_list *r_list, *list_t;
        struct drm_vma_entry *vma, *vma_temp;
        int i;
  
        DRM_DEBUG("\n");
  
 +      if (!drm_core_check_feature(dev, DRIVER_MODESET))
 +              drm_bo_driver_finish(dev);
 +
        /*
         * We can't do much about this function failing.
         */
  
 -      drm_bo_driver_finish(dev);
 -
        if (dev->driver->lastclose)
                dev->driver->lastclose(dev);
        DRM_DEBUG("driver lastclose completed\n");
  
 -      if (dev->unique) {
 -              drm_free(dev->unique, strlen(dev->unique) + 1, DRM_MEM_DRIVER);
 -              dev->unique = NULL;
 -              dev->unique_len = 0;
 -      }
  
 -      if (dev->irq_enabled)
 -              drm_irq_uninstall(dev);
 +/*    if (dev->irq_enabled)
 +              drm_irq_uninstall(dev); */
  
        /* Free drawable information memory */
        mutex_lock(&dev->struct_mutex);
        drm_drawable_free_all(dev);
        del_timer(&dev->timer);
  
 -      if (dev->unique) {
 -              drm_free(dev->unique, strlen(dev->unique) + 1, DRM_MEM_DRIVER);
 -              dev->unique = NULL;
 -              dev->unique_len = 0;
 +      if (dev->primary->master) {
 +              drm_put_master(dev->primary->master);
 +              dev->primary->master = NULL;
        }
 -
 -      if (dev->magicfree.next) {
 -              list_for_each_entry_safe(pt, next, &dev->magicfree, head) {
 -                      list_del(&pt->head);
 -                      drm_ht_remove_item(&dev->magiclist, &pt->hash_item);
 -                      drm_free(pt, sizeof(*pt), DRM_MEM_MAGIC);
 -              }
 -              drm_ht_remove(&dev->magiclist);
 -      }
 -
 -
 +      
        /* Clear AGP information */
        if (drm_core_has_AGP(dev) && dev->agp) {
                struct drm_agp_mem *entry, *tempe;
                dev->agp->acquired = 0;
                dev->agp->enabled = 0;
        }
 -      if (drm_core_check_feature(dev, DRIVER_SG) && dev->sg) {
 +
 +      /* You're supposed to have a real memory manager for modesetting, but this'll suffice as a temporary workaround. */
 +      /* This assumes sgdma is inited at load time. */
 +      if (drm_core_check_feature(dev, DRIVER_SG) && !drm_core_check_feature(dev, DRIVER_MODESET) && dev->sg) {
                drm_sg_cleanup(dev->sg);
                dev->sg = NULL;
        }
                drm_ctl_free(vma, sizeof(*vma), DRM_MEM_VMAS);
        }
  
 +      /*
        list_for_each_entry_safe(r_list, list_t, &dev->maplist, head) {
                if (!(r_list->map->flags & _DRM_DRIVER)) {
                        drm_rmmap_locked(dev, r_list->map);
                        r_list = NULL;
                }
 -      }
 +      }*/
  
        if (drm_core_check_feature(dev, DRIVER_DMA_QUEUE) && dev->queuelist) {
                for (i = 0; i < dev->queue_count; i++) {
        if (drm_core_check_feature(dev, DRIVER_HAVE_DMA))
                drm_dma_takedown(dev);
  
 -      if (dev->lock.hw_lock) {
 -              dev->sigdata.lock = dev->lock.hw_lock = NULL;   /* SHM removed */
 -              dev->lock.file_priv = NULL;
 -              wake_up_interruptible(&dev->lock.lock_queue);
 -      }
        dev->dev_mapping = NULL;
        mutex_unlock(&dev->struct_mutex);
  
@@@ -414,27 -403,22 +414,27 @@@ static void drm_cleanup(struct drm_devi
                DRM_DEBUG("mtrr_del=%d\n", retval);
        }
  
 +      if (dev->driver->unload)
 +              dev->driver->unload(dev);
 +        
 +      drm_ht_remove(&dev->map_hash);
        if (drm_core_has_AGP(dev) && dev->agp) {
                drm_free(dev->agp, sizeof(*dev->agp), DRM_MEM_AGPLISTS);
                dev->agp = NULL;
        }
 -      if (dev->driver->unload)
 -              dev->driver->unload(dev);
  
        if (!drm_fb_loaded)
                pci_disable_device(dev->pdev);
  
        drm_ctxbitmap_cleanup(dev);
        drm_ht_remove(&dev->map_hash);
 -      drm_mm_takedown(&dev->offset_manager);
 +      drm_memrange_takedown(&dev->offset_manager);
        drm_ht_remove(&dev->object_hash);
  
 -      drm_put_minor(&dev->primary);
 +      drm_put_minor(dev, &dev->primary);
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              drm_put_minor(dev, &dev->control);
 +
        if (drm_put_dev(dev))
                DRM_ERROR("Cannot unload module\n");
  }
@@@ -449,14 -433,8 +449,14 @@@ int drm_minors_cleanup(int id, void *pt
        if (minor->dev->driver != driver)
                return 0;
  
 -      if (minor->type != DRM_MINOR_LEGACY)
 -              return 0;
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +              if (minor->type != DRM_MINOR_CONTROL)
 +                      return 0;
 +      } else {
 +              if (minor->type != DRM_MINOR_LEGACY)
 +                      return 0;
 +      }
 +
  
        if (dev)
                pci_dev_put(dev->pdev);
@@@ -635,13 -613,13 +635,14 @@@ long drm_unlocked_ioctl(struct file *fi
        if ((nr >= DRM_COMMAND_BASE) && (nr < DRM_COMMAND_END)
                && (nr < DRM_COMMAND_BASE + dev->driver->num_ioctls))
                ioctl = &dev->driver->ioctls[nr - DRM_COMMAND_BASE];
-       else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE))
+       else if ((nr >= DRM_COMMAND_END) || (nr < DRM_COMMAND_BASE)) {
                ioctl = &drm_ioctls[nr];
-       else {
+               cmd = ioctl->cmd;
+       } else {
                retcode = -EINVAL;
                goto err_i1;
        }
 +        
  #if 0
        /*
         * This check is disabled, because driver private ioctl->cmd
                goto err_i1;
        }
  #endif
        func = ioctl->func;
        /* is there a local override? */
        if ((nr == DRM_IOCTL_NR(DRM_IOCTL_DMA)) && dev->driver->dma_ioctl)
        if (cmd & IOC_IN) {
                if (copy_from_user(kdata, (void __user *)arg,
                                   _IOC_SIZE(cmd)) != 0) {
 -                      retcode = -EACCES;
 +                      retcode = -EFAULT;
                        goto err_i1;
                }
        }
                retcode = -EINVAL;
        } else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) ||
                   ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) ||
 -                 ((ioctl->flags & DRM_MASTER) && !file_priv->master)) {
 +                 ((ioctl->flags & DRM_MASTER) && !file_priv->master) ||
 +                 ((!(ioctl->flags & DRM_CONTROL_ALLOW)) && (file_priv->minor->type == DRM_MINOR_CONTROL)) ) {
                retcode = -EACCES;
        } else {
                retcode = func(dev, kdata, file_priv);
        }
  
-       if ((retcode == 0) && (cmd & IOC_OUT)) {
+       if (cmd & IOC_OUT) {
                if (copy_to_user((void __user *)arg, kdata,
                                 _IOC_SIZE(cmd)) != 0)
 -                      retcode = -EACCES;
 +                      retcode = -EFAULT;
        }
  
  err_i1:
        atomic_dec(&dev->ioctl_count);
        if (retcode)
 -              DRM_DEBUG("ret = %d\n", retcode);
 +              DRM_ERROR("ret = %x %d\n", nr, retcode);
        return retcode;
  }
  EXPORT_SYMBOL(drm_unlocked_ioctl);
diff --combined linux-core/drm_irq.c
@@@ -63,7 -63,7 +63,7 @@@ int drm_irq_by_busid(struct drm_device 
            p->devnum != PCI_SLOT(dev->pdev->devfn) || p->funcnum != PCI_FUNC(dev->pdev->devfn))
                return -EINVAL;
  
 -      p->irq = dev->irq;
 +      p->irq = dev->pdev->irq;
  
        DRM_DEBUG("%d:%d:%d => IRQ %d\n", p->busnum, p->devnum, p->funcnum,
                  p->irq);
@@@ -77,10 -77,16 +77,16 @@@ static void vblank_disable_fn(unsigned 
        unsigned long irqflags;
        int i;
  
+       if (!dev->vblank_disable_allowed)
+               return;
        for (i = 0; i < dev->num_crtcs; i++) {
                spin_lock_irqsave(&dev->vbl_lock, irqflags);
                if (atomic_read(&dev->vblank_refcount[i]) == 0 &&
                    dev->vblank_enabled[i]) {
+                       DRM_DEBUG("disabling vblank on crtc %d\n", i);
+                       dev->last_vblank[i] =
+                               dev->driver->get_vblank_counter(dev, i);
                        dev->driver->disable_vblank(dev, i);
                        dev->vblank_enabled[i] = 0;
                }
  
  static void drm_vblank_cleanup(struct drm_device *dev)
  {
 -      /* Bail if the driver didn't call drm_vblank_init() */
 -      if (dev->num_crtcs == 0)
 -              return;
 -
        del_timer(&dev->vblank_disable_timer);
  
        vblank_disable_fn((unsigned long)dev);
  
 -      drm_free(dev->vbl_queue, sizeof(*dev->vbl_queue) * dev->num_crtcs,
 +      if (dev->vbl_queue)
 +          drm_free(dev->vbl_queue, sizeof(*dev->vbl_queue) * dev->num_crtcs,
                 DRM_MEM_DRIVER);
 -      drm_free(dev->vbl_sigs, sizeof(*dev->vbl_sigs) * dev->num_crtcs,
 +
 +      if (dev->vbl_sigs)
 +          drm_free(dev->vbl_sigs, sizeof(*dev->vbl_sigs) * dev->num_crtcs,
                 DRM_MEM_DRIVER);
 -      drm_free(dev->_vblank_count, sizeof(*dev->_vblank_count) *
 +
 +      if (dev->_vblank_count)
 +          drm_free(dev->_vblank_count, sizeof(*dev->_vblank_count) *
                 dev->num_crtcs, DRM_MEM_DRIVER);
 -      drm_free(dev->vblank_refcount, sizeof(*dev->vblank_refcount) *
 +
 +      if (dev->vblank_refcount)
 +          drm_free(dev->vblank_refcount, sizeof(*dev->vblank_refcount) *
                 dev->num_crtcs, DRM_MEM_DRIVER);
 -      drm_free(dev->vblank_enabled, sizeof(*dev->vblank_enabled) *
 +
 +      if (dev->vblank_enabled)
 +          drm_free(dev->vblank_enabled, sizeof(*dev->vblank_enabled) *
                 dev->num_crtcs, DRM_MEM_DRIVER);
 -      drm_free(dev->last_vblank, sizeof(*dev->last_vblank) * dev->num_crtcs,
 +
 +      if (dev->last_vblank)
 +          drm_free(dev->last_vblank, sizeof(*dev->last_vblank) * dev->num_crtcs,
                 DRM_MEM_DRIVER);
 -      drm_free(dev->vblank_inmodeset, sizeof(*dev->vblank_inmodeset) *
 -               dev->num_crtcs, DRM_MEM_DRIVER);
  
-       if (dev->vblank_premodeset)
-           drm_free(dev->vblank_premodeset, sizeof(*dev->vblank_premodeset) *
-                dev->num_crtcs, DRM_MEM_DRIVER);
-       if (dev->vblank_offset)
-           drm_free(dev->vblank_offset, sizeof(*dev->vblank_offset) * dev->num_crtcs,
-                DRM_MEM_DRIVER);
 -      dev->num_crtcs = 0;
++      if (dev->vblank_inmodeset)
++          drm_free(dev->vblank_inmodeset, sizeof(*dev->vblank_inmodeset) *
++                   dev->num_crtcs, DRM_MEM_DRIVER);
  }
  
  int drm_vblank_init(struct drm_device *dev, int num_crtcs)
  
        setup_timer(&dev->vblank_disable_timer, vblank_disable_fn,
                    (unsigned long)dev);
 +      init_timer_deferrable(&dev->vblank_disable_timer);
        spin_lock_init(&dev->vbl_lock);
        atomic_set(&dev->vbl_signal_pending, 0);
        dev->num_crtcs = num_crtcs;
        if (!dev->last_vblank)
                goto err;
  
-       dev->vblank_premodeset = drm_calloc(num_crtcs, sizeof(u32),
-                                           DRM_MEM_DRIVER);
-       if (!dev->vblank_premodeset)
-               goto err;
-       dev->vblank_offset = drm_calloc(num_crtcs, sizeof(u32), DRM_MEM_DRIVER);
-       if (!dev->vblank_offset)
+       dev->vblank_inmodeset = drm_calloc(num_crtcs, sizeof(int),
+                                        DRM_MEM_DRIVER);
+       if (!dev->vblank_inmodeset)
                goto err;
  
        /* Zero per-crtc vblank stuff */
                atomic_set(&dev->vblank_refcount[i], 0);
        }
  
+       dev->vblank_disable_allowed = 0;
        return 0;
  
  err:
  }
  EXPORT_SYMBOL(drm_vblank_init);
  
 +int drm_wait_hotplug(struct drm_device *dev, void *data,
 +                  struct drm_file *file_priv)
 +{
 +      union drm_wait_hotplug *hotplugwait = data;
 +      struct timeval now;
 +      int ret = 0;
 +      unsigned int flags;
 +
 +      if ((!dev->irq) || (!dev->irq_enabled))
 +              return -EINVAL;
 +
 +      flags = hotplugwait->request.type;
 +
 +      if (flags & _DRM_HOTPLUG_SIGNAL) {
 +              unsigned long irqflags;
 +              struct list_head *hotplug_sigs = dev->hotplug_sigs;
 +              struct drm_hotplug_sig *hotplug_sig;
 +
 +              hotplug_sig = drm_calloc(1, sizeof(struct drm_hotplug_sig),
 +                                   DRM_MEM_DRIVER);
 +              if (!hotplug_sig)
 +                      return -ENOMEM;
 +
 +              atomic_inc(&dev->hotplug_signal_pending);
 +
 +              hotplug_sig->info.si_signo = hotplugwait->request.signal;
 +              hotplug_sig->task = current;
 +              hotplug_sig->counter = 
 +                      hotplugwait->reply.counter = 
 +                                      dev->mode_config.hotplug_counter;
 +
 +              spin_lock_irqsave(&dev->hotplug_lock, irqflags);
 +
 +              list_add_tail(&hotplug_sig->head, hotplug_sigs);
 +
 +              spin_unlock_irqrestore(&dev->hotplug_lock, irqflags);
 +      } else {
 +              int cur_hotplug = dev->mode_config.hotplug_counter;
 +
 +              DRM_WAIT_ON(ret, dev->hotplug_queue, 3 * DRM_HZ,
 +                              dev->mode_config.hotplug_counter > cur_hotplug);
 +
 +              do_gettimeofday(&now);
 +
 +              hotplugwait->reply.tval_sec = now.tv_sec;
 +              hotplugwait->reply.tval_usec = now.tv_usec;
 +              hotplugwait->reply.counter = dev->mode_config.hotplug_counter;
 +      }
 +
 +      return ret;
 +}
 +
 +static void drm_hotplug_cleanup(struct drm_device *dev)
 +{
 +      if (dev->hotplug_sigs)
 +          drm_free(dev->hotplug_sigs, sizeof(*dev->hotplug_sigs),
 +               DRM_MEM_DRIVER);
 +}
 +EXPORT_SYMBOL(drm_hotplug_cleanup);
 +
 +int drm_hotplug_init(struct drm_device *dev)
 +{
 +      spin_lock_init(&dev->hotplug_lock);
 +      atomic_set(&dev->hotplug_signal_pending, 0);
 +
 +      dev->hotplug_sigs = drm_alloc(sizeof(struct list_head), DRM_MEM_DRIVER);
 +      if (!dev->hotplug_sigs)
 +              return -ENOMEM;
 +
 +      INIT_LIST_HEAD(dev->hotplug_sigs);
 +      init_waitqueue_head(&dev->hotplug_queue);
 +
 +      return 0;
 +}
 +EXPORT_SYMBOL(drm_hotplug_init);
 +
  /**
   * Install IRQ handler.
   *
@@@ -285,7 -201,7 +285,7 @@@ int drm_irq_install(struct drm_device 
        if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
                return -EINVAL;
  
 -      if (dev->irq == 0)
 +      if (dev->pdev->irq == 0)
                return -EINVAL;
  
        mutex_lock(&dev->struct_mutex);
  
        if (dev->irq_enabled) {
                mutex_unlock(&dev->struct_mutex);
 -              return -EBUSY;
 +              return 0;
        }
        dev->irq_enabled = 1;
        mutex_unlock(&dev->struct_mutex);
  
 -      DRM_DEBUG("irq=%d\n", dev->irq);
 +      DRM_DEBUG("irq=%d\n", dev->pdev->irq);
  
        /* Before installing handler */
        dev->driver->irq_preinstall(dev);
        if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED))
                sh_flags = IRQF_SHARED;
  
 -      ret = request_irq(dev->irq, dev->driver->irq_handler,
 +      ret = request_irq(dev->pdev->irq, dev->driver->irq_handler,
                          sh_flags, dev->devname, dev);
        if (ret < 0) {
                mutex_lock(&dev->struct_mutex);
                mutex_unlock(&dev->struct_mutex);
                return ret;
        }
 +      /* Expose the device irq to device drivers that want to export it for
 +       * whatever reason.
 +       */
 +      dev->irq = dev->pdev->irq;
  
        /* After installing handler */
        ret = dev->driver->irq_postinstall(dev);
@@@ -359,16 -271,14 +359,16 @@@ int drm_irq_uninstall(struct drm_devic
        if (!irq_enabled)
                return -EINVAL;
  
 -      DRM_DEBUG("irq=%d\n", dev->irq);
 +      DRM_DEBUG("irq=%d\n", dev->pdev->irq);
  
        dev->driver->irq_uninstall(dev);
  
 -      free_irq(dev->irq, dev);
 +      free_irq(dev->pdev->irq, dev);
  
        drm_vblank_cleanup(dev);
  
 +      drm_hotplug_cleanup(dev);
 +
        dev->locked_tasklet_func = NULL;
  
        return 0;
@@@ -398,17 -308,13 +398,17 @@@ int drm_control(struct drm_device *dev
        case DRM_INST_HANDLER:
                if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
                        return 0;
 +              if (drm_core_check_feature(dev, DRIVER_MODESET))
 +                      return 0;
                if (dev->if_version < DRM_IF_VERSION(1, 2) &&
 -                  ctl->irq != dev->irq)
 +                  ctl->irq != dev->pdev->irq)
                        return -EINVAL;
                return drm_irq_install(dev);
        case DRM_UNINST_HANDLER:
                if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
                        return 0;
 +              if (drm_core_check_feature(dev, DRIVER_MODESET))
 +                      return 0;
                return drm_irq_uninstall(dev);
        default:
                return -EINVAL;
   */
  u32 drm_vblank_count(struct drm_device *dev, int crtc)
  {
-       return atomic_read(&dev->_vblank_count[crtc]) +
-               dev->vblank_offset[crtc];
+       return atomic_read(&dev->_vblank_count[crtc]);
  }
  EXPORT_SYMBOL(drm_vblank_count);
  
   * (specified by @crtc).  Deal with wraparound, if it occurred, and
   * update the last read value so we can deal with wraparound on the next
   * call if necessary.
+  *
+  * Only necessary when going from off->on, to account for frames we
+  * didn't get an interrupt for.
+  *
+  * Note: caller must hold dev->vbl_lock since this reads & writes
+  * device vblank fields.
   */
- void drm_update_vblank_count(struct drm_device *dev, int crtc)
static void drm_update_vblank_count(struct drm_device *dev, int crtc)
  {
-       unsigned long irqflags;
        u32 cur_vblank, diff;
  
        /*
         * a long time.
         */
        cur_vblank = dev->driver->get_vblank_counter(dev, crtc);
-       spin_lock_irqsave(&dev->vbl_lock, irqflags);
+       diff = cur_vblank - dev->last_vblank[crtc];
        if (cur_vblank < dev->last_vblank[crtc]) {
-               diff = dev->max_vblank_count -
-                       dev->last_vblank[crtc];
-               diff += cur_vblank;
-       } else {
-               diff = cur_vblank - dev->last_vblank[crtc];
+               diff += dev->max_vblank_count;
+               DRM_DEBUG("last_vblank[%d]=0x%x, cur_vblank=0x%x => diff=0x%x\n",
+                         crtc, dev->last_vblank[crtc], cur_vblank, diff);
        }
-       dev->last_vblank[crtc] = cur_vblank;
-       spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
+       DRM_DEBUG("enabling vblank interrupts on crtc %d, missed %d\n",
+                 crtc, diff);
  
        atomic_add(diff, &dev->_vblank_count[crtc]);
  }
- EXPORT_SYMBOL(drm_update_vblank_count);
  
  /**
   * drm_vblank_get - get a reference count on vblank events
   * @crtc: which CRTC to own
   *
   * Acquire a reference count on vblank events to avoid having them disabled
-  * while in use.  Note callers will probably want to update the master counter
-  * using drm_update_vblank_count() above before calling this routine so that
-  * wakeups occur on the right vblank event.
+  * while in use.
   *
   * RETURNS
   * Zero on success, nonzero on failure.
@@@ -487,15 -394,17 +488,17 @@@ int drm_vblank_get(struct drm_device *d
        unsigned long irqflags;
        int ret = 0;
  
-       spin_lock_irqsave(&dev->vbl_lock, irqflags);    
+       spin_lock_irqsave(&dev->vbl_lock, irqflags);
        /* Going from 0->1 means we have to enable interrupts again */
        if (atomic_add_return(1, &dev->vblank_refcount[crtc]) == 1 &&
            !dev->vblank_enabled[crtc]) {
                ret = dev->driver->enable_vblank(dev, crtc);
                if (ret)
                        atomic_dec(&dev->vblank_refcount[crtc]);
-               else
+               else {
                        dev->vblank_enabled[crtc] = 1;
+                       drm_update_vblank_count(dev, crtc);
+               }
        }
        spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
  
@@@ -525,13 -434,21 +528,21 @@@ EXPORT_SYMBOL(drm_vblank_put)
   *
   * Applications should call the %_DRM_PRE_MODESET and %_DRM_POST_MODESET
   * ioctls around modesetting so that any lost vblank events are accounted for.
+  *
+  * Generally the counter will reset across mode sets.  If interrupts are
+  * enabled around this call, we don't have to do anything since the counter
+  * will have already been incremented.
   */
  int drm_modeset_ctl(struct drm_device *dev, void *data,
                    struct drm_file *file_priv)
  {
        struct drm_modeset_ctl *modeset = data;
+       unsigned long irqflags;
        int crtc, ret = 0;
-       u32 new;
+       /* If drm_vblank_init() hasn't been called yet, just no-op */
+       if (!dev->num_crtcs)
+               goto out;
  
        crtc = modeset->crtc;
        if (crtc >= dev->num_crtcs) {
                goto out;
        }
  
+       /*
+        * To avoid all the problems that might happen if interrupts
+        * were enabled/disabled around or between these calls, we just
+        * have the kernel take a reference on the CRTC (just once though
+        * to avoid corrupting the count if multiple, mismatch calls occur),
+        * so that interrupts remain enabled in the interim.
+        */
        switch (modeset->cmd) {
        case _DRM_PRE_MODESET:
-               dev->vblank_premodeset[crtc] =
-                       dev->driver->get_vblank_counter(dev, crtc);
+               if (!dev->vblank_inmodeset[crtc]) {
+                       dev->vblank_inmodeset[crtc] = 1;
+                       drm_vblank_get(dev, crtc);
+               }
                break;
        case _DRM_POST_MODESET:
-               new = dev->driver->get_vblank_counter(dev, crtc);
-               dev->vblank_offset[crtc] = dev->vblank_premodeset[crtc] - new;
+               if (dev->vblank_inmodeset[crtc]) {
+                       spin_lock_irqsave(&dev->vbl_lock, irqflags);
+                       dev->vblank_disable_allowed = 1;
+                       dev->vblank_inmodeset[crtc] = 0;
+                       spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
+                       drm_vblank_put(dev, crtc);
+               }
                break;
        default:
                ret = -EINVAL;
@@@ -580,11 -511,10 +605,10 @@@ int drm_wait_vblank(struct drm_device *
                    struct drm_file *file_priv)
  {
        union drm_wait_vblank *vblwait = data;
-       struct timeval now;
        int ret = 0;
        unsigned int flags, seq, crtc;
  
 -      if ((!dev->irq) || (!dev->irq_enabled))
 +      if ((!dev->pdev->irq) || (!dev->irq_enabled))
                return -EINVAL;
  
        if (vblwait->request.type &
        if (crtc >= dev->num_crtcs)
                return -EINVAL;
  
-       drm_update_vblank_count(dev, crtc);
+       ret = drm_vblank_get(dev, crtc);
+       if (ret)
+               return ret;
        seq = drm_vblank_count(dev, crtc);
  
        switch (vblwait->request.type & _DRM_VBLANK_TYPES_MASK) {
        case _DRM_VBLANK_ABSOLUTE:
                break;
        default:
-               return -EINVAL;
+               ret = -EINVAL;
+               goto done;
        }
  
        if ((flags & _DRM_VBLANK_NEXTONMISS) &&
        if (flags & _DRM_VBLANK_SIGNAL) {
                unsigned long irqflags;
                struct list_head *vbl_sigs = &dev->vbl_sigs[crtc];
 -              struct drm_vbl_sig *vbl_sig;
 +              struct drm_vbl_sig *vbl_sig, *tmp;
  
                spin_lock_irqsave(&dev->vbl_lock, irqflags);
  
                 * for the same vblank sequence number; nothing to be done in
                 * that case
                 */
 -              list_for_each_entry(vbl_sig, vbl_sigs, head) {
 +              list_for_each_entry_safe(vbl_sig, tmp, vbl_sigs, head) {
                        if (vbl_sig->sequence == vblwait->request.sequence
                            && vbl_sig->info.si_signo ==
                            vblwait->request.signal
  
                if (atomic_read(&dev->vbl_signal_pending) >= 100) {
                        spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-                       return -EBUSY;
+                       ret = -EBUSY;
+                       goto done;
                }
  
                spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
  
                vbl_sig = drm_calloc(1, sizeof(struct drm_vbl_sig),
                                     DRM_MEM_DRIVER);
-               if (!vbl_sig)
-                       return -ENOMEM;
+               if (!vbl_sig) {
+                       ret = -ENOMEM;
+                       goto done;
+               }
  
                ret = drm_vblank_get(dev, crtc);
                if (ret) {
  
                vblwait->reply.sequence = seq;
        } else {
-               unsigned long cur_vblank;
-               ret = drm_vblank_get(dev, crtc);
-               if (ret)
-                       return ret;
                DRM_WAIT_ON(ret, dev->vbl_queue[crtc], 3 * DRM_HZ,
-                           (((cur_vblank = drm_vblank_count(dev, crtc))
+                           ((drm_vblank_count(dev, crtc)
                              - vblwait->request.sequence) <= (1 << 23)));
-               drm_vblank_put(dev, crtc);
-               do_gettimeofday(&now);
  
-               vblwait->reply.tval_sec = now.tv_sec;
-               vblwait->reply.tval_usec = now.tv_usec;
-               vblwait->reply.sequence = cur_vblank;
+               if (ret != -EINTR) {
+                       struct timeval now;
+                       do_gettimeofday(&now);
+                       vblwait->reply.tval_sec = now.tv_sec;
+                       vblwait->reply.tval_usec = now.tv_usec;
+                       vblwait->reply.sequence = drm_vblank_count(dev, crtc);
+               }
        }
  
-       done:
+ done:
+       drm_vblank_put(dev, crtc);
        return ret;
  }
  
@@@ -745,60 -681,13 +775,60 @@@ static void drm_vbl_send_signals(struc
   */
  void drm_handle_vblank(struct drm_device *dev, int crtc)
  {
-       drm_update_vblank_count(dev, crtc);
+       atomic_inc(&dev->_vblank_count[crtc]);
        DRM_WAKEUP(&dev->vbl_queue[crtc]);
        drm_vbl_send_signals(dev, crtc);
  }
  EXPORT_SYMBOL(drm_handle_vblank);
  
  /**
 + * Send the HOTPLUG signals.
 + *
 + * \param dev DRM device.
 + *
 + * Sends a signal for each task in drm_device::hotplug_sigs and empties the list.
 + */
 +static void drm_hotplug_send_signals(struct drm_device * dev)
 +{
 +      struct drm_hotplug_sig *hotplug_sig, *tmp;
 +      struct list_head *hotplug_sigs;
 +      unsigned long flags;
 +
 +      spin_lock_irqsave(&dev->hotplug_lock, flags);
 +
 +      hotplug_sigs = dev->hotplug_sigs;
 +
 +      list_for_each_entry_safe(hotplug_sig, tmp, hotplug_sigs, head) {
 +          hotplug_sig->info.si_code = hotplug_sig->counter;
 +
 +          send_sig_info(hotplug_sig->info.si_signo,
 +                            &hotplug_sig->info, hotplug_sig->task);
 +
 +          list_del(&hotplug_sig->head);
 +
 +          drm_free(hotplug_sig, sizeof(*hotplug_sig),
 +                       DRM_MEM_DRIVER);
 +          atomic_dec(&dev->hotplug_signal_pending);
 +      }
 +
 +      spin_unlock_irqrestore(&dev->hotplug_lock, flags);
 +}
 +
 +/**
 + * drm_handle_hotplug - handle a hotplug event
 + * @dev: DRM device
 + * @crtc: where this event occurred
 + *
 + * Drivers should call this routine in their hotplug interrupt handlers.
 + */
 +void drm_handle_hotplug(struct drm_device *dev)
 +{
 +      DRM_WAKEUP(&dev->hotplug_queue);
 +      drm_hotplug_send_signals(dev);
 +}
 +EXPORT_SYMBOL(drm_handle_hotplug);
 +
 +/**
   * Tasklet wrapper function.
   *
   * \param data DRM device in disguise.
@@@ -815,18 -704,18 +845,18 @@@ static void drm_locked_tasklet_func(uns
        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
  
        if (!dev->locked_tasklet_func ||
 -          !drm_lock_take(&dev->lock,
 +          !drm_lock_take(&dev->primary->master->lock,
                           DRM_KERNEL_CONTEXT)) {
                spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
                return;
        }
  
 -      dev->lock.lock_time = jiffies;
 +      dev->primary->master->lock.lock_time = jiffies;
        atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
  
        dev->locked_tasklet_func(dev);
  
 -      drm_lock_free(&dev->lock,
 +      drm_lock_free(&dev->primary->master->lock,
                      DRM_KERNEL_CONTEXT);
  
        dev->locked_tasklet_func = NULL;
diff --combined linux-core/drm_memory.c
@@@ -310,7 -310,6 +310,7 @@@ int drm_free_agp(DRM_AGP_MEM * handle, 
  {
        return drm_agp_free_memory(handle) ? 0 : -EINVAL;
  }
 +EXPORT_SYMBOL(drm_free_agp);
  
  /** Wrapper around agp_bind_memory() */
  int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start)
@@@ -323,7 -322,6 +323,7 @@@ int drm_unbind_agp(DRM_AGP_MEM * handle
  {
        return drm_agp_unbind_memory(handle);
  }
 +EXPORT_SYMBOL(drm_unbind_agp);
  
  #else  /* __OS_HAS_AGP*/
  static void *agp_remap(unsigned long offset, unsigned long size,
@@@ -350,6 -348,15 +350,15 @@@ void drm_core_ioremap(struct drm_map *m
  }
  EXPORT_SYMBOL_GPL(drm_core_ioremap);
  
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+ void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev)
+ {
+       map->handle = ioremap_wc(map->offset, map->size);
+ }
+ EXPORT_SYMBOL_GPL(drm_core_ioremap_wc);
+ #endif
  void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev)
  {
        if (!map->handle || !map->size)
diff --combined linux-core/i915_drv.c
@@@ -30,7 -30,6 +30,7 @@@
  #include "drmP.h"
  #include "drm.h"
  #include "i915_drm.h"
 +#include "intel_drv.h"
  #include "i915_drv.h"
  
  #include "drm_pciids.h"
@@@ -39,23 -38,14 +39,23 @@@ static struct pci_device_id pciidlist[
        i915_PCI_IDS
  };
  
 -#ifdef I915_HAVE_FENCE
 +unsigned int i915_modeset = 0;
 +module_param_named(modeset, i915_modeset, int, 0400);
 +
 +unsigned int i915_fbpercrtc = 0;
 +module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
 +
 +unsigned int i915_rightof = 1;
 +module_param_named(i915_rightof, i915_rightof, int, 0400);
 +
 +#if defined(I915_HAVE_FENCE) && defined(I915_TTM)
  extern struct drm_fence_driver i915_fence_driver;
  #endif
  
 -#ifdef I915_HAVE_BUFFER
 +#if defined(I915_HAVE_BUFFER) && defined(I915_TTM)
  
 -static uint32_t i915_mem_prios[] = {DRM_BO_MEM_PRIV0, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
 -static uint32_t i915_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_PRIV0, DRM_BO_MEM_LOCAL};
 +static uint32_t i915_mem_prios[] = {DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
 +static uint32_t i915_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
  
  static struct drm_bo_driver i915_bo_driver = {
        .mem_type_prio = i915_mem_prios,
        .ttm_cache_flush = i915_flush_ttm,
        .command_stream_barrier = NULL,
  };
 -#endif
 +#endif /* ttm */
 +
 +static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +
 +      if (pipe == PIPE_A)
 +              return (I915_READ(DPLL_A) & DPLL_VCO_ENABLE);
 +      else
 +              return (I915_READ(DPLL_B) & DPLL_VCO_ENABLE);
 +}
 +
 +static void i915_save_palette(struct drm_device *dev, enum pipe pipe)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      unsigned long reg = (pipe == PIPE_A ? PALETTE_A : PALETTE_B);
 +      u32 *array;
 +      int i;
 +
 +      if (!i915_pipe_enabled(dev, pipe))
 +              return;
 +
 +      if (pipe == PIPE_A)
 +              array = dev_priv->save_palette_a;
 +      else
 +              array = dev_priv->save_palette_b;
 +
 +      for(i = 0; i < 256; i++)
 +              array[i] = I915_READ(reg + (i << 2));
 +}
 +
 +static void i915_restore_palette(struct drm_device *dev, enum pipe pipe)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      unsigned long reg = (pipe == PIPE_A ? PALETTE_A : PALETTE_B);
 +      u32 *array;
 +      int i;
 +
 +      if (!i915_pipe_enabled(dev, pipe))
 +              return;
 +
 +      if (pipe == PIPE_A)
 +              array = dev_priv->save_palette_a;
 +      else
 +              array = dev_priv->save_palette_b;
 +
 +      for(i = 0; i < 256; i++)
 +              I915_WRITE(reg + (i << 2), array[i]);
 +}
 +
 +static u8 i915_read_indexed(u16 index_port, u16 data_port, u8 reg)
 +{
 +      outb(reg, index_port);
 +      return inb(data_port);
 +}
 +
 +static u8 i915_read_ar(u16 st01, u8 reg, u16 palette_enable)
 +{
 +      inb(st01);
 +      outb(palette_enable | reg, VGA_AR_INDEX);
 +      return inb(VGA_AR_DATA_READ);
 +}
 +
 +static void i915_write_ar(u8 st01, u8 reg, u8 val, u16 palette_enable)
 +{
 +      inb(st01);
 +      outb(palette_enable | reg, VGA_AR_INDEX);
 +      outb(val, VGA_AR_DATA_WRITE);
 +}
 +
 +static void i915_write_indexed(u16 index_port, u16 data_port, u8 reg, u8 val)
 +{
 +      outb(reg, index_port);
 +      outb(val, data_port);
 +}
 +
 +static void i915_save_vga(struct drm_device *dev)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      int i;
 +      u16 cr_index, cr_data, st01;
 +
 +      /* VGA color palette registers */
 +      dev_priv->saveDACMASK = inb(VGA_DACMASK);
 +      /* DACCRX automatically increments during read */
 +      outb(0, VGA_DACRX);
 +      /* Read 3 bytes of color data from each index */
 +      for (i = 0; i < 256 * 3; i++)
 +              dev_priv->saveDACDATA[i] = inb(VGA_DACDATA);
 +
 +      /* MSR bits */
 +      dev_priv->saveMSR = inb(VGA_MSR_READ);
 +      if (dev_priv->saveMSR & VGA_MSR_CGA_MODE) {
 +              cr_index = VGA_CR_INDEX_CGA;
 +              cr_data = VGA_CR_DATA_CGA;
 +              st01 = VGA_ST01_CGA;
 +      } else {
 +              cr_index = VGA_CR_INDEX_MDA;
 +              cr_data = VGA_CR_DATA_MDA;
 +              st01 = VGA_ST01_MDA;
 +      }
 +
 +      /* CRT controller regs */
 +      i915_write_indexed(cr_index, cr_data, 0x11,
 +                         i915_read_indexed(cr_index, cr_data, 0x11) &
 +                         (~0x80));
 +      for (i = 0; i <= 0x24; i++)
 +              dev_priv->saveCR[i] =
 +                      i915_read_indexed(cr_index, cr_data, i);
 +      /* Make sure we don't turn off CR group 0 writes */
 +      dev_priv->saveCR[0x11] &= ~0x80;
 +
 +      /* Attribute controller registers */
 +      inb(st01);
 +      dev_priv->saveAR_INDEX = inb(VGA_AR_INDEX);
 +      for (i = 0; i <= 0x14; i++)
 +              dev_priv->saveAR[i] = i915_read_ar(st01, i, 0);
 +      inb(st01);
 +      outb(dev_priv->saveAR_INDEX, VGA_AR_INDEX);
 +      inb(st01);
 +
 +      /* Graphics controller registers */
 +      for (i = 0; i < 9; i++)
 +              dev_priv->saveGR[i] =
 +                      i915_read_indexed(VGA_GR_INDEX, VGA_GR_DATA, i);
 +
 +      dev_priv->saveGR[0x10] =
 +              i915_read_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x10);
 +      dev_priv->saveGR[0x11] =
 +              i915_read_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x11);
 +      dev_priv->saveGR[0x18] =
 +              i915_read_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x18);
 +
 +      /* Sequencer registers */
 +      for (i = 0; i < 8; i++)
 +              dev_priv->saveSR[i] =
 +                      i915_read_indexed(VGA_SR_INDEX, VGA_SR_DATA, i);
 +}
 +
 +static void i915_restore_vga(struct drm_device *dev)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      int i;
 +      u16 cr_index, cr_data, st01;
 +
 +      /* MSR bits */
 +      outb(dev_priv->saveMSR, VGA_MSR_WRITE);
 +      if (dev_priv->saveMSR & VGA_MSR_CGA_MODE) {
 +              cr_index = VGA_CR_INDEX_CGA;
 +              cr_data = VGA_CR_DATA_CGA;
 +              st01 = VGA_ST01_CGA;
 +      } else {
 +              cr_index = VGA_CR_INDEX_MDA;
 +              cr_data = VGA_CR_DATA_MDA;
 +              st01 = VGA_ST01_MDA;
 +      }
 +
 +      /* Sequencer registers, don't write SR07 */
 +      for (i = 0; i < 7; i++)
 +              i915_write_indexed(VGA_SR_INDEX, VGA_SR_DATA, i,
 +                                 dev_priv->saveSR[i]);
 +
 +      /* CRT controller regs */
 +      /* Enable CR group 0 writes */
 +      i915_write_indexed(cr_index, cr_data, 0x11, dev_priv->saveCR[0x11]);
 +      for (i = 0; i <= 0x24; i++)
 +              i915_write_indexed(cr_index, cr_data, i, dev_priv->saveCR[i]);
 +
 +      /* Graphics controller regs */
 +      for (i = 0; i < 9; i++)
 +              i915_write_indexed(VGA_GR_INDEX, VGA_GR_DATA, i,
 +                                 dev_priv->saveGR[i]);
 +
 +      i915_write_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x10,
 +                         dev_priv->saveGR[0x10]);
 +      i915_write_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x11,
 +                         dev_priv->saveGR[0x11]);
 +      i915_write_indexed(VGA_GR_INDEX, VGA_GR_DATA, 0x18,
 +                         dev_priv->saveGR[0x18]);
 +
 +      /* Attribute controller registers */
 +      inb(st01); /* switch back to index mode */
 +      for (i = 0; i <= 0x14; i++)
 +              i915_write_ar(st01, i, dev_priv->saveAR[i], 0);
 +      inb(st01); /* switch back to index mode */
 +      outb(dev_priv->saveAR_INDEX | 0x20, VGA_AR_INDEX);
 +      inb(st01);
 +
 +      /* VGA color palette registers */
 +      outb(dev_priv->saveDACMASK, VGA_DACMASK);
 +      /* DACCRX automatically increments during read */
 +      outb(0, VGA_DACWX);
 +      /* Read 3 bytes of color data from each index */
 +      for (i = 0; i < 256 * 3; i++)
 +              outb(dev_priv->saveDACDATA[i], VGA_DACDATA);
 +
 +}
  
  static int i915_suspend(struct drm_device *dev, pm_message_t state)
  {
        struct drm_i915_private *dev_priv = dev->dev_private;
-       int i;
  
        if (!dev || !dev_priv) {
                printk(KERN_ERR "dev: %p, dev_priv: %p\n", dev, dev_priv);
                return 0;
  
        pci_save_state(dev->pdev);
-       pci_read_config_byte(dev->pdev, LBB, &dev_priv->saveLBB);
-       /* Display arbitration control */
-       dev_priv->saveDSPARB = I915_READ(DSPARB);
-       /* Pipe & plane A info */
-       dev_priv->savePIPEACONF = I915_READ(PIPEACONF);
-       dev_priv->savePIPEASRC = I915_READ(PIPEASRC);
-       dev_priv->saveFPA0 = I915_READ(FPA0);
-       dev_priv->saveFPA1 = I915_READ(FPA1);
-       dev_priv->saveDPLL_A = I915_READ(DPLL_A);
-       if (IS_I965G(dev))
-               dev_priv->saveDPLL_A_MD = I915_READ(DPLL_A_MD);
-       dev_priv->saveHTOTAL_A = I915_READ(HTOTAL_A);
-       dev_priv->saveHBLANK_A = I915_READ(HBLANK_A);
-       dev_priv->saveHSYNC_A = I915_READ(HSYNC_A);
-       dev_priv->saveVTOTAL_A = I915_READ(VTOTAL_A);
-       dev_priv->saveVBLANK_A = I915_READ(VBLANK_A);
-       dev_priv->saveVSYNC_A = I915_READ(VSYNC_A);
-       dev_priv->saveBCLRPAT_A = I915_READ(BCLRPAT_A);
-       dev_priv->saveDSPACNTR = I915_READ(DSPACNTR);
-       dev_priv->saveDSPASTRIDE = I915_READ(DSPASTRIDE);
-       dev_priv->saveDSPASIZE = I915_READ(DSPASIZE);
-       dev_priv->saveDSPAPOS = I915_READ(DSPAPOS);
-       dev_priv->saveDSPAADDR = I915_READ(DSPAADDR);
-       if (IS_I965G(dev)) {
-               dev_priv->saveDSPASURF = I915_READ(DSPASURF);
-               dev_priv->saveDSPATILEOFF = I915_READ(DSPATILEOFF);
-       }
-       i915_save_palette(dev, PIPE_A);
-       dev_priv->savePIPEASTAT = I915_READ(PIPEASTAT);
-       /* Pipe & plane B info */
-       dev_priv->savePIPEBCONF = I915_READ(PIPEBCONF);
-       dev_priv->savePIPEBSRC = I915_READ(PIPEBSRC);
-       dev_priv->saveFPB0 = I915_READ(FPB0);
-       dev_priv->saveFPB1 = I915_READ(FPB1);
-       dev_priv->saveDPLL_B = I915_READ(DPLL_B);
-       if (IS_I965G(dev))
-               dev_priv->saveDPLL_B_MD = I915_READ(DPLL_B_MD);
-       dev_priv->saveHTOTAL_B = I915_READ(HTOTAL_B);
-       dev_priv->saveHBLANK_B = I915_READ(HBLANK_B);
-       dev_priv->saveHSYNC_B = I915_READ(HSYNC_B);
-       dev_priv->saveVTOTAL_B = I915_READ(VTOTAL_B);
-       dev_priv->saveVBLANK_B = I915_READ(VBLANK_B);
-       dev_priv->saveVSYNC_B = I915_READ(VSYNC_B);
-       dev_priv->saveBCLRPAT_A = I915_READ(BCLRPAT_A);
-       dev_priv->saveDSPBCNTR = I915_READ(DSPBCNTR);
-       dev_priv->saveDSPBSTRIDE = I915_READ(DSPBSTRIDE);
-       dev_priv->saveDSPBSIZE = I915_READ(DSPBSIZE);
-       dev_priv->saveDSPBPOS = I915_READ(DSPBPOS);
-       dev_priv->saveDSPBADDR = I915_READ(DSPBADDR);
-       if (IS_I965GM(dev) || IS_IGD_GM(dev)) {
-               dev_priv->saveDSPBSURF = I915_READ(DSPBSURF);
-               dev_priv->saveDSPBTILEOFF = I915_READ(DSPBTILEOFF);
-       }
-       i915_save_palette(dev, PIPE_B);
-       dev_priv->savePIPEBSTAT = I915_READ(PIPEBSTAT);
-       /* CRT state */
-       dev_priv->saveADPA = I915_READ(ADPA);
-       /* LVDS state */
-       dev_priv->savePP_CONTROL = I915_READ(PP_CONTROL);
-       dev_priv->savePFIT_PGM_RATIOS = I915_READ(PFIT_PGM_RATIOS);
-       dev_priv->saveBLC_PWM_CTL = I915_READ(BLC_PWM_CTL);
-       if (IS_I965G(dev))
-               dev_priv->saveBLC_PWM_CTL2 = I915_READ(BLC_PWM_CTL2);
-       if (IS_MOBILE(dev) && !IS_I830(dev))
-               dev_priv->saveLVDS = I915_READ(LVDS);
-       if (!IS_I830(dev) && !IS_845G(dev))
-               dev_priv->savePFIT_CONTROL = I915_READ(PFIT_CONTROL);
-       dev_priv->savePP_ON_DELAYS = I915_READ(PP_ON_DELAYS);
-       dev_priv->savePP_OFF_DELAYS = I915_READ(PP_OFF_DELAYS);
-       dev_priv->savePP_DIVISOR = I915_READ(PP_DIVISOR);
-       /* FIXME: save TV & SDVO state */
-       /* FBC state */
-       dev_priv->saveFBC_CFB_BASE = I915_READ(FBC_CFB_BASE);
-       dev_priv->saveFBC_LL_BASE = I915_READ(FBC_LL_BASE);
-       dev_priv->saveFBC_CONTROL2 = I915_READ(FBC_CONTROL2);
-       dev_priv->saveFBC_CONTROL = I915_READ(FBC_CONTROL);
-       /* Interrupt state */
-       dev_priv->saveIIR = I915_READ(IIR);
-       dev_priv->saveIER = I915_READ(IER);
-       dev_priv->saveIMR = I915_READ(IMR);
-       /* VGA state */
-       dev_priv->saveVGA0 = I915_READ(VGA0);
-       dev_priv->saveVGA1 = I915_READ(VGA1);
-       dev_priv->saveVGA_PD = I915_READ(VGA_PD);
-       dev_priv->saveVGACNTRL = I915_READ(VGACNTRL);
-       /* Clock gating state */
-       dev_priv->saveD_STATE = I915_READ(D_STATE);
-       dev_priv->saveCG_2D_DIS = I915_READ(CG_2D_DIS);
-       /* Cache mode state */
-       dev_priv->saveCACHE_MODE_0 = I915_READ(CACHE_MODE_0);
-       /* Memory Arbitration state */
-       dev_priv->saveMI_ARB_STATE = I915_READ(MI_ARB_STATE);
-       /* Scratch space */
-       for (i = 0; i < 16; i++) {
-               dev_priv->saveSWF0[i] = I915_READ(SWF00 + (i << 2));
-               dev_priv->saveSWF1[i] = I915_READ(SWF10 + (i << 2));
-       }
-       for (i = 0; i < 3; i++)
-               dev_priv->saveSWF2[i] = I915_READ(SWF30 + (i << 2));
  
-       i915_save_vga(dev);
+       i915_save_state(dev);
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
+       intel_opregion_free(dev);
+ #endif
  
        if (state.event == PM_EVENT_SUSPEND) {
                /* Shut down the device */
  
  static int i915_resume(struct drm_device *dev)
  {
-       struct drm_i915_private *dev_priv = dev->dev_private;
-       int i;
        pci_set_power_state(dev->pdev, PCI_D0);
        pci_restore_state(dev->pdev);
        if (pci_enable_device(dev->pdev))
                return -1;
+       pci_set_master(dev->pdev);
  
-       DRM_INFO("resuming i915\n");
-       pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB);
-       I915_WRITE(DSPARB, dev_priv->saveDSPARB);
+       i915_restore_state(dev);
  
-       /* Pipe & plane A info */
-       /* Prime the clock */
-       if (dev_priv->saveDPLL_A & DPLL_VCO_ENABLE) {
-               I915_WRITE(DPLL_A, dev_priv->saveDPLL_A &
-                          ~DPLL_VCO_ENABLE);
-               udelay(150);
-       }
-       I915_WRITE(FPA0, dev_priv->saveFPA0);
-       I915_WRITE(FPA1, dev_priv->saveFPA1);
-       /* Actually enable it */
-       I915_WRITE(DPLL_A, dev_priv->saveDPLL_A);
-       udelay(150);
-       if (IS_I965G(dev))
-               I915_WRITE(DPLL_A_MD, dev_priv->saveDPLL_A_MD);
-       udelay(150);
-       /* Restore mode */
-       I915_WRITE(HTOTAL_A, dev_priv->saveHTOTAL_A);
-       I915_WRITE(HBLANK_A, dev_priv->saveHBLANK_A);
-       I915_WRITE(HSYNC_A, dev_priv->saveHSYNC_A);
-       I915_WRITE(VTOTAL_A, dev_priv->saveVTOTAL_A);
-       I915_WRITE(VBLANK_A, dev_priv->saveVBLANK_A);
-       I915_WRITE(VSYNC_A, dev_priv->saveVSYNC_A);
-       I915_WRITE(BCLRPAT_A, dev_priv->saveBCLRPAT_A);
-       /* Restore plane info */
-       I915_WRITE(DSPASIZE, dev_priv->saveDSPASIZE);
-       I915_WRITE(DSPAPOS, dev_priv->saveDSPAPOS);
-       I915_WRITE(PIPEASRC, dev_priv->savePIPEASRC);
-       I915_WRITE(DSPAADDR, dev_priv->saveDSPAADDR);
-       I915_WRITE(DSPASTRIDE, dev_priv->saveDSPASTRIDE);
-       if (IS_I965G(dev)) {
-               I915_WRITE(DSPASURF, dev_priv->saveDSPASURF);
-               I915_WRITE(DSPATILEOFF, dev_priv->saveDSPATILEOFF);
-       }
-       I915_WRITE(PIPEACONF, dev_priv->savePIPEACONF);
-       i915_restore_palette(dev, PIPE_A);
-       /* Enable the plane */
-       I915_WRITE(DSPACNTR, dev_priv->saveDSPACNTR);
-       I915_WRITE(DSPAADDR, I915_READ(DSPAADDR));
-       /* Pipe & plane B info */
-       if (dev_priv->saveDPLL_B & DPLL_VCO_ENABLE) {
-               DRM_INFO("restoring DPLL_B: 0x%08x\n", dev_priv->saveDPLL_B);
-               I915_WRITE(DPLL_B, dev_priv->saveDPLL_B &
-                          ~DPLL_VCO_ENABLE);
-               udelay(150);
-       }
-       I915_WRITE(FPB0, dev_priv->saveFPB0);
-       I915_WRITE(FPB1, dev_priv->saveFPB1);
-       /* Actually enable it */
-       I915_WRITE(DPLL_B, dev_priv->saveDPLL_B);
-       DRM_INFO("restoring DPLL_B: 0x%08x\n", dev_priv->saveDPLL_B);
-       udelay(150);
-       if (IS_I965G(dev))
-               I915_WRITE(DPLL_B_MD, dev_priv->saveDPLL_B_MD);
-       udelay(150);
-       /* Restore mode */
-       I915_WRITE(HTOTAL_B, dev_priv->saveHTOTAL_B);
-       I915_WRITE(HBLANK_B, dev_priv->saveHBLANK_B);
-       I915_WRITE(HSYNC_B, dev_priv->saveHSYNC_B);
-       I915_WRITE(VTOTAL_B, dev_priv->saveVTOTAL_B);
-       I915_WRITE(VBLANK_B, dev_priv->saveVBLANK_B);
-       I915_WRITE(VSYNC_B, dev_priv->saveVSYNC_B);
-       I915_WRITE(BCLRPAT_B, dev_priv->saveBCLRPAT_B);
-       /* Restore plane info */
-       I915_WRITE(DSPBSIZE, dev_priv->saveDSPBSIZE);
-       I915_WRITE(DSPBPOS, dev_priv->saveDSPBPOS);
-       I915_WRITE(PIPEBSRC, dev_priv->savePIPEBSRC);
-       I915_WRITE(DSPBADDR, dev_priv->saveDSPBADDR);
-       I915_WRITE(DSPBSTRIDE, dev_priv->saveDSPBSTRIDE);
-       if (IS_I965G(dev)) {
-               I915_WRITE(DSPBSURF, dev_priv->saveDSPBSURF);
-               I915_WRITE(DSPBTILEOFF, dev_priv->saveDSPBTILEOFF);
-       }
-       I915_WRITE(PIPEBCONF, dev_priv->savePIPEBCONF);
-       i915_restore_palette(dev, PIPE_B);
-       /* Enable the plane */
-       I915_WRITE(DSPBCNTR, dev_priv->saveDSPBCNTR);
-       I915_WRITE(DSPBADDR, I915_READ(DSPBADDR));
-       /* CRT state */
-       I915_WRITE(ADPA, dev_priv->saveADPA);
-       /* LVDS state */
-       if (IS_I965G(dev))
-               I915_WRITE(BLC_PWM_CTL2, dev_priv->saveBLC_PWM_CTL2);
-       if (IS_MOBILE(dev) && !IS_I830(dev))
-               I915_WRITE(LVDS, dev_priv->saveLVDS);
-       if (!IS_I830(dev) && !IS_845G(dev))
-               I915_WRITE(PFIT_CONTROL, dev_priv->savePFIT_CONTROL);
-       I915_WRITE(PFIT_PGM_RATIOS, dev_priv->savePFIT_PGM_RATIOS);
-       I915_WRITE(BLC_PWM_CTL, dev_priv->saveBLC_PWM_CTL);
-       I915_WRITE(PP_ON_DELAYS, dev_priv->savePP_ON_DELAYS);
-       I915_WRITE(PP_OFF_DELAYS, dev_priv->savePP_OFF_DELAYS);
-       I915_WRITE(PP_DIVISOR, dev_priv->savePP_DIVISOR);
-       I915_WRITE(PP_CONTROL, dev_priv->savePP_CONTROL);
-       /* FIXME: restore TV & SDVO state */
-       /* FBC info */
-       I915_WRITE(FBC_CFB_BASE, dev_priv->saveFBC_CFB_BASE);
-       I915_WRITE(FBC_LL_BASE, dev_priv->saveFBC_LL_BASE);
-       I915_WRITE(FBC_CONTROL2, dev_priv->saveFBC_CONTROL2);
-       I915_WRITE(FBC_CONTROL, dev_priv->saveFBC_CONTROL);
-       /* VGA state */
-       I915_WRITE(VGACNTRL, dev_priv->saveVGACNTRL);
-       I915_WRITE(VGA0, dev_priv->saveVGA0);
-       I915_WRITE(VGA1, dev_priv->saveVGA1);
-       I915_WRITE(VGA_PD, dev_priv->saveVGA_PD);
-       udelay(150);
-       /* Clock gating state */
-       I915_WRITE (D_STATE, dev_priv->saveD_STATE);
-       I915_WRITE (CG_2D_DIS, dev_priv->saveCG_2D_DIS);
-       /* Cache mode state */
-       I915_WRITE (CACHE_MODE_0, dev_priv->saveCACHE_MODE_0 | 0xffff0000);
-       /* Memory arbitration state */
-       I915_WRITE (MI_ARB_STATE, dev_priv->saveMI_ARB_STATE | 0xffff0000);
-       for (i = 0; i < 16; i++) {
-               I915_WRITE(SWF00 + (i << 2), dev_priv->saveSWF0[i]);
-               I915_WRITE(SWF10 + (i << 2), dev_priv->saveSWF1[i+7]);
-       }
-       for (i = 0; i < 3; i++)
-               I915_WRITE(SWF30 + (i << 2), dev_priv->saveSWF2[i]);
-       i915_restore_vga(dev);
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
+       intel_opregion_init(dev);
+ #endif
  
        return 0;
  }
  
  static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 +static void remove(struct pci_dev *pdev);
 +
  static struct drm_driver driver = {
        /* don't use mtrr's here, the Xserver or user space app should
         * deal with them for intel hardware.
         */
        .driver_features =
            DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR | */
 -          DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
 +          DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM,
        .load = i915_driver_load,
        .unload = i915_driver_unload,
        .firstopen = i915_driver_firstopen,
 +      .open = i915_driver_open,
        .lastclose = i915_driver_lastclose,
        .preclose = i915_driver_preclose,
 +      .postclose = i915_driver_postclose,
        .suspend = i915_suspend,
        .resume = i915_resume,
        .device_is_agp = i915_driver_device_is_agp,
        .reclaim_buffers = drm_core_reclaim_buffers,
        .get_map_ofs = drm_core_get_map_ofs,
        .get_reg_ofs = drm_core_get_reg_ofs,
 +      .master_create = i915_master_create,
 +      .master_destroy = i915_master_destroy,
 +      .proc_init = i915_gem_proc_init,
 +      .proc_cleanup = i915_gem_proc_cleanup,
        .ioctls = i915_ioctls,
 +      .gem_init_object = i915_gem_init_object,
 +      .gem_free_object = i915_gem_free_object,
        .fops = {
                .owner = THIS_MODULE,
                .open = drm_open,
                .name = DRIVER_NAME,
                .id_table = pciidlist,
                .probe = probe,
 -              .remove = __devexit_p(drm_cleanup_pci),
 +              .remove = remove,
                },
 -#ifdef I915_HAVE_FENCE
 +#if defined(I915_HAVE_FENCE) && defined(I915_TTM)
        .fence_driver = &i915_fence_driver,
  #endif
 -#ifdef I915_HAVE_BUFFER
 +#if defined(I915_HAVE_BUFFER) && defined(I915_TTM)
        .bo_driver = &i915_bo_driver,
  #endif
        .name = DRIVER_NAME,
  
  static int probe(struct pci_dev *pdev, const struct pci_device_id *ent)
  {
 -      return drm_get_dev(pdev, ent, &driver);
 +      int ret;
 +
 +      /* On the 945G/GM, the chipset reports the MSI capability on the
 +       * integrated graphics even though the support isn't actually there
 +       * according to the published specs.  It doesn't appear to function
 +       * correctly in testing on 945G.
 +       * This may be a side effect of MSI having been made available for PEG
 +       * and the registers being closely associated.
 +       */
 +      if (pdev->device != 0x2772 && pdev->device != 0x27A2)
 +              (void )pci_enable_msi(pdev);
 +
 +      ret = drm_get_dev(pdev, ent, &driver);
 +      if (ret && pdev->msi_enabled)
 +              pci_disable_msi(pdev);
 +      return ret;
 +}
 +static void remove(struct pci_dev *pdev)
 +{
 +      drm_cleanup_pci(pdev);
 +      if (pdev->msi_enabled)
 +              pci_disable_msi(pdev);
  }
  
  static int __init i915_init(void)
  {
        driver.num_ioctls = i915_max_ioctl;
 +      if (i915_modeset == 1)
 +              driver.driver_features |= DRIVER_MODESET;
 +
        return drm_init(&driver, pciidlist);
  }
  
index 0000000,fdd4987..d015db2
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,388 +1,390 @@@
 -                      dev_priv->irq_enable_reg |= 
 -                              (I915_ASLE_INTERRUPT 
 -                               | I915_DISPLAY_PIPE_B_EVENT_INTERRUPT);
+ /*
+  *
+  * Copyright 2008 Intel Corporation <hong.liu@intel.com>
+  * Copyright 2008 Red Hat <mjg@redhat.com>
+  *
+  * 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 INTEL 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.
+  *
+  */
+ #include <linux/acpi.h>
+ #include "drmP.h"
+ #include "i915_drm.h"
+ #include "i915_drv.h"
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
+ #define PCI_ASLE 0xe4
+ #define PCI_ASLS 0xfc
+ #define OPREGION_SZ            (8*1024)
+ #define OPREGION_HEADER_OFFSET 0
+ #define OPREGION_ACPI_OFFSET   0x100
+ #define OPREGION_SWSCI_OFFSET  0x200
+ #define OPREGION_ASLE_OFFSET   0x300
+ #define OPREGION_VBT_OFFSET    0x1000
+ #define OPREGION_SIGNATURE "IntelGraphicsMem"
+ #define MBOX_ACPI      (1<<0)
+ #define MBOX_SWSCI     (1<<1)
+ #define MBOX_ASLE      (1<<2)
+ /* _DOD id definitions */
+ #define OUTPUT_CONNECTOR_MSK   0xf000
+ #define OUTPUT_CONNECTOR_OFFSET        12
+ #define OUTPUT_PORT_MSK                0x00f0
+ #define OUTPUT_PORT_OFFSET     4
+   #define OUTPUT_PORT_ANALOG   0
+   #define OUTPUT_PORT_LVDS     1
+   #define OUTPUT_PORT_SDVOB    2
+   #define OUTPUT_PORT_SDVOC    3
+   #define OUTPUT_PORT_TV       4
+ #define OUTPUT_DISPLAY_MSK     0x0f00
+ #define OUTPUT_DISPLAY_OFFSET  8
+   #define OUTPUT_DISPLAY_OTHER         0
+   #define OUTPUT_DISPLAY_VGA           1
+   #define OUTPUT_DISPLAY_TV            2
+   #define OUTPUT_DISPLAY_DIGI          3
+   #define OUTPUT_DISPLAY_FLAT_PANEL    4
+ /* predefined id for integrated LVDS and VGA connector */
+ #define OUTPUT_INT_LVDS        0x00000110
+ #define OUTPUT_INT_VGA 0x80000100
+ struct opregion_header {
+        u8 signature[16];
+        u32 size;
+        u32 opregion_ver;
+        u8 bios_ver[32];
+        u8 vbios_ver[16];
+        u8 driver_ver[16];
+        u32 mboxes;
+        u8 reserved[164];
+ } __attribute__((packed));
+ /* OpRegion mailbox #1: public ACPI methods */
+ struct opregion_acpi {
+        u32 drdy;       /* driver readiness */
+        u32 csts;       /* notification status */
+        u32 cevt;       /* current event */
+        u8 rsvd1[20];
+        u32 didl[8];    /* supported display devices ID list */
+        u32 cpdl[8];    /* currently presented display list */
+        u32 cadl[8];    /* currently active display list */
+        u32 nadl[8];    /* next active devices list */
+        u32 aslp;       /* ASL sleep time-out */
+        u32 tidx;       /* toggle table index */
+        u32 chpd;       /* current hotplug enable indicator */
+        u32 clid;       /* current lid state*/
+        u32 cdck;       /* current docking state */
+        u32 sxsw;       /* Sx state resume */
+        u32 evts;       /* ASL supported events */
+        u32 cnot;       /* current OS notification */
+        u32 nrdy;       /* driver status */
+        u8 rsvd2[60];
+ } __attribute__((packed));
+ /* OpRegion mailbox #2: SWSCI */
+ struct opregion_swsci {
+        u32 scic;       /* SWSCI command|status|data */
+        u32 parm;       /* command parameters */
+        u32 dslp;       /* driver sleep time-out */
+        u8 rsvd[244];
+ } __attribute__((packed));
+ /* OpRegion mailbox #3: ASLE */
+ struct opregion_asle {
+        u32 ardy;       /* driver readiness */
+        u32 aslc;       /* ASLE interrupt command */
+        u32 tche;       /* technology enabled indicator */
+        u32 alsi;       /* current ALS illuminance reading */
+        u32 bclp;       /* backlight brightness to set */
+        u32 pfit;       /* panel fitting state */
+        u32 cblv;       /* current brightness level */
+        u16 bclm[20];   /* backlight level duty cycle mapping table */
+        u32 cpfm;       /* current panel fitting mode */
+        u32 epfm;       /* enabled panel fitting modes */
+        u8 plut[74];    /* panel LUT and identifier */
+        u32 pfmb;       /* PWM freq and min brightness */
+        u8 rsvd[102];
+ } __attribute__((packed));
+ /* ASLE irq request bits */
+ #define ASLE_SET_ALS_ILLUM     (1 << 0)
+ #define ASLE_SET_BACKLIGHT     (1 << 1)
+ #define ASLE_SET_PFIT          (1 << 2)
+ #define ASLE_SET_PWM_FREQ      (1 << 3)
+ #define ASLE_REQ_MSK           0xf
+ /* response bits of ASLE irq request */
+ #define ASLE_ALS_ILLUM_FAIL    (2<<10)
+ #define ASLE_BACKLIGHT_FAIL    (2<<12)
+ #define ASLE_PFIT_FAIL         (2<<14)
+ #define ASLE_PWM_FREQ_FAIL     (2<<16)
+ /* ASLE backlight brightness to set */
+ #define ASLE_BCLP_VALID                (1<<31)
+ #define ASLE_BCLP_MSK          (~(1<<31))
+ /* ASLE panel fitting request */
+ #define ASLE_PFIT_VALID         (1<<31)
+ #define ASLE_PFIT_CENTER (1<<0)
+ #define ASLE_PFIT_STRETCH_TEXT (1<<1)
+ #define ASLE_PFIT_STRETCH_GFX (1<<2)
+ /* PWM frequency and minimum brightness */
+ #define ASLE_PFMB_BRIGHTNESS_MASK (0xff)
+ #define ASLE_PFMB_BRIGHTNESS_VALID (1<<8)
+ #define ASLE_PFMB_PWM_MASK (0x7ffffe00)
+ #define ASLE_PFMB_PWM_VALID (1<<31)
+ #define ASLE_CBLV_VALID         (1<<31)
+ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
+ {
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct opregion_asle *asle = dev_priv->opregion.asle;
+       u32 blc_pwm_ctl;
+       
+       if (!(bclp & ASLE_BCLP_VALID))
+               return ASLE_BACKLIGHT_FAIL;
+       
+       bclp &= ASLE_BCLP_MSK;
+       if (bclp < 0 || bclp > 255)
+               return ASLE_BACKLIGHT_FAIL;
+       
+       blc_pwm_ctl = I915_READ(BLC_PWM_CTL);
+       blc_pwm_ctl &= ~BACKLIGHT_DUTY_CYCLE_MASK;
+       I915_WRITE(BLC_PWM_CTL, blc_pwm_ctl | ((bclp * 0x101) -1));
+       asle->cblv = (bclp*0x64)/0xff | ASLE_CBLV_VALID;
+       
+       return 0;
+ }
+ static u32 asle_set_als_illum(struct drm_device *dev, u32 alsi)
+ {
+       return 0;
+ }
+ static u32 asle_set_pwm_freq(struct drm_device *dev, u32 pfmb)
+ {
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       if (pfmb & ASLE_PFMB_PWM_VALID) {
+               u32 blc_pwm_ctl = I915_READ(BLC_PWM_CTL);
+               u32 pwm = pfmb & ASLE_PFMB_PWM_MASK;
+               blc_pwm_ctl &= BACKLIGHT_DUTY_CYCLE_MASK;
+               pwm = pwm >> 9;
+               // FIXME - what do we do with the PWM?
+       }
+       return 0;
+ }
+ static u32 asle_set_pfit(struct drm_device *dev, u32 pfit)
+ {
+       if (!(pfit & ASLE_PFIT_VALID))
+               return ASLE_PFIT_FAIL;
+       return 0;
+ }
+ void opregion_asle_intr(struct drm_device *dev)
+ {
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct opregion_asle *asle = dev_priv->opregion.asle;
+       u32 asle_stat = 0;
+       u32 asle_req;
+       if (!asle)
+               return;
+       asle_req = asle->aslc & ASLE_REQ_MSK;
+       
+       if (!asle_req) {
+               DRM_DEBUG("non asle set request??\n");
+               return;
+       }
+       if (asle_req & ASLE_SET_ALS_ILLUM)
+               asle_stat |= asle_set_als_illum(dev, asle->alsi);
+       
+       if (asle_req & ASLE_SET_BACKLIGHT)
+               asle_stat |= asle_set_backlight(dev, asle->bclp);
+       
+       if (asle_req & ASLE_SET_PFIT)
+               asle_stat |= asle_set_pfit(dev, asle->pfit);
+       
+       if (asle_req & ASLE_SET_PWM_FREQ)
+               asle_stat |= asle_set_pwm_freq(dev, asle->pfmb);
+       
+       asle->aslc = asle_stat;
+ }
+ #define ASLE_ALS_EN    (1<<0)
+ #define ASLE_BLC_EN    (1<<1)
+ #define ASLE_PFIT_EN   (1<<2)
+ #define ASLE_PFMB_EN   (1<<3)
+ void opregion_enable_asle(struct drm_device *dev)
+ {
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct opregion_asle *asle = dev_priv->opregion.asle;
++      u32 mask = 0;
+       if (asle) {
+               u32 pipeb_stats = I915_READ(PIPEBSTAT);
+               if (IS_MOBILE(dev)) {
+                       /* Some hardware uses the legacy backlight controller
+                          to signal interrupts, so we need to set up pipe B
+                          to generate an IRQ on writes */
+                       I915_WRITE(PIPEBSTAT, pipeb_stats |= 
+                                  I915_LEGACY_BLC_EVENT_ENABLE);
 -                      dev_priv->irq_enable_reg |= I915_ASLE_INTERRUPT;
++                      mask = I915_ASLE_INTERRUPT |
++                              I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
+               } else
++                      mask = I915_ASLE_INTERRUPT;
+               
++              dev_priv->irq_mask_reg &= ~mask;
++
+               asle->tche = ASLE_ALS_EN | ASLE_BLC_EN | ASLE_PFIT_EN | 
+                       ASLE_PFMB_EN;
+               asle->ardy = 1;
+       }
+ }
+ #define ACPI_EV_DISPLAY_SWITCH (1<<0)
+ #define ACPI_EV_LID            (1<<1)
+ #define ACPI_EV_DOCK           (1<<2)
+ static struct intel_opregion *system_opregion;
+ int intel_opregion_video_event(struct notifier_block *nb, unsigned long val,
+                                void *data)
+ {
+       /* The only video events relevant to opregion are 0x80. These indicate
+          either a docking event, lid switch or display switch request. In
+          Linux, these are handled by the dock, button and video drivers.
+          We might want to fix the video driver to be opregion-aware in
+          future, but right now we just indicate to the firmware that the
+          request has been handled */
+       
+       struct opregion_acpi *acpi;
+       if (!system_opregion)
+               return NOTIFY_DONE;
+       
+       acpi = system_opregion->acpi;
+       acpi->csts = 0;
+       return NOTIFY_OK;
+ }
+ static struct notifier_block intel_opregion_notifier = {
+       .notifier_call = intel_opregion_video_event,
+ };
+ int intel_opregion_init(struct drm_device *dev)
+ {
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct intel_opregion *opregion = &dev_priv->opregion;
+       void *base;
+       u32 asls, mboxes;
+       int err = 0;
+       
+       pci_read_config_dword(dev->pdev, PCI_ASLS, &asls);
+       DRM_DEBUG("graphic opregion physical addr: 0x%x\n", asls);
+       if (asls == 0) {
+               DRM_DEBUG("ACPI OpRegion not supported!\n");
+               return -ENOTSUPP;
+       }
+       
+       base = ioremap(asls, OPREGION_SZ);
+       if (!base)
+               return -ENOMEM;
+       
+       opregion->header = base;
+       if (memcmp(opregion->header->signature, OPREGION_SIGNATURE, 16)) {
+               DRM_DEBUG("opregion signature mismatch\n");
+               err = -EINVAL;
+               goto err_out;
+       }
+       
+       mboxes = opregion->header->mboxes;
+       if (mboxes & MBOX_ACPI) {
+               DRM_DEBUG("Public ACPI methods supported\n");
+               opregion->acpi = base + OPREGION_ACPI_OFFSET;
+       } else {
+               DRM_DEBUG("Public ACPI methods not supported\n");
+               err = -ENOTSUPP;
+               goto err_out;
+       }
+       opregion->enabled = 1;
+       
+       if (mboxes & MBOX_SWSCI) {
+               DRM_DEBUG("SWSCI supported\n");
+               opregion->swsci = base + OPREGION_SWSCI_OFFSET;
+       }
+       if (mboxes & MBOX_ASLE) {
+               DRM_DEBUG("ASLE supported\n");
+               opregion->asle = base + OPREGION_ASLE_OFFSET;
+       }
+       
+       /* Notify BIOS we are ready to handle ACPI video ext notifs.
+        * Right now, all the events are handled by the ACPI video module.
+        * We don't actually need to do anything with them. */
+       opregion->acpi->csts = 0;
+       opregion->acpi->drdy = 1;
+       system_opregion = opregion;
+       register_acpi_notifier(&intel_opregion_notifier);
+       
+       return 0;
+       
+ err_out:
+       iounmap(opregion->header);
+       opregion->header = NULL;
+       return err;
+ }
+ void intel_opregion_free(struct drm_device *dev)
+ {
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct intel_opregion *opregion = &dev_priv->opregion;
+       
+       if (!opregion->enabled)
+               return;
+       
+       opregion->acpi->drdy = 0;
+       
+       system_opregion = NULL;
+       unregister_acpi_notifier(&intel_opregion_notifier);
+       
+       /* just clear all opregion memory pointers now */
+       iounmap(opregion->header);
+       opregion->header = NULL;
+       opregion->acpi = NULL;
+       opregion->swsci = NULL;
+       opregion->asle = NULL;
+       
+       opregion->enabled = 0;
+ }
+ #endif
diff --combined linux-core/radeon_drv.c
  #include "drm_pciids.h"
  
  int radeon_no_wb;
 +int radeon_dynclks = 1;
  
  MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers\n");
  module_param_named(no_wb, radeon_no_wb, int, 0444);
  
 +unsigned int radeon_modeset = 0;
 +module_param_named(modeset, radeon_modeset, int, 0400);
 +
 +MODULE_PARM_DESC(dynclks, "Disable/Enable dynamic clocks");
 +module_param_named(dynclks, radeon_dynclks, int, 0444);
 +
  static int dri_library_name(struct drm_device * dev, char * buf)
  {
        drm_radeon_private_t *dev_priv = dev->dev_private;
                "r300"));
  }
  
+ static int radeon_suspend(struct drm_device *dev, pm_message_t state)
+ {
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       /* Disable *all* interrupts */
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690)
+               RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
+       RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
+       return 0;
+ }
+ static int radeon_resume(struct drm_device *dev)
+ {
+       drm_radeon_private_t *dev_priv = dev->dev_private;
+       /* Restore interrupt registers */
+       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690)
+               RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
+       RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
+       return 0;
+ }
  static struct pci_device_id pciidlist[] = {
        radeon_PCI_IDS
  };
  
 +extern struct drm_fence_driver radeon_fence_driver;
 +
 +static uint32_t radeon_mem_prios[] = {DRM_BO_MEM_VRAM, DRM_BO_MEM_TT, DRM_BO_MEM_LOCAL};
 +static uint32_t radeon_busy_prios[] = {DRM_BO_MEM_TT, DRM_BO_MEM_VRAM, DRM_BO_MEM_LOCAL};
 +
 +static struct drm_bo_driver radeon_bo_driver = {
 +      .mem_type_prio = radeon_mem_prios,
 +      .mem_busy_prio = radeon_busy_prios,
 +      .num_mem_type_prio = sizeof(radeon_mem_prios)/sizeof(uint32_t),
 +      .num_mem_busy_prio = sizeof(radeon_busy_prios)/sizeof(uint32_t),
 +      .create_ttm_backend_entry = radeon_create_ttm_backend_entry,
 +      .fence_type = radeon_fence_types,
 +      .invalidate_caches = radeon_invalidate_caches,
 +      .init_mem_type = radeon_init_mem_type,
 +      .move = radeon_move,
 +      .evict_flags = radeon_evict_flags,
 +};
 +
  static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
  static struct drm_driver driver = {
        .driver_features =
            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
 -          DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED,
 +          DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED | DRIVER_GEM,
        .dev_priv_size = sizeof(drm_radeon_buf_priv_t),
        .load = radeon_driver_load,
        .firstopen = radeon_driver_firstopen,
        .postclose = radeon_driver_postclose,
        .lastclose = radeon_driver_lastclose,
        .unload = radeon_driver_unload,
+       .suspend = radeon_suspend,
+       .resume = radeon_resume,
        .get_vblank_counter = radeon_get_vblank_counter,
        .enable_vblank = radeon_enable_vblank,
        .disable_vblank = radeon_disable_vblank,
        .get_map_ofs = drm_core_get_map_ofs,
        .get_reg_ofs = drm_core_get_reg_ofs,
        .ioctls = radeon_ioctls,
 +      .gem_init_object = radeon_gem_init_object,
 +      .gem_free_object = radeon_gem_free_object,
        .dma_ioctl = radeon_cp_buffers,
 +      .master_create = radeon_master_create,
 +      .master_destroy = radeon_master_destroy,
        .fops = {
                .owner = THIS_MODULE,
                .open = drm_open,
                .remove = __devexit_p(drm_cleanup_pci),
        },
  
 +      .fence_driver = &radeon_fence_driver,
 +      .bo_driver = &radeon_bo_driver,
 +
        .name = DRIVER_NAME,
        .desc = DRIVER_DESC,
        .date = DRIVER_DATE,
@@@ -149,10 -141,6 +173,10 @@@ static int probe(struct pci_dev *pdev, 
  static int __init radeon_init(void)
  {
        driver.num_ioctls = radeon_max_ioctl;
 +
 +      if (radeon_modeset == 1)
 +              driver.driver_features |= DRIVER_MODESET;
 +
        return drm_init(&driver, pciidlist);
  }
  
diff --combined linux-core/radeon_reg.h
index 9b6bf1e,0000000..04cfa73
mode 100644,000000..100644
--- /dev/null
@@@ -1,5276 -1,0 +1,5245 @@@
- #define R300_GB_SELECT                                        0x401c
 +/*
 + * Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
 + *                VA Linux Systems Inc., Fremont, California.
 + *
 + * 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 on the rights to use, copy, modify, merge,
 + * publish, distribute, sublicense, 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 ATI, VA LINUX SYSTEMS AND/OR
 + * THEIR 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:
 + *   Kevin E. Martin <martin@xfree86.org>
 + *   Rickard E. Faith <faith@valinux.com>
 + *   Alan Hourihane <alanh@fairlite.demon.co.uk>
 + *
 + * References:
 + *
 + * !!!! FIXME !!!!
 + *   RAGE 128 VR/ RAGE 128 GL Register Reference Manual (Technical
 + *   Reference Manual P/N RRG-G04100-C Rev. 0.04), ATI Technologies: April
 + *   1999.
 + *
 + * !!!! FIXME !!!!
 + *   RAGE 128 Software Development Manual (Technical Reference Manual P/N
 + *   SDK-G04000 Rev. 0.01), ATI Technologies: June 1999.
 + *
 + */
 +
 +/* !!!! FIXME !!!!  NOTE: THIS FILE HAS BEEN CONVERTED FROM r128_reg.h
 + * AND CONTAINS REGISTERS AND REGISTER DEFINITIONS THAT ARE NOT CORRECT
 + * ON THE RADEON.  A FULL AUDIT OF THIS CODE IS NEEDED!  */
 +
 +#ifndef _RADEON_REG_H_
 +#define _RADEON_REG_H_
 +
 +#define ATI_DATATYPE_VQ                               0
 +#define ATI_DATATYPE_CI4                      1
 +#define ATI_DATATYPE_CI8                      2
 +#define ATI_DATATYPE_ARGB1555                 3
 +#define ATI_DATATYPE_RGB565                   4
 +#define ATI_DATATYPE_RGB888                   5
 +#define ATI_DATATYPE_ARGB8888                 6
 +#define ATI_DATATYPE_RGB332                   7
 +#define ATI_DATATYPE_Y8                               8
 +#define ATI_DATATYPE_RGB8                     9
 +#define ATI_DATATYPE_CI16                     10
 +#define ATI_DATATYPE_VYUY_422                 11
 +#define ATI_DATATYPE_YVYU_422                 12
 +#define ATI_DATATYPE_AYUV_444                 14
 +#define ATI_DATATYPE_ARGB4444                 15
 +
 +                              /* Registers for 2D/Video/Overlay */
 +#define RADEON_ADAPTER_ID                   0x0f2c /* PCI */
 +#define RADEON_AGP_BASE                     0x0170
 +#define RADEON_AGP_CNTL                     0x0174
 +#       define RADEON_AGP_APER_SIZE_256MB   (0x00 << 0)
 +#       define RADEON_AGP_APER_SIZE_128MB   (0x20 << 0)
 +#       define RADEON_AGP_APER_SIZE_64MB    (0x30 << 0)
 +#       define RADEON_AGP_APER_SIZE_32MB    (0x38 << 0)
 +#       define RADEON_AGP_APER_SIZE_16MB    (0x3c << 0)
 +#       define RADEON_AGP_APER_SIZE_8MB     (0x3e << 0)
 +#       define RADEON_AGP_APER_SIZE_4MB     (0x3f << 0)
 +#       define RADEON_AGP_APER_SIZE_MASK    (0x3f << 0)
 +#define RADEON_STATUS_PCI_CONFIG            0x06
 +#       define RADEON_CAP_LIST              0x100000
 +#define RADEON_CAPABILITIES_PTR_PCI_CONFIG  0x34 /* offset in PCI config*/
 +#       define RADEON_CAP_PTR_MASK          0xfc /* mask off reserved bits of CAP_PTR */
 +#       define RADEON_CAP_ID_NULL           0x00 /* End of capability list */
 +#       define RADEON_CAP_ID_AGP            0x02 /* AGP capability ID */
 +#       define RADEON_CAP_ID_EXP            0x10 /* PCI Express */
 +#define RADEON_AGP_COMMAND                  0x0f60 /* PCI */
 +#define RADEON_AGP_COMMAND_PCI_CONFIG       0x0060 /* offset in PCI config*/
 +#       define RADEON_AGP_ENABLE            (1<<8)
 +#define RADEON_AGP_PLL_CNTL                 0x000b /* PLL */
 +#define RADEON_AGP_STATUS                   0x0f5c /* PCI */
 +#       define RADEON_AGP_1X_MODE           0x01
 +#       define RADEON_AGP_2X_MODE           0x02
 +#       define RADEON_AGP_4X_MODE           0x04
 +#       define RADEON_AGP_FW_MODE           0x10
 +#       define RADEON_AGP_MODE_MASK         0x17
 +#       define RADEON_AGPv3_MODE            0x08
 +#       define RADEON_AGPv3_4X_MODE         0x01
 +#       define RADEON_AGPv3_8X_MODE         0x02
 +#define RADEON_ATTRDR                       0x03c1 /* VGA */
 +#define RADEON_ATTRDW                       0x03c0 /* VGA */
 +#define RADEON_ATTRX                        0x03c0 /* VGA */
 +#define RADEON_AUX_SC_CNTL                  0x1660
 +#       define RADEON_AUX1_SC_EN            (1 << 0)
 +#       define RADEON_AUX1_SC_MODE_OR       (0 << 1)
 +#       define RADEON_AUX1_SC_MODE_NAND     (1 << 1)
 +#       define RADEON_AUX2_SC_EN            (1 << 2)
 +#       define RADEON_AUX2_SC_MODE_OR       (0 << 3)
 +#       define RADEON_AUX2_SC_MODE_NAND     (1 << 3)
 +#       define RADEON_AUX3_SC_EN            (1 << 4)
 +#       define RADEON_AUX3_SC_MODE_OR       (0 << 5)
 +#       define RADEON_AUX3_SC_MODE_NAND     (1 << 5)
 +#define RADEON_AUX1_SC_BOTTOM               0x1670
 +#define RADEON_AUX1_SC_LEFT                 0x1664
 +#define RADEON_AUX1_SC_RIGHT                0x1668
 +#define RADEON_AUX1_SC_TOP                  0x166c
 +#define RADEON_AUX2_SC_BOTTOM               0x1680
 +#define RADEON_AUX2_SC_LEFT                 0x1674
 +#define RADEON_AUX2_SC_RIGHT                0x1678
 +#define RADEON_AUX2_SC_TOP                  0x167c
 +#define RADEON_AUX3_SC_BOTTOM               0x1690
 +#define RADEON_AUX3_SC_LEFT                 0x1684
 +#define RADEON_AUX3_SC_RIGHT                0x1688
 +#define RADEON_AUX3_SC_TOP                  0x168c
 +#define RADEON_AUX_WINDOW_HORZ_CNTL         0x02d8
 +#define RADEON_AUX_WINDOW_VERT_CNTL         0x02dc
 +
 +#define RADEON_BASE_CODE                    0x0f0b
 +#define RADEON_BIOS_0_SCRATCH               0x0010
 +#       define RADEON_FP_PANEL_SCALABLE     (1 << 16)
 +#       define RADEON_FP_PANEL_SCALE_EN     (1 << 17)
 +#       define RADEON_FP_CHIP_SCALE_EN      (1 << 18)
 +#       define RADEON_DRIVER_BRIGHTNESS_EN  (1 << 26)
 +#       define RADEON_DISPLAY_ROT_MASK      (3 << 28)
 +#       define RADEON_DISPLAY_ROT_00        (0 << 28)
 +#       define RADEON_DISPLAY_ROT_90        (1 << 28)
 +#       define RADEON_DISPLAY_ROT_180       (2 << 28)
 +#       define RADEON_DISPLAY_ROT_270       (3 << 28)
 +#define RADEON_BIOS_1_SCRATCH               0x0014
 +#define RADEON_BIOS_2_SCRATCH               0x0018
 +#define RADEON_BIOS_3_SCRATCH               0x001c
 +#define RADEON_BIOS_4_SCRATCH               0x0020
 +#       define RADEON_CRT1_ATTACHED_MASK    (3 << 0)
 +#       define RADEON_CRT1_ATTACHED_MONO    (1 << 0)
 +#       define RADEON_CRT1_ATTACHED_COLOR   (2 << 0)
 +#       define RADEON_LCD1_ATTACHED         (1 << 2)
 +#       define RADEON_DFP1_ATTACHED         (1 << 3)
 +#       define RADEON_TV1_ATTACHED_MASK     (3 << 4)
 +#       define RADEON_TV1_ATTACHED_COMP     (1 << 4)
 +#       define RADEON_TV1_ATTACHED_SVIDEO   (2 << 4)
 +#       define RADEON_CRT2_ATTACHED_MASK    (3 << 8)
 +#       define RADEON_CRT2_ATTACHED_MONO    (1 << 8)
 +#       define RADEON_CRT2_ATTACHED_COLOR   (2 << 8)
 +#       define RADEON_DFP2_ATTACHED         (1 << 11)
 +#define RADEON_BIOS_5_SCRATCH               0x0024
 +#       define RADEON_LCD1_ON               (1 << 0)
 +#       define RADEON_CRT1_ON               (1 << 1)
 +#       define RADEON_TV1_ON                (1 << 2)
 +#       define RADEON_DFP1_ON               (1 << 3)
 +#       define RADEON_CRT2_ON               (1 << 5)
 +#       define RADEON_CV1_ON                (1 << 6)
 +#       define RADEON_DFP2_ON               (1 << 7)
 +#       define RADEON_LCD1_CRTC_MASK        (1 << 8)
 +#       define RADEON_LCD1_CRTC_SHIFT       8
 +#       define RADEON_CRT1_CRTC_MASK        (1 << 9)
 +#       define RADEON_CRT1_CRTC_SHIFT       9
 +#       define RADEON_TV1_CRTC_MASK         (1 << 10)
 +#       define RADEON_TV1_CRTC_SHIFT        10
 +#       define RADEON_DFP1_CRTC_MASK        (1 << 11)
 +#       define RADEON_DFP1_CRTC_SHIFT       11
 +#       define RADEON_CRT2_CRTC_MASK        (1 << 12)
 +#       define RADEON_CRT2_CRTC_SHIFT       12
 +#       define RADEON_CV1_CRTC_MASK         (1 << 13)
 +#       define RADEON_CV1_CRTC_SHIFT        13
 +#       define RADEON_DFP2_CRTC_MASK        (1 << 14)
 +#       define RADEON_DFP2_CRTC_SHIFT       14
 +#define RADEON_BIOS_6_SCRATCH               0x0028
 +#       define RADEON_ACC_MODE_CHANGE       (1 << 2)
 +#       define RADEON_EXT_DESKTOP_MODE      (1 << 3)
 +#       define RADEON_LCD_DPMS_ON           (1 << 20)
 +#       define RADEON_CRT_DPMS_ON           (1 << 21)
 +#       define RADEON_TV_DPMS_ON            (1 << 22)
 +#       define RADEON_DFP_DPMS_ON           (1 << 23)
 +#       define RADEON_DPMS_MASK             (3 << 24)
 +#       define RADEON_DPMS_ON               (0 << 24)
 +#       define RADEON_DPMS_STANDBY          (1 << 24)
 +#       define RADEON_DPMS_SUSPEND          (2 << 24)
 +#       define RADEON_DPMS_OFF              (3 << 24)
 +#       define RADEON_SCREEN_BLANKING       (1 << 26)
 +#       define RADEON_DRIVER_CRITICAL       (1 << 27)
 +#       define RADEON_DISPLAY_SWITCHING_DIS (1 << 30)
 +#define RADEON_BIOS_7_SCRATCH               0x002c
 +#       define RADEON_SYS_HOTKEY            (1 << 10)
 +#       define RADEON_DRV_LOADED            (1 << 12)
 +#define RADEON_BIOS_ROM                     0x0f30 /* PCI */
 +#define RADEON_BIST                         0x0f0f /* PCI */
 +#define RADEON_BRUSH_DATA0                  0x1480
 +#define RADEON_BRUSH_DATA1                  0x1484
 +#define RADEON_BRUSH_DATA10                 0x14a8
 +#define RADEON_BRUSH_DATA11                 0x14ac
 +#define RADEON_BRUSH_DATA12                 0x14b0
 +#define RADEON_BRUSH_DATA13                 0x14b4
 +#define RADEON_BRUSH_DATA14                 0x14b8
 +#define RADEON_BRUSH_DATA15                 0x14bc
 +#define RADEON_BRUSH_DATA16                 0x14c0
 +#define RADEON_BRUSH_DATA17                 0x14c4
 +#define RADEON_BRUSH_DATA18                 0x14c8
 +#define RADEON_BRUSH_DATA19                 0x14cc
 +#define RADEON_BRUSH_DATA2                  0x1488
 +#define RADEON_BRUSH_DATA20                 0x14d0
 +#define RADEON_BRUSH_DATA21                 0x14d4
 +#define RADEON_BRUSH_DATA22                 0x14d8
 +#define RADEON_BRUSH_DATA23                 0x14dc
 +#define RADEON_BRUSH_DATA24                 0x14e0
 +#define RADEON_BRUSH_DATA25                 0x14e4
 +#define RADEON_BRUSH_DATA26                 0x14e8
 +#define RADEON_BRUSH_DATA27                 0x14ec
 +#define RADEON_BRUSH_DATA28                 0x14f0
 +#define RADEON_BRUSH_DATA29                 0x14f4
 +#define RADEON_BRUSH_DATA3                  0x148c
 +#define RADEON_BRUSH_DATA30                 0x14f8
 +#define RADEON_BRUSH_DATA31                 0x14fc
 +#define RADEON_BRUSH_DATA32                 0x1500
 +#define RADEON_BRUSH_DATA33                 0x1504
 +#define RADEON_BRUSH_DATA34                 0x1508
 +#define RADEON_BRUSH_DATA35                 0x150c
 +#define RADEON_BRUSH_DATA36                 0x1510
 +#define RADEON_BRUSH_DATA37                 0x1514
 +#define RADEON_BRUSH_DATA38                 0x1518
 +#define RADEON_BRUSH_DATA39                 0x151c
 +#define RADEON_BRUSH_DATA4                  0x1490
 +#define RADEON_BRUSH_DATA40                 0x1520
 +#define RADEON_BRUSH_DATA41                 0x1524
 +#define RADEON_BRUSH_DATA42                 0x1528
 +#define RADEON_BRUSH_DATA43                 0x152c
 +#define RADEON_BRUSH_DATA44                 0x1530
 +#define RADEON_BRUSH_DATA45                 0x1534
 +#define RADEON_BRUSH_DATA46                 0x1538
 +#define RADEON_BRUSH_DATA47                 0x153c
 +#define RADEON_BRUSH_DATA48                 0x1540
 +#define RADEON_BRUSH_DATA49                 0x1544
 +#define RADEON_BRUSH_DATA5                  0x1494
 +#define RADEON_BRUSH_DATA50                 0x1548
 +#define RADEON_BRUSH_DATA51                 0x154c
 +#define RADEON_BRUSH_DATA52                 0x1550
 +#define RADEON_BRUSH_DATA53                 0x1554
 +#define RADEON_BRUSH_DATA54                 0x1558
 +#define RADEON_BRUSH_DATA55                 0x155c
 +#define RADEON_BRUSH_DATA56                 0x1560
 +#define RADEON_BRUSH_DATA57                 0x1564
 +#define RADEON_BRUSH_DATA58                 0x1568
 +#define RADEON_BRUSH_DATA59                 0x156c
 +#define RADEON_BRUSH_DATA6                  0x1498
 +#define RADEON_BRUSH_DATA60                 0x1570
 +#define RADEON_BRUSH_DATA61                 0x1574
 +#define RADEON_BRUSH_DATA62                 0x1578
 +#define RADEON_BRUSH_DATA63                 0x157c
 +#define RADEON_BRUSH_DATA7                  0x149c
 +#define RADEON_BRUSH_DATA8                  0x14a0
 +#define RADEON_BRUSH_DATA9                  0x14a4
 +#define RADEON_BRUSH_SCALE                  0x1470
 +#define RADEON_BRUSH_Y_X                    0x1474
 +#define RADEON_BUS_CNTL                     0x0030
 +#       define RADEON_BUS_MASTER_DIS         (1 << 6)
 +#       define RADEON_BUS_BIOS_DIS_ROM       (1 << 12)
 +#       define RADEON_BUS_RD_DISCARD_EN      (1 << 24)
 +#       define RADEON_BUS_RD_ABORT_EN        (1 << 25)
 +#       define RADEON_BUS_MSTR_DISCONNECT_EN (1 << 28)
 +#       define RADEON_BUS_WRT_BURST          (1 << 29)
 +#       define RADEON_BUS_READ_BURST         (1 << 30)
 +#define RADEON_BUS_CNTL1                    0x0034
 +#       define RADEON_BUS_WAIT_ON_LOCK_EN    (1 << 4)
 +
 +#define RADEON_CACHE_CNTL                   0x1724
 +#define RADEON_CACHE_LINE                   0x0f0c /* PCI */
 +#define RADEON_CAPABILITIES_ID              0x0f50 /* PCI */
 +#define RADEON_CAPABILITIES_PTR             0x0f34 /* PCI */
 +#define RADEON_CLK_PIN_CNTL                 0x0001 /* PLL */
 +#       define RADEON_SCLK_DYN_START_CNTL   (1 << 15)
 +#define RADEON_CLOCK_CNTL_DATA              0x000c
 +#define RADEON_CLOCK_CNTL_INDEX             0x0008
 +#       define RADEON_PLL_WR_EN             (1 << 7)
 +#       define RADEON_PLL_DIV_SEL           (3 << 8)
 +#       define RADEON_PLL2_DIV_SEL_MASK     ~(3 << 8)
 +#define RADEON_CLK_PWRMGT_CNTL              0x0014
 +#       define RADEON_ENGIN_DYNCLK_MODE     (1 << 12)
 +#       define RADEON_ACTIVE_HILO_LAT_MASK  (3 << 13)
 +#       define RADEON_ACTIVE_HILO_LAT_SHIFT 13
 +#       define RADEON_DISP_DYN_STOP_LAT_MASK (1 << 12)
 +#       define RADEON_MC_BUSY               (1 << 16)
 +#       define RADEON_DLL_READY             (1 << 19)
 +#       define RADEON_CG_NO1_DEBUG_0        (1 << 24)
 +#       define RADEON_CG_NO1_DEBUG_MASK     (0x1f << 24)
 +#       define RADEON_DYN_STOP_MODE_MASK    (7 << 21)
 +#       define RADEON_TVPLL_PWRMGT_OFF      (1 << 30)
 +#       define RADEON_TVCLK_TURNOFF         (1 << 31)
 +#define RADEON_PLL_PWRMGT_CNTL              0x0015
 +#       define RADEON_TCL_BYPASS_DISABLE    (1 << 20)
 +#define RADEON_CLR_CMP_CLR_3D               0x1a24
 +#define RADEON_CLR_CMP_CLR_DST              0x15c8
 +#define RADEON_CLR_CMP_CLR_SRC              0x15c4
 +#define RADEON_CLR_CMP_CNTL                 0x15c0
 +#       define RADEON_SRC_CMP_EQ_COLOR      (4 <<  0)
 +#       define RADEON_SRC_CMP_NEQ_COLOR     (5 <<  0)
 +#       define RADEON_CLR_CMP_SRC_SOURCE    (1 << 24)
 +#define RADEON_CLR_CMP_MASK                 0x15cc
 +#       define RADEON_CLR_CMP_MSK           0xffffffff
 +#define RADEON_CLR_CMP_MASK_3D              0x1A28
 +#define RADEON_COMMAND                      0x0f04 /* PCI */
 +#define RADEON_COMPOSITE_SHADOW_ID          0x1a0c
 +#define RADEON_CONFIG_APER_0_BASE           0x0100
 +#define RADEON_CONFIG_APER_1_BASE           0x0104
 +#define RADEON_CONFIG_APER_SIZE             0x0108
 +#define RADEON_CONFIG_BONDS                 0x00e8
 +#define RADEON_CONFIG_CNTL                  0x00e0
 +#       define RADEON_CFG_ATI_REV_A11       (0   << 16)
 +#       define RADEON_CFG_ATI_REV_A12       (1   << 16)
 +#       define RADEON_CFG_ATI_REV_A13       (2   << 16)
 +#       define RADEON_CFG_ATI_REV_ID_MASK   (0xf << 16)
 +#define RADEON_CONFIG_MEMSIZE               0x00f8
 +#define RADEON_CONFIG_MEMSIZE_EMBEDDED      0x0114
 +#define RADEON_CONFIG_REG_1_BASE            0x010c
 +#define RADEON_CONFIG_REG_APER_SIZE         0x0110
 +#define RADEON_CONFIG_XSTRAP                0x00e4
 +#define RADEON_CONSTANT_COLOR_C             0x1d34
 +#       define RADEON_CONSTANT_COLOR_MASK   0x00ffffff
 +#       define RADEON_CONSTANT_COLOR_ONE    0x00ffffff
 +#       define RADEON_CONSTANT_COLOR_ZERO   0x00000000
 +#define RADEON_CRC_CMDFIFO_ADDR             0x0740
 +#define RADEON_CRC_CMDFIFO_DOUT             0x0744
 +#define RADEON_GRPH_BUFFER_CNTL             0x02f0
 +#       define RADEON_GRPH_START_REQ_MASK          (0x7f)
 +#       define RADEON_GRPH_START_REQ_SHIFT         0
 +#       define RADEON_GRPH_STOP_REQ_MASK           (0x7f<<8)
 +#       define RADEON_GRPH_STOP_REQ_SHIFT          8
 +#       define RADEON_GRPH_CRITICAL_POINT_MASK     (0x7f<<16)
 +#       define RADEON_GRPH_CRITICAL_POINT_SHIFT    16
 +#       define RADEON_GRPH_CRITICAL_CNTL           (1<<28)
 +#       define RADEON_GRPH_BUFFER_SIZE             (1<<29)
 +#       define RADEON_GRPH_CRITICAL_AT_SOF         (1<<30)
 +#       define RADEON_GRPH_STOP_CNTL               (1<<31)
 +#define RADEON_GRPH2_BUFFER_CNTL            0x03f0
 +#       define RADEON_GRPH2_START_REQ_MASK         (0x7f)
 +#       define RADEON_GRPH2_START_REQ_SHIFT         0
 +#       define RADEON_GRPH2_STOP_REQ_MASK          (0x7f<<8)
 +#       define RADEON_GRPH2_STOP_REQ_SHIFT         8
 +#       define RADEON_GRPH2_CRITICAL_POINT_MASK    (0x7f<<16)
 +#       define RADEON_GRPH2_CRITICAL_POINT_SHIFT   16
 +#       define RADEON_GRPH2_CRITICAL_CNTL          (1<<28)
 +#       define RADEON_GRPH2_BUFFER_SIZE            (1<<29)
 +#       define RADEON_GRPH2_CRITICAL_AT_SOF        (1<<30)
 +#       define RADEON_GRPH2_STOP_CNTL              (1<<31)
 +#define RADEON_CRTC_CRNT_FRAME              0x0214
 +#define RADEON_CRTC_EXT_CNTL                0x0054
 +#       define RADEON_CRTC_VGA_XOVERSCAN    (1 <<  0)
 +#       define RADEON_VGA_ATI_LINEAR        (1 <<  3)
 +#       define RADEON_XCRT_CNT_EN           (1 <<  6)
 +#       define RADEON_CRTC_HSYNC_DIS        (1 <<  8)
 +#       define RADEON_CRTC_VSYNC_DIS        (1 <<  9)
 +#       define RADEON_CRTC_DISPLAY_DIS      (1 << 10)
 +#       define RADEON_CRTC_SYNC_TRISTAT     (1 << 11)
 +#       define RADEON_CRTC_CRT_ON           (1 << 15)
 +#define RADEON_CRTC_EXT_CNTL_DPMS_BYTE      0x0055
 +#       define RADEON_CRTC_HSYNC_DIS_BYTE   (1 <<  0)
 +#       define RADEON_CRTC_VSYNC_DIS_BYTE   (1 <<  1)
 +#       define RADEON_CRTC_DISPLAY_DIS_BYTE (1 <<  2)
 +#define RADEON_CRTC_GEN_CNTL                0x0050
 +#       define RADEON_CRTC_DBL_SCAN_EN      (1 <<  0)
 +#       define RADEON_CRTC_INTERLACE_EN     (1 <<  1)
 +#       define RADEON_CRTC_CSYNC_EN         (1 <<  4)
 +#       define RADEON_CRTC_ICON_EN          (1 << 15)
 +#       define RADEON_CRTC_CUR_EN           (1 << 16)
 +#       define RADEON_CRTC_CUR_MODE_MASK    (7 << 20)
 +#       define RADEON_CRTC_EXT_DISP_EN      (1 << 24)
 +#       define RADEON_CRTC_EN               (1 << 25)
 +#       define RADEON_CRTC_DISP_REQ_EN_B    (1 << 26)
 +#define RADEON_CRTC2_GEN_CNTL               0x03f8
 +#       define RADEON_CRTC2_DBL_SCAN_EN     (1 <<  0)
 +#       define RADEON_CRTC2_INTERLACE_EN    (1 <<  1)
 +#       define RADEON_CRTC2_SYNC_TRISTAT    (1 <<  4)
 +#       define RADEON_CRTC2_HSYNC_TRISTAT   (1 <<  5)
 +#       define RADEON_CRTC2_VSYNC_TRISTAT   (1 <<  6)
 +#       define RADEON_CRTC2_CRT2_ON         (1 <<  7)
 +#       define RADEON_CRTC2_PIX_WIDTH_SHIFT 8
 +#       define RADEON_CRTC2_PIX_WIDTH_MASK  (0xf << 8)
 +#       define RADEON_CRTC2_ICON_EN         (1 << 15)
 +#       define RADEON_CRTC2_CUR_EN          (1 << 16)
 +#       define RADEON_CRTC2_CUR_MODE_MASK   (7 << 20)
 +#       define RADEON_CRTC2_DISP_DIS        (1 << 23)
 +#       define RADEON_CRTC2_EN              (1 << 25)
 +#       define RADEON_CRTC2_DISP_REQ_EN_B   (1 << 26)
 +#       define RADEON_CRTC2_CSYNC_EN        (1 << 27)
 +#       define RADEON_CRTC2_HSYNC_DIS       (1 << 28)
 +#       define RADEON_CRTC2_VSYNC_DIS       (1 << 29)
 +#define RADEON_CRTC_MORE_CNTL               0x27c
 +#       define RADEON_CRTC_AUTO_HORZ_CENTER_EN (1<<2)
 +#       define RADEON_CRTC_AUTO_VERT_CENTER_EN (1<<3)
 +#       define RADEON_CRTC_H_CUTOFF_ACTIVE_EN (1<<4)
 +#       define RADEON_CRTC_V_CUTOFF_ACTIVE_EN (1<<5)
 +#define RADEON_CRTC_GUI_TRIG_VLINE          0x0218
 +#define RADEON_CRTC_H_SYNC_STRT_WID         0x0204
 +#       define RADEON_CRTC_H_SYNC_STRT_PIX        (0x07  <<  0)
 +#       define RADEON_CRTC_H_SYNC_STRT_CHAR       (0x3ff <<  3)
 +#       define RADEON_CRTC_H_SYNC_STRT_CHAR_SHIFT 3
 +#       define RADEON_CRTC_H_SYNC_WID             (0x3f  << 16)
 +#       define RADEON_CRTC_H_SYNC_WID_SHIFT       16
 +#       define RADEON_CRTC_H_SYNC_POL             (1     << 23)
 +#define RADEON_CRTC2_H_SYNC_STRT_WID        0x0304
 +#       define RADEON_CRTC2_H_SYNC_STRT_PIX        (0x07  <<  0)
 +#       define RADEON_CRTC2_H_SYNC_STRT_CHAR       (0x3ff <<  3)
 +#       define RADEON_CRTC2_H_SYNC_STRT_CHAR_SHIFT 3
 +#       define RADEON_CRTC2_H_SYNC_WID             (0x3f  << 16)
 +#       define RADEON_CRTC2_H_SYNC_WID_SHIFT       16
 +#       define RADEON_CRTC2_H_SYNC_POL             (1     << 23)
 +#define RADEON_CRTC_H_TOTAL_DISP            0x0200
 +#       define RADEON_CRTC_H_TOTAL          (0x03ff << 0)
 +#       define RADEON_CRTC_H_TOTAL_SHIFT    0
 +#       define RADEON_CRTC_H_DISP           (0x01ff << 16)
 +#       define RADEON_CRTC_H_DISP_SHIFT     16
 +#define RADEON_CRTC2_H_TOTAL_DISP           0x0300
 +#       define RADEON_CRTC2_H_TOTAL         (0x03ff << 0)
 +#       define RADEON_CRTC2_H_TOTAL_SHIFT   0
 +#       define RADEON_CRTC2_H_DISP          (0x01ff << 16)
 +#       define RADEON_CRTC2_H_DISP_SHIFT    16
 +
 +#define RADEON_CRTC_OFFSET_RIGHT          0x0220
 +#define RADEON_CRTC_OFFSET                  0x0224
 +#     define RADEON_CRTC_OFFSET__GUI_TRIG_OFFSET (1<<30)
 +#     define RADEON_CRTC_OFFSET__OFFSET_LOCK     (1<<31)
 +
 +#define RADEON_CRTC2_OFFSET                 0x0324
 +#     define RADEON_CRTC2_OFFSET__GUI_TRIG_OFFSET (1<<30)
 +#     define RADEON_CRTC2_OFFSET__OFFSET_LOCK     (1<<31)
 +#define RADEON_CRTC_OFFSET_CNTL             0x0228
 +#       define RADEON_CRTC_TILE_LINE_SHIFT              0
 +#       define RADEON_CRTC_TILE_LINE_RIGHT_SHIFT        4
 +#     define R300_CRTC_X_Y_MODE_EN_RIGHT              (1 << 6)
 +#     define R300_CRTC_MICRO_TILE_BUFFER_RIGHT_MASK   (3 << 7)
 +#     define R300_CRTC_MICRO_TILE_BUFFER_RIGHT_AUTO   (0 << 7)
 +#     define R300_CRTC_MICRO_TILE_BUFFER_RIGHT_SINGLE (1 << 7)
 +#     define R300_CRTC_MICRO_TILE_BUFFER_RIGHT_DOUBLE (2 << 7)
 +#     define R300_CRTC_MICRO_TILE_BUFFER_RIGHT_DIS    (3 << 7)
 +#     define R300_CRTC_X_Y_MODE_EN                    (1 << 9)
 +#     define R300_CRTC_MICRO_TILE_BUFFER_MASK         (3 << 10)
 +#     define R300_CRTC_MICRO_TILE_BUFFER_AUTO         (0 << 10)
 +#     define R300_CRTC_MICRO_TILE_BUFFER_SINGLE       (1 << 10)
 +#     define R300_CRTC_MICRO_TILE_BUFFER_DOUBLE       (2 << 10)
 +#     define R300_CRTC_MICRO_TILE_BUFFER_DIS          (3 << 10)
 +#     define R300_CRTC_MICRO_TILE_EN_RIGHT            (1 << 12)
 +#     define R300_CRTC_MICRO_TILE_EN                  (1 << 13)
 +#     define R300_CRTC_MACRO_TILE_EN_RIGHT            (1 << 14)
 +#       define R300_CRTC_MACRO_TILE_EN                  (1 << 15)
 +#       define RADEON_CRTC_TILE_EN_RIGHT                (1 << 14)
 +#       define RADEON_CRTC_TILE_EN                      (1 << 15)
 +#       define RADEON_CRTC_OFFSET_FLIP_CNTL             (1 << 16)
 +#       define RADEON_CRTC_STEREO_OFFSET_EN             (1 << 17)
 +
 +#define R300_CRTC_TILE_X0_Y0              0x0350
 +#define R300_CRTC2_TILE_X0_Y0             0x0358
 +
 +#define RADEON_CRTC2_OFFSET_CNTL            0x0328
 +#       define RADEON_CRTC2_OFFSET_FLIP_CNTL (1 << 16)
 +#       define RADEON_CRTC2_TILE_EN         (1 << 15)
 +#define RADEON_CRTC_PITCH                   0x022c
 +#     define RADEON_CRTC_PITCH__SHIFT          0
 +#     define RADEON_CRTC_PITCH__RIGHT_SHIFT   16
 +
 +#define RADEON_CRTC2_PITCH                  0x032c
 +#define RADEON_CRTC_STATUS                  0x005c
 +#       define RADEON_CRTC_VBLANK_SAVE      (1 <<  1)
 +#       define RADEON_CRTC_VBLANK_SAVE_CLEAR  (1 <<  1)
 +#define RADEON_CRTC2_STATUS                  0x03fc
 +#       define RADEON_CRTC2_VBLANK_SAVE      (1 <<  1)
 +#       define RADEON_CRTC2_VBLANK_SAVE_CLEAR  (1 <<  1)
 +#define RADEON_CRTC_V_SYNC_STRT_WID         0x020c
 +#       define RADEON_CRTC_V_SYNC_STRT        (0x7ff <<  0)
 +#       define RADEON_CRTC_V_SYNC_STRT_SHIFT  0
 +#       define RADEON_CRTC_V_SYNC_WID         (0x1f  << 16)
 +#       define RADEON_CRTC_V_SYNC_WID_SHIFT   16
 +#       define RADEON_CRTC_V_SYNC_POL         (1     << 23)
 +#define RADEON_CRTC2_V_SYNC_STRT_WID        0x030c
 +#       define RADEON_CRTC2_V_SYNC_STRT       (0x7ff <<  0)
 +#       define RADEON_CRTC2_V_SYNC_STRT_SHIFT 0
 +#       define RADEON_CRTC2_V_SYNC_WID        (0x1f  << 16)
 +#       define RADEON_CRTC2_V_SYNC_WID_SHIFT  16
 +#       define RADEON_CRTC2_V_SYNC_POL        (1     << 23)
 +#define RADEON_CRTC_V_TOTAL_DISP            0x0208
 +#       define RADEON_CRTC_V_TOTAL          (0x07ff << 0)
 +#       define RADEON_CRTC_V_TOTAL_SHIFT    0
 +#       define RADEON_CRTC_V_DISP           (0x07ff << 16)
 +#       define RADEON_CRTC_V_DISP_SHIFT     16
 +#define RADEON_CRTC2_V_TOTAL_DISP           0x0308
 +#       define RADEON_CRTC2_V_TOTAL         (0x07ff << 0)
 +#       define RADEON_CRTC2_V_TOTAL_SHIFT   0
 +#       define RADEON_CRTC2_V_DISP          (0x07ff << 16)
 +#       define RADEON_CRTC2_V_DISP_SHIFT    16
 +#define RADEON_CRTC_VLINE_CRNT_VLINE        0x0210
 +#       define RADEON_CRTC_CRNT_VLINE_MASK  (0x7ff << 16)
 +#define RADEON_CRTC2_CRNT_FRAME             0x0314
 +#define RADEON_CRTC2_GUI_TRIG_VLINE         0x0318
 +#define RADEON_CRTC2_STATUS                 0x03fc
 +#define RADEON_CRTC2_VLINE_CRNT_VLINE       0x0310
 +#define RADEON_CRTC8_DATA                   0x03d5 /* VGA, 0x3b5 */
 +#define RADEON_CRTC8_IDX                    0x03d4 /* VGA, 0x3b4 */
 +#define RADEON_CUR_CLR0                     0x026c
 +#define RADEON_CUR_CLR1                     0x0270
 +#define RADEON_CUR_HORZ_VERT_OFF            0x0268
 +#define RADEON_CUR_HORZ_VERT_POSN           0x0264
 +#define RADEON_CUR_OFFSET                   0x0260
 +#       define RADEON_CUR_LOCK              (1 << 31)
 +#define RADEON_CUR2_CLR0                    0x036c
 +#define RADEON_CUR2_CLR1                    0x0370
 +#define RADEON_CUR2_HORZ_VERT_OFF           0x0368
 +#define RADEON_CUR2_HORZ_VERT_POSN          0x0364
 +#define RADEON_CUR2_OFFSET                  0x0360
 +#       define RADEON_CUR2_LOCK             (1 << 31)
 +
 +#define RADEON_DAC_CNTL                     0x0058
 +#       define RADEON_DAC_RANGE_CNTL        (3 <<  0)
 +#       define RADEON_DAC_RANGE_CNTL_PS2    (2 <<  0)
 +#       define RADEON_DAC_RANGE_CNTL_MASK   0x03
 +#       define RADEON_DAC_BLANKING          (1 <<  2)
 +#       define RADEON_DAC_CMP_EN            (1 <<  3)
 +#       define RADEON_DAC_CMP_OUTPUT        (1 <<  7)
 +#       define RADEON_DAC_8BIT_EN           (1 <<  8)
 +#       define RADEON_DAC_TVO_EN            (1 << 10)
 +#       define RADEON_DAC_VGA_ADR_EN        (1 << 13)
 +#       define RADEON_DAC_PDWN              (1 << 15)
 +#       define RADEON_DAC_MASK_ALL          (0xff << 24)
 +#define RADEON_DAC_CNTL2                    0x007c
 +#       define RADEON_DAC2_TV_CLK_SEL       (0 <<  1)
 +#       define RADEON_DAC2_DAC_CLK_SEL      (1 <<  0)
 +#       define RADEON_DAC2_DAC2_CLK_SEL     (1 <<  1)
 +#       define RADEON_DAC2_PALETTE_ACC_CTL  (1 <<  5)
 +#       define RADEON_DAC2_CMP_EN           (1 <<  7)
 +#       define RADEON_DAC2_CMP_OUT_R        (1 <<  8)
 +#       define RADEON_DAC2_CMP_OUT_G        (1 <<  9)
 +#       define RADEON_DAC2_CMP_OUT_B        (1 << 10)
 +#       define RADEON_DAC2_CMP_OUTPUT       (1 << 11)
 +#define RADEON_DAC_EXT_CNTL                 0x0280
 +#       define RADEON_DAC2_FORCE_BLANK_OFF_EN (1 << 0)
 +#       define RADEON_DAC2_FORCE_DATA_EN      (1 << 1)
 +#       define RADEON_DAC_FORCE_BLANK_OFF_EN  (1 << 4)
 +#       define RADEON_DAC_FORCE_DATA_EN       (1 << 5)
 +#       define RADEON_DAC_FORCE_DATA_SEL_MASK (3 << 6)
 +#       define RADEON_DAC_FORCE_DATA_SEL_R    (0 << 6)
 +#       define RADEON_DAC_FORCE_DATA_SEL_G    (1 << 6)
 +#       define RADEON_DAC_FORCE_DATA_SEL_B    (2 << 6)
 +#       define RADEON_DAC_FORCE_DATA_SEL_RGB  (3 << 6)
 +#       define RADEON_DAC_FORCE_DATA_MASK   0x0003ff00
 +#       define RADEON_DAC_FORCE_DATA_SHIFT  8
 +#define RADEON_DAC_MACRO_CNTL               0x0d04
 +#       define RADEON_DAC_PDWN_R            (1 << 16)
 +#       define RADEON_DAC_PDWN_G            (1 << 17)
 +#       define RADEON_DAC_PDWN_B            (1 << 18)
 +#define RADEON_TV_DAC_CNTL                  0x088c
 +#       define RADEON_TV_DAC_NBLANK         (1 << 0)
 +#       define RADEON_TV_DAC_NHOLD          (1 << 1)
 +#       define RADEON_TV_DAC_PEDESTAL       (1 <<  2)
 +#       define RADEON_TV_MONITOR_DETECT_EN  (1 <<  4)
 +#       define RADEON_TV_DAC_CMPOUT         (1 <<  5)
 +#       define RADEON_TV_DAC_STD_MASK       (3 <<  8)
 +#       define RADEON_TV_DAC_STD_PAL        (0 <<  8)
 +#       define RADEON_TV_DAC_STD_NTSC       (1 <<  8)
 +#       define RADEON_TV_DAC_STD_PS2        (2 <<  8)
 +#       define RADEON_TV_DAC_STD_RS343      (3 <<  8)
 +#       define RADEON_TV_DAC_BGSLEEP        (1 <<  6)
 +#       define RADEON_TV_DAC_BGADJ_MASK     (0xf <<  16)
 +#       define RADEON_TV_DAC_BGADJ_SHIFT    16
 +#       define RADEON_TV_DAC_DACADJ_MASK    (0xf <<  20)
 +#       define RADEON_TV_DAC_DACADJ_SHIFT   20
 +#       define RADEON_TV_DAC_RDACPD         (1 <<  24)
 +#       define RADEON_TV_DAC_GDACPD         (1 <<  25)
 +#       define RADEON_TV_DAC_BDACPD         (1 <<  26)
 +#       define RADEON_TV_DAC_RDACDET        (1 << 29)
 +#       define RADEON_TV_DAC_GDACDET        (1 << 30)
 +#       define RADEON_TV_DAC_BDACDET        (1 << 31)
 +#       define R420_TV_DAC_DACADJ_MASK      (0x1f <<  20)
 +#       define R420_TV_DAC_RDACPD           (1 <<  25)
 +#       define R420_TV_DAC_GDACPD           (1 <<  26)
 +#       define R420_TV_DAC_BDACPD           (1 <<  27)
 +#       define R420_TV_DAC_TVENABLE         (1 <<  28)
 +#define RADEON_DISP_HW_DEBUG                0x0d14
 +#       define RADEON_CRT2_DISP1_SEL        (1 <<  5)
 +#define RADEON_DISP_OUTPUT_CNTL             0x0d64
 +#       define RADEON_DISP_DAC_SOURCE_MASK  0x03
 +#       define RADEON_DISP_DAC2_SOURCE_MASK  0x0c
 +#       define RADEON_DISP_DAC_SOURCE_CRTC2 0x01
 +#       define RADEON_DISP_DAC_SOURCE_RMX   0x02
 +#       define RADEON_DISP_DAC_SOURCE_LTU   0x03
 +#       define RADEON_DISP_DAC2_SOURCE_CRTC2 0x04
 +#       define RADEON_DISP_TVDAC_SOURCE_MASK  (0x03 << 2)
 +#       define RADEON_DISP_TVDAC_SOURCE_CRTC  0x0
 +#       define RADEON_DISP_TVDAC_SOURCE_CRTC2 (0x01 << 2)
 +#       define RADEON_DISP_TVDAC_SOURCE_RMX   (0x02 << 2)
 +#       define RADEON_DISP_TVDAC_SOURCE_LTU   (0x03 << 2)
 +#       define RADEON_DISP_TRANS_MATRIX_MASK  (0x03 << 4)
 +#       define RADEON_DISP_TRANS_MATRIX_ALPHA_MSB (0x00 << 4)
 +#       define RADEON_DISP_TRANS_MATRIX_GRAPHICS  (0x01 << 4)
 +#       define RADEON_DISP_TRANS_MATRIX_VIDEO     (0x02 << 4)
 +#       define RADEON_DISP_TV_SOURCE_CRTC   (1 << 16) /* crtc1 or crtc2 */
 +#       define RADEON_DISP_TV_SOURCE_LTU    (0 << 16) /* linear transform unit */
 +#define RADEON_DISP_TV_OUT_CNTL             0x0d6c
 +#       define RADEON_DISP_TV_PATH_SRC_CRTC2 (1 << 16)
 +#       define RADEON_DISP_TV_PATH_SRC_CRTC1 (0 << 16)
 +#define RADEON_DAC_CRC_SIG                  0x02cc
 +#define RADEON_DAC_DATA                     0x03c9 /* VGA */
 +#define RADEON_DAC_MASK                     0x03c6 /* VGA */
 +#define RADEON_DAC_R_INDEX                  0x03c7 /* VGA */
 +#define RADEON_DAC_W_INDEX                  0x03c8 /* VGA */
 +#define RADEON_DDA_CONFIG                   0x02e0
 +#define RADEON_DDA_ON_OFF                   0x02e4
 +#define RADEON_DEFAULT_OFFSET               0x16e0
 +#define RADEON_DEFAULT_PITCH                0x16e4
 +#define RADEON_DEFAULT_SC_BOTTOM_RIGHT      0x16e8
 +#       define RADEON_DEFAULT_SC_RIGHT_MAX  (0x1fff <<  0)
 +#       define RADEON_DEFAULT_SC_BOTTOM_MAX (0x1fff << 16)
 +#define RADEON_DESTINATION_3D_CLR_CMP_VAL   0x1820
 +#define RADEON_DESTINATION_3D_CLR_CMP_MSK   0x1824
 +#define RADEON_DEVICE_ID                    0x0f02 /* PCI */
 +#define RADEON_DISP_MISC_CNTL               0x0d00
 +#       define RADEON_SOFT_RESET_GRPH_PP    (1 << 0)
 +#define RADEON_DISP_MERGE_CNTL                  0x0d60
 +#       define RADEON_DISP_ALPHA_MODE_MASK  0x03
 +#       define RADEON_DISP_ALPHA_MODE_KEY   0
 +#       define RADEON_DISP_ALPHA_MODE_PER_PIXEL 1
 +#       define RADEON_DISP_ALPHA_MODE_GLOBAL 2
 +#       define RADEON_DISP_RGB_OFFSET_EN    (1 << 8)
 +#       define RADEON_DISP_GRPH_ALPHA_MASK  (0xff << 16)
 +#       define RADEON_DISP_OV0_ALPHA_MASK   (0xff << 24)
 +#     define RADEON_DISP_LIN_TRANS_BYPASS (0x01 << 9)
 +#define RADEON_DISP2_MERGE_CNTL                   0x0d68
 +#       define RADEON_DISP2_RGB_OFFSET_EN   (1 << 8)
 +#define RADEON_DISP_LIN_TRANS_GRPH_A        0x0d80
 +#define RADEON_DISP_LIN_TRANS_GRPH_B        0x0d84
 +#define RADEON_DISP_LIN_TRANS_GRPH_C        0x0d88
 +#define RADEON_DISP_LIN_TRANS_GRPH_D        0x0d8c
 +#define RADEON_DISP_LIN_TRANS_GRPH_E        0x0d90
 +#define RADEON_DISP_LIN_TRANS_GRPH_F        0x0d98
 +#define RADEON_DP_BRUSH_BKGD_CLR            0x1478
 +#define RADEON_DP_BRUSH_FRGD_CLR            0x147c
 +#define RADEON_DP_CNTL                      0x16c0
 +#       define RADEON_DST_X_LEFT_TO_RIGHT   (1 <<  0)
 +#       define RADEON_DST_Y_TOP_TO_BOTTOM   (1 <<  1)
 +#       define RADEON_DP_DST_TILE_LINEAR    (0 <<  3)
 +#       define RADEON_DP_DST_TILE_MACRO     (1 <<  3)
 +#       define RADEON_DP_DST_TILE_MICRO     (2 <<  3)
 +#       define RADEON_DP_DST_TILE_BOTH      (3 <<  3)
 +#define RADEON_DP_CNTL_XDIR_YDIR_YMAJOR     0x16d0
 +#       define RADEON_DST_Y_MAJOR             (1 <<  2)
 +#       define RADEON_DST_Y_DIR_TOP_TO_BOTTOM (1 << 15)
 +#       define RADEON_DST_X_DIR_LEFT_TO_RIGHT (1 << 31)
 +#define RADEON_DP_DATATYPE                  0x16c4
 +#       define RADEON_HOST_BIG_ENDIAN_EN    (1 << 29)
 +#define RADEON_DP_GUI_MASTER_CNTL           0x146c
 +#       define RADEON_GMC_SRC_PITCH_OFFSET_CNTL   (1    <<  0)
 +#       define RADEON_GMC_DST_PITCH_OFFSET_CNTL   (1    <<  1)
 +#       define RADEON_GMC_SRC_CLIPPING            (1    <<  2)
 +#       define RADEON_GMC_DST_CLIPPING            (1    <<  3)
 +#       define RADEON_GMC_BRUSH_DATATYPE_MASK     (0x0f <<  4)
 +#       define RADEON_GMC_BRUSH_8X8_MONO_FG_BG    (0    <<  4)
 +#       define RADEON_GMC_BRUSH_8X8_MONO_FG_LA    (1    <<  4)
 +#       define RADEON_GMC_BRUSH_1X8_MONO_FG_BG    (4    <<  4)
 +#       define RADEON_GMC_BRUSH_1X8_MONO_FG_LA    (5    <<  4)
 +#       define RADEON_GMC_BRUSH_32x1_MONO_FG_BG   (6    <<  4)
 +#       define RADEON_GMC_BRUSH_32x1_MONO_FG_LA   (7    <<  4)
 +#       define RADEON_GMC_BRUSH_32x32_MONO_FG_BG  (8    <<  4)
 +#       define RADEON_GMC_BRUSH_32x32_MONO_FG_LA  (9    <<  4)
 +#       define RADEON_GMC_BRUSH_8x8_COLOR         (10   <<  4)
 +#       define RADEON_GMC_BRUSH_1X8_COLOR         (12   <<  4)
 +#       define RADEON_GMC_BRUSH_SOLID_COLOR       (13   <<  4)
 +#       define RADEON_GMC_BRUSH_NONE              (15   <<  4)
 +#       define RADEON_GMC_DST_8BPP_CI             (2    <<  8)
 +#       define RADEON_GMC_DST_15BPP               (3    <<  8)
 +#       define RADEON_GMC_DST_16BPP               (4    <<  8)
 +#       define RADEON_GMC_DST_24BPP               (5    <<  8)
 +#       define RADEON_GMC_DST_32BPP               (6    <<  8)
 +#       define RADEON_GMC_DST_8BPP_RGB            (7    <<  8)
 +#       define RADEON_GMC_DST_Y8                  (8    <<  8)
 +#       define RADEON_GMC_DST_RGB8                (9    <<  8)
 +#       define RADEON_GMC_DST_VYUY                (11   <<  8)
 +#       define RADEON_GMC_DST_YVYU                (12   <<  8)
 +#       define RADEON_GMC_DST_AYUV444             (14   <<  8)
 +#       define RADEON_GMC_DST_ARGB4444            (15   <<  8)
 +#       define RADEON_GMC_DST_DATATYPE_MASK       (0x0f <<  8)
 +#       define RADEON_GMC_DST_DATATYPE_SHIFT      8
 +#       define RADEON_GMC_SRC_DATATYPE_MASK       (3    << 12)
 +#       define RADEON_GMC_SRC_DATATYPE_MONO_FG_BG (0    << 12)
 +#       define RADEON_GMC_SRC_DATATYPE_MONO_FG_LA (1    << 12)
 +#       define RADEON_GMC_SRC_DATATYPE_COLOR      (3    << 12)
 +#       define RADEON_GMC_BYTE_PIX_ORDER          (1    << 14)
 +#       define RADEON_GMC_BYTE_MSB_TO_LSB         (0    << 14)
 +#       define RADEON_GMC_BYTE_LSB_TO_MSB         (1    << 14)
 +#       define RADEON_GMC_CONVERSION_TEMP         (1    << 15)
 +#       define RADEON_GMC_CONVERSION_TEMP_6500    (0    << 15)
 +#       define RADEON_GMC_CONVERSION_TEMP_9300    (1    << 15)
 +#       define RADEON_GMC_ROP3_MASK               (0xff << 16)
 +#       define RADEON_DP_SRC_SOURCE_MASK          (7    << 24)
 +#       define RADEON_DP_SRC_SOURCE_MEMORY        (2    << 24)
 +#       define RADEON_DP_SRC_SOURCE_HOST_DATA     (3    << 24)
 +#       define RADEON_GMC_3D_FCN_EN               (1    << 27)
 +#       define RADEON_GMC_CLR_CMP_CNTL_DIS        (1    << 28)
 +#       define RADEON_GMC_AUX_CLIP_DIS            (1    << 29)
 +#       define RADEON_GMC_WR_MSK_DIS              (1    << 30)
 +#       define RADEON_GMC_LD_BRUSH_Y_X            (1    << 31)
 +#       define RADEON_ROP3_ZERO             0x00000000
 +#       define RADEON_ROP3_DSa              0x00880000
 +#       define RADEON_ROP3_SDna             0x00440000
 +#       define RADEON_ROP3_S                0x00cc0000
 +#       define RADEON_ROP3_DSna             0x00220000
 +#       define RADEON_ROP3_D                0x00aa0000
 +#       define RADEON_ROP3_DSx              0x00660000
 +#       define RADEON_ROP3_DSo              0x00ee0000
 +#       define RADEON_ROP3_DSon             0x00110000
 +#       define RADEON_ROP3_DSxn             0x00990000
 +#       define RADEON_ROP3_Dn               0x00550000
 +#       define RADEON_ROP3_SDno             0x00dd0000
 +#       define RADEON_ROP3_Sn               0x00330000
 +#       define RADEON_ROP3_DSno             0x00bb0000
 +#       define RADEON_ROP3_DSan             0x00770000
 +#       define RADEON_ROP3_ONE              0x00ff0000
 +#       define RADEON_ROP3_DPa              0x00a00000
 +#       define RADEON_ROP3_PDna             0x00500000
 +#       define RADEON_ROP3_P                0x00f00000
 +#       define RADEON_ROP3_DPna             0x000a0000
 +#       define RADEON_ROP3_D                0x00aa0000
 +#       define RADEON_ROP3_DPx              0x005a0000
 +#       define RADEON_ROP3_DPo              0x00fa0000
 +#       define RADEON_ROP3_DPon             0x00050000
 +#       define RADEON_ROP3_PDxn             0x00a50000
 +#       define RADEON_ROP3_PDno             0x00f50000
 +#       define RADEON_ROP3_Pn               0x000f0000
 +#       define RADEON_ROP3_DPno             0x00af0000
 +#       define RADEON_ROP3_DPan             0x005f0000
 +#define RADEON_DP_GUI_MASTER_CNTL_C         0x1c84
 +#define RADEON_DP_MIX                       0x16c8
 +#define RADEON_DP_SRC_BKGD_CLR              0x15dc
 +#define RADEON_DP_SRC_FRGD_CLR              0x15d8
 +#define RADEON_DP_WRITE_MASK                0x16cc
 +#define RADEON_DST_BRES_DEC                 0x1630
 +#define RADEON_DST_BRES_ERR                 0x1628
 +#define RADEON_DST_BRES_INC                 0x162c
 +#define RADEON_DST_BRES_LNTH                0x1634
 +#define RADEON_DST_BRES_LNTH_SUB            0x1638
 +#define RADEON_DST_HEIGHT                   0x1410
 +#define RADEON_DST_HEIGHT_WIDTH             0x143c
 +#define RADEON_DST_HEIGHT_WIDTH_8           0x158c
 +#define RADEON_DST_HEIGHT_WIDTH_BW          0x15b4
 +#define RADEON_DST_HEIGHT_Y                 0x15a0
 +#define RADEON_DST_LINE_START               0x1600
 +#define RADEON_DST_LINE_END                 0x1604
 +#define RADEON_DST_LINE_PATCOUNT            0x1608
 +#       define RADEON_BRES_CNTL_SHIFT       8
 +#define RADEON_DST_OFFSET                   0x1404
 +#define RADEON_DST_PITCH                    0x1408
 +#define RADEON_DST_PITCH_OFFSET             0x142c
 +#define RADEON_DST_PITCH_OFFSET_C           0x1c80
 +#       define RADEON_PITCH_SHIFT           21
 +#       define RADEON_DST_TILE_LINEAR       (0 << 30)
 +#       define RADEON_DST_TILE_MACRO        (1 << 30)
 +#       define RADEON_DST_TILE_MICRO        (2 << 30)
 +#       define RADEON_DST_TILE_BOTH         (3 << 30)
 +#define RADEON_DST_WIDTH                    0x140c
 +#define RADEON_DST_WIDTH_HEIGHT             0x1598
 +#define RADEON_DST_WIDTH_X                  0x1588
 +#define RADEON_DST_WIDTH_X_INCY             0x159c
 +#define RADEON_DST_X                        0x141c
 +#define RADEON_DST_X_SUB                    0x15a4
 +#define RADEON_DST_X_Y                      0x1594
 +#define RADEON_DST_Y                        0x1420
 +#define RADEON_DST_Y_SUB                    0x15a8
 +#define RADEON_DST_Y_X                      0x1438
 +
 +#define RADEON_FCP_CNTL                     0x0910
 +#      define RADEON_FCP0_SRC_PCICLK             0
 +#      define RADEON_FCP0_SRC_PCLK               1
 +#      define RADEON_FCP0_SRC_PCLKb              2
 +#      define RADEON_FCP0_SRC_HREF               3
 +#      define RADEON_FCP0_SRC_GND                4
 +#      define RADEON_FCP0_SRC_HREFb              5
 +#define RADEON_FLUSH_1                      0x1704
 +#define RADEON_FLUSH_2                      0x1708
 +#define RADEON_FLUSH_3                      0x170c
 +#define RADEON_FLUSH_4                      0x1710
 +#define RADEON_FLUSH_5                      0x1714
 +#define RADEON_FLUSH_6                      0x1718
 +#define RADEON_FLUSH_7                      0x171c
 +#define RADEON_FOG_3D_TABLE_START           0x1810
 +#define RADEON_FOG_3D_TABLE_END             0x1814
 +#define RADEON_FOG_3D_TABLE_DENSITY         0x181c
 +#define RADEON_FOG_TABLE_INDEX              0x1a14
 +#define RADEON_FOG_TABLE_DATA               0x1a18
 +#define RADEON_FP_CRTC_H_TOTAL_DISP         0x0250
 +#define RADEON_FP_CRTC_V_TOTAL_DISP         0x0254
 +#       define RADEON_FP_CRTC_H_TOTAL_MASK      0x000003ff
 +#       define RADEON_FP_CRTC_H_DISP_MASK       0x01ff0000
 +#       define RADEON_FP_CRTC_V_TOTAL_MASK      0x00000fff
 +#       define RADEON_FP_CRTC_V_DISP_MASK       0x0fff0000
 +#       define RADEON_FP_H_SYNC_STRT_CHAR_MASK  0x00001ff8
 +#       define RADEON_FP_H_SYNC_WID_MASK        0x003f0000
 +#       define RADEON_FP_V_SYNC_STRT_MASK       0x00000fff
 +#       define RADEON_FP_V_SYNC_WID_MASK        0x001f0000
 +#       define RADEON_FP_CRTC_H_TOTAL_SHIFT     0x00000000
 +#       define RADEON_FP_CRTC_H_DISP_SHIFT      0x00000010
 +#       define RADEON_FP_CRTC_V_TOTAL_SHIFT     0x00000000
 +#       define RADEON_FP_CRTC_V_DISP_SHIFT      0x00000010
 +#       define RADEON_FP_H_SYNC_STRT_CHAR_SHIFT 0x00000003
 +#       define RADEON_FP_H_SYNC_WID_SHIFT       0x00000010
 +#       define RADEON_FP_V_SYNC_STRT_SHIFT      0x00000000
 +#       define RADEON_FP_V_SYNC_WID_SHIFT       0x00000010
 +#define RADEON_FP_GEN_CNTL                  0x0284
 +#       define RADEON_FP_FPON                  (1 <<  0)
 +#       define RADEON_FP_BLANK_EN              (1 <<  1)
 +#       define RADEON_FP_TMDS_EN               (1 <<  2)
 +#       define RADEON_FP_PANEL_FORMAT          (1 <<  3)
 +#       define RADEON_FP_EN_TMDS               (1 <<  7)
 +#       define RADEON_FP_DETECT_SENSE          (1 <<  8)
 +#       define R200_FP_SOURCE_SEL_MASK         (3 <<  10)
 +#       define R200_FP_SOURCE_SEL_CRTC1        (0 <<  10)
 +#       define R200_FP_SOURCE_SEL_CRTC2        (1 <<  10)
 +#       define R200_FP_SOURCE_SEL_RMX          (2 <<  10)
 +#       define R200_FP_SOURCE_SEL_TRANS        (3 <<  10)
 +#       define RADEON_FP_SEL_CRTC1             (0 << 13)
 +#       define RADEON_FP_SEL_CRTC2             (1 << 13)
 +#       define RADEON_FP_CRTC_DONT_SHADOW_HPAR (1 << 15)
 +#       define RADEON_FP_CRTC_DONT_SHADOW_VPAR (1 << 16)
 +#       define RADEON_FP_CRTC_DONT_SHADOW_HEND (1 << 17)
 +#       define RADEON_FP_CRTC_USE_SHADOW_VEND  (1 << 18)
 +#       define RADEON_FP_RMX_HVSYNC_CONTROL_EN (1 << 20)
 +#       define RADEON_FP_DFP_SYNC_SEL          (1 << 21)
 +#       define RADEON_FP_CRTC_LOCK_8DOT        (1 << 22)
 +#       define RADEON_FP_CRT_SYNC_SEL          (1 << 23)
 +#       define RADEON_FP_USE_SHADOW_EN         (1 << 24)
 +#       define RADEON_FP_CRT_SYNC_ALT          (1 << 26)
 +#define RADEON_FP2_GEN_CNTL                 0x0288
 +#       define RADEON_FP2_BLANK_EN             (1 <<  1)
 +#       define RADEON_FP2_ON                   (1 <<  2)
 +#       define RADEON_FP2_PANEL_FORMAT         (1 <<  3)
 +#       define RADEON_FP2_DETECT_SENSE         (1 <<  8)
 +#       define R200_FP2_SOURCE_SEL_MASK        (3 << 10)
 +#       define R200_FP2_SOURCE_SEL_CRTC1       (0 << 10)
 +#       define R200_FP2_SOURCE_SEL_CRTC2       (1 << 10)
 +#       define R200_FP2_SOURCE_SEL_RMX         (2 << 10)
 +#       define R200_FP2_SOURCE_SEL_TRANS_UNIT  (3 << 10)
 +#       define RADEON_FP2_SRC_SEL_MASK         (3 << 13)
 +#       define RADEON_FP2_SRC_SEL_CRTC2        (1 << 13)
 +#       define RADEON_FP2_FP_POL               (1 << 16)
 +#       define RADEON_FP2_LP_POL               (1 << 17)
 +#       define RADEON_FP2_SCK_POL              (1 << 18)
 +#       define RADEON_FP2_LCD_CNTL_MASK        (7 << 19)
 +#       define RADEON_FP2_PAD_FLOP_EN          (1 << 22)
 +#       define RADEON_FP2_CRC_EN               (1 << 23)
 +#       define RADEON_FP2_CRC_READ_EN          (1 << 24)
 +#       define RADEON_FP2_DVO_EN               (1 << 25)
 +#       define RADEON_FP2_DVO_RATE_SEL_SDR     (1 << 26)
 +#       define R200_FP2_DVO_RATE_SEL_SDR       (1 << 27)
 +#       define R300_FP2_DVO_CLOCK_MODE_SINGLE  (1 << 28)
 +#       define R300_FP2_DVO_DUAL_CHANNEL_EN    (1 << 29)
 +#define RADEON_FP_H_SYNC_STRT_WID           0x02c4
 +#define RADEON_FP_H2_SYNC_STRT_WID          0x03c4
 +#define RADEON_FP_HORZ_STRETCH              0x028c
 +#define RADEON_FP_HORZ2_STRETCH             0x038c
 +#       define RADEON_HORZ_STRETCH_RATIO_MASK 0xffff
 +#       define RADEON_HORZ_STRETCH_RATIO_MAX  4096
 +#       define RADEON_HORZ_PANEL_SIZE         (0x1ff   << 16)
 +#       define RADEON_HORZ_PANEL_SHIFT        16
 +#       define RADEON_HORZ_STRETCH_PIXREP     (0      << 25)
 +#       define RADEON_HORZ_STRETCH_BLEND      (1      << 26)
 +#       define RADEON_HORZ_STRETCH_ENABLE     (1      << 25)
 +#       define RADEON_HORZ_AUTO_RATIO         (1      << 27)
 +#       define RADEON_HORZ_FP_LOOP_STRETCH    (0x7    << 28)
 +#       define RADEON_HORZ_AUTO_RATIO_INC     (1      << 31)
 +#define RADEON_FP_HORZ_VERT_ACTIVE          0x0278
 +#define RADEON_FP_V_SYNC_STRT_WID           0x02c8
 +#define RADEON_FP_VERT_STRETCH              0x0290
 +#define RADEON_FP_V2_SYNC_STRT_WID          0x03c8
 +#define RADEON_FP_VERT2_STRETCH             0x0390
 +#       define RADEON_VERT_PANEL_SIZE          (0xfff << 12)
 +#       define RADEON_VERT_PANEL_SHIFT         12
 +#       define RADEON_VERT_STRETCH_RATIO_MASK  0xfff
 +#       define RADEON_VERT_STRETCH_RATIO_SHIFT 0
 +#       define RADEON_VERT_STRETCH_RATIO_MAX   4096
 +#       define RADEON_VERT_STRETCH_ENABLE      (1     << 25)
 +#       define RADEON_VERT_STRETCH_LINEREP     (0     << 26)
 +#       define RADEON_VERT_STRETCH_BLEND       (1     << 26)
 +#       define RADEON_VERT_AUTO_RATIO_EN       (1     << 27)
 +#     define RADEON_VERT_AUTO_RATIO_INC      (1     << 31)
 +#       define RADEON_VERT_STRETCH_RESERVED    0x71000000
 +#define RS400_FP_2ND_GEN_CNTL               0x0384
 +#       define RS400_FP_2ND_ON              (1 << 0)
 +#       define RS400_FP_2ND_BLANK_EN        (1 << 1)
 +#       define RS400_TMDS_2ND_EN            (1 << 2)
 +#       define RS400_PANEL_FORMAT_2ND       (1 << 3)
 +#       define RS400_FP_2ND_EN_TMDS         (1 << 7)
 +#       define RS400_FP_2ND_DETECT_SENSE    (1 << 8)
 +#       define RS400_FP_2ND_SOURCE_SEL_MASK        (3 << 10)
 +#       define RS400_FP_2ND_SOURCE_SEL_CRTC1       (0 << 10)
 +#       define RS400_FP_2ND_SOURCE_SEL_CRTC2       (1 << 10)
 +#       define RS400_FP_2ND_SOURCE_SEL_RMX         (2 << 10)
 +#       define RS400_FP_2ND_DETECT_EN       (1 << 12)
 +#       define RS400_HPD_2ND_SEL            (1 << 13)
 +#define RS400_FP2_2_GEN_CNTL                0x0388
 +#       define RS400_FP2_2_BLANK_EN         (1 << 1)
 +#       define RS400_FP2_2_ON               (1 << 2)
 +#       define RS400_FP2_2_PANEL_FORMAT     (1 << 3)
 +#       define RS400_FP2_2_DETECT_SENSE     (1 << 8)
 +#       define RS400_FP2_2_SOURCE_SEL_MASK        (3 << 10)
 +#       define RS400_FP2_2_SOURCE_SEL_CRTC1       (0 << 10)
 +#       define RS400_FP2_2_SOURCE_SEL_CRTC2       (1 << 10)
 +#       define RS400_FP2_2_SOURCE_SEL_RMX         (2 << 10)
 +#       define RS400_FP2_2_DVO2_EN          (1 << 25)
 +#define RS400_TMDS2_CNTL                    0x0394
 +#define RS400_TMDS2_TRANSMITTER_CNTL        0x03a4
 +#       define RS400_TMDS2_PLLEN            (1 << 0)
 +#       define RS400_TMDS2_PLLRST           (1 << 1)
 +
 +#define RADEON_GEN_INT_CNTL                 0x0040
 +#define RADEON_GEN_INT_STATUS               0x0044
 +#       define RADEON_VSYNC_INT_AK          (1 <<  2)
 +#       define RADEON_VSYNC_INT             (1 <<  2)
 +#       define RADEON_VSYNC2_INT_AK         (1 <<  6)
 +#       define RADEON_VSYNC2_INT            (1 <<  6)
 +#define RADEON_GENENB                       0x03c3 /* VGA */
 +#define RADEON_GENFC_RD                     0x03ca /* VGA */
 +#define RADEON_GENFC_WT                     0x03da /* VGA, 0x03ba */
 +#define RADEON_GENMO_RD                     0x03cc /* VGA */
 +#define RADEON_GENMO_WT                     0x03c2 /* VGA */
 +#define RADEON_GENS0                        0x03c2 /* VGA */
 +#define RADEON_GENS1                        0x03da /* VGA, 0x03ba */
 +#define RADEON_GPIO_MONID                   0x0068 /* DDC interface via I2C */
 +#define RADEON_GPIO_MONIDB                  0x006c
 +#define RADEON_GPIO_CRT2_DDC                0x006c
 +#define RADEON_GPIO_DVI_DDC                 0x0064
 +#define RADEON_GPIO_VGA_DDC                 0x0060
 +#       define RADEON_GPIO_A_0              (1 <<  0)
 +#       define RADEON_GPIO_A_1              (1 <<  1)
 +#       define RADEON_GPIO_Y_0              (1 <<  8)
 +#       define RADEON_GPIO_Y_1              (1 <<  9)
 +#       define RADEON_GPIO_Y_SHIFT_0        8
 +#       define RADEON_GPIO_Y_SHIFT_1        9
 +#       define RADEON_GPIO_EN_0             (1 << 16)
 +#       define RADEON_GPIO_EN_1             (1 << 17)
 +#       define RADEON_GPIO_MASK_0           (1 << 24) /*??*/
 +#       define RADEON_GPIO_MASK_1           (1 << 25) /*??*/
 +#define RADEON_GRPH8_DATA                   0x03cf /* VGA */
 +#define RADEON_GRPH8_IDX                    0x03ce /* VGA */
 +#define RADEON_GUI_SCRATCH_REG0             0x15e0
 +#define RADEON_GUI_SCRATCH_REG1             0x15e4
 +#define RADEON_GUI_SCRATCH_REG2             0x15e8
 +#define RADEON_GUI_SCRATCH_REG3             0x15ec
 +#define RADEON_GUI_SCRATCH_REG4             0x15f0
 +#define RADEON_GUI_SCRATCH_REG5             0x15f4
 +
 +#define RADEON_HEADER                       0x0f0e /* PCI */
 +#define RADEON_HOST_DATA0                   0x17c0
 +#define RADEON_HOST_DATA1                   0x17c4
 +#define RADEON_HOST_DATA2                   0x17c8
 +#define RADEON_HOST_DATA3                   0x17cc
 +#define RADEON_HOST_DATA4                   0x17d0
 +#define RADEON_HOST_DATA5                   0x17d4
 +#define RADEON_HOST_DATA6                   0x17d8
 +#define RADEON_HOST_DATA7                   0x17dc
 +#define RADEON_HOST_DATA_LAST               0x17e0
 +#define RADEON_HOST_PATH_CNTL               0x0130
 +#       define RADEON_HDP_SOFT_RESET        (1 << 26)
 +#       define RADEON_HDP_APER_CNTL         (1 << 23)
 +#define RADEON_HTOTAL_CNTL                  0x0009 /* PLL */
 +#       define RADEON_HTOT_CNTL_VGA_EN      (1 << 28)
 +#define RADEON_HTOTAL2_CNTL                 0x002e /* PLL */
 +
 +       /* Multimedia I2C bus */
 +#define RADEON_I2C_CNTL_0                 0x0090
 +#define RADEON_I2C_DONE (1<<0)
 +#define RADEON_I2C_NACK (1<<1)
 +#define RADEON_I2C_HALT (1<<2)
 +#define RADEON_I2C_SOFT_RST (1<<5)
 +#define RADEON_I2C_DRIVE_EN (1<<6)
 +#define RADEON_I2C_DRIVE_SEL (1<<7)
 +#define RADEON_I2C_START (1<<8)
 +#define RADEON_I2C_STOP (1<<9)
 +#define RADEON_I2C_RECEIVE (1<<10)
 +#define RADEON_I2C_ABORT (1<<11)
 +#define RADEON_I2C_GO (1<<12)
 +#define RADEON_I2C_CNTL_1                   0x0094
 +#define RADEON_I2C_SEL         (1<<16)
 +#define RADEON_I2C_EN          (1<<17)
 +#define RADEON_I2C_DATA                           0x0098
 +
 +#define RADEON_DVI_I2C_CNTL_0             0x02e0
 +#define RADEON_DVI_I2C_CNTL_1               0x02e4 /* ? */
 +#define RADEON_DVI_I2C_DATA               0x02e8
 +
 +#define RADEON_INTERRUPT_LINE               0x0f3c /* PCI */
 +#define RADEON_INTERRUPT_PIN                0x0f3d /* PCI */
 +#define RADEON_IO_BASE                      0x0f14 /* PCI */
 +
 +#define RADEON_LATENCY                      0x0f0d /* PCI */
 +#define RADEON_LEAD_BRES_DEC                0x1608
 +#define RADEON_LEAD_BRES_LNTH               0x161c
 +#define RADEON_LEAD_BRES_LNTH_SUB           0x1624
 +#define RADEON_LVDS_GEN_CNTL                0x02d0
 +#       define RADEON_LVDS_ON               (1   <<  0)
 +#       define RADEON_LVDS_DISPLAY_DIS      (1   <<  1)
 +#       define RADEON_LVDS_PANEL_TYPE       (1   <<  2)
 +#       define RADEON_LVDS_PANEL_FORMAT     (1   <<  3)
 +#       define RADEON_LVDS_RST_FM           (1   <<  6)
 +#       define RADEON_LVDS_EN               (1   <<  7)
 +#       define RADEON_LVDS_BL_MOD_LEVEL_SHIFT 8
 +#       define RADEON_LVDS_BL_MOD_LEVEL_MASK (0xff << 8)
 +#       define RADEON_LVDS_BL_MOD_EN        (1   << 16)
 +#       define RADEON_LVDS_DIGON            (1   << 18)
 +#       define RADEON_LVDS_BLON             (1   << 19)
 +#       define RADEON_LVDS_SEL_CRTC2        (1   << 23)
 +#define RADEON_LVDS_PLL_CNTL                0x02d4
 +#       define RADEON_HSYNC_DELAY_SHIFT     28
 +#       define RADEON_HSYNC_DELAY_MASK      (0xf << 28)
 +#       define RADEON_LVDS_PLL_EN           (1   << 16)
 +#       define RADEON_LVDS_PLL_RESET        (1   << 17)
 +#       define R300_LVDS_SRC_SEL_MASK       (3   << 18)
 +#       define R300_LVDS_SRC_SEL_CRTC1      (0   << 18)
 +#       define R300_LVDS_SRC_SEL_CRTC2      (1   << 18)
 +#       define R300_LVDS_SRC_SEL_RMX        (2   << 18)
 +
 +#define RADEON_MAX_LATENCY                  0x0f3f /* PCI */
 +#define RADEON_MC_AGP_LOCATION              0x014c
 +#define RADEON_MC_FB_LOCATION               0x0148
 +#define RADEON_DISPLAY_BASE_ADDR            0x23c
 +#define RADEON_DISPLAY2_BASE_ADDR           0x33c
 +#define RADEON_OV0_BASE_ADDR                0x43c
 +#define RADEON_NB_TOM                       0x15c
 +#define R300_MC_INIT_MISC_LAT_TIMER         0x180
 +#define RADEON_MCLK_CNTL                    0x0012 /* PLL */
 +#       define RADEON_FORCEON_MCLKA         (1 << 16)
 +#       define RADEON_FORCEON_MCLKB         (1 << 17)
 +#       define RADEON_FORCEON_YCLKA         (1 << 18)
 +#       define RADEON_FORCEON_YCLKB         (1 << 19)
 +#       define RADEON_FORCEON_MC            (1 << 20)
 +#       define RADEON_FORCEON_AIC           (1 << 21)
 +#       define R300_DISABLE_MC_MCLKA        (1 << 21)
 +#       define R300_DISABLE_MC_MCLKB        (1 << 21)
 +#define RADEON_MCLK_MISC                    0x001f /* PLL */
 +#       define RADEON_MC_MCLK_MAX_DYN_STOP_LAT (1 << 12)
 +#       define RADEON_IO_MCLK_MAX_DYN_STOP_LAT (1 << 13)
 +#       define RADEON_MC_MCLK_DYN_ENABLE    (1 << 14)
 +#       define RADEON_IO_MCLK_DYN_ENABLE    (1 << 15)
 +#define RADEON_LCD_GPIO_MASK                0x01a0
 +#define RADEON_GPIOPAD_EN                   0x01a0
 +#define RADEON_LCD_GPIO_Y_REG               0x01a4
 +#define RADEON_MDGPIO_A_REG                 0x01ac
 +#define RADEON_MDGPIO_EN_REG                0x01b0
 +#define RADEON_MDGPIO_MASK                  0x0198
 +#define RADEON_GPIOPAD_MASK                 0x0198
 +#define RADEON_GPIOPAD_A                  0x019c
 +#define RADEON_MDGPIO_Y_REG                 0x01b4
 +#define RADEON_MEM_ADDR_CONFIG              0x0148
 +#define RADEON_MEM_BASE                     0x0f10 /* PCI */
 +#define RADEON_MEM_CNTL                     0x0140
 +#       define RADEON_MEM_NUM_CHANNELS_MASK 0x01
 +#       define RADEON_MEM_USE_B_CH_ONLY     (1 <<  1)
 +#       define RV100_HALF_MODE              (1 <<  3)
 +#       define R300_MEM_NUM_CHANNELS_MASK   0x03
 +#       define R300_MEM_USE_CD_CH_ONLY      (1 <<  2)
 +#define RADEON_MEM_TIMING_CNTL              0x0144 /* EXT_MEM_CNTL */
 +#define RADEON_MEM_INIT_LAT_TIMER           0x0154
 +#define RADEON_MEM_INTF_CNTL                0x014c
 +#define RADEON_MEM_SDRAM_MODE_REG           0x0158
 +#       define RADEON_SDRAM_MODE_MASK       0xffff0000
 +#       define RADEON_B3MEM_RESET_MASK      0x6fffffff
 +#       define RADEON_MEM_CFG_TYPE_DDR      (1 << 30)
 +#define RADEON_MEM_STR_CNTL                 0x0150
 +#       define RADEON_MEM_PWRUP_COMPL_A     (1 <<  0)
 +#       define RADEON_MEM_PWRUP_COMPL_B     (1 <<  1)
 +#       define R300_MEM_PWRUP_COMPL_C       (1 <<  2)
 +#       define R300_MEM_PWRUP_COMPL_D       (1 <<  3)
 +#       define RADEON_MEM_PWRUP_COMPLETE    0x03
 +#       define R300_MEM_PWRUP_COMPLETE      0x0f
 +#define RADEON_MC_STATUS                    0x0150
 +#       define RADEON_MC_IDLE               (1 << 2)
 +#       define R300_MC_IDLE                 (1 << 4)
 +#define RADEON_MEM_VGA_RP_SEL               0x003c
 +#define RADEON_MEM_VGA_WP_SEL               0x0038
 +#define RADEON_MIN_GRANT                    0x0f3e /* PCI */
 +#define RADEON_MM_DATA                      0x0004
 +#define RADEON_MM_INDEX                     0x0000
 +#define RADEON_MPLL_CNTL                    0x000e /* PLL */
 +#define RADEON_MPP_TB_CONFIG                0x01c0 /* ? */
 +#define RADEON_MPP_GP_CONFIG                0x01c8 /* ? */
 +#define RADEON_SEPROM_CNTL1                 0x01c0
 +#       define RADEON_SCK_PRESCALE_SHIFT    24
 +#       define RADEON_SCK_PRESCALE_MASK     (0xff << 24)
 +#define R300_MC_IND_INDEX                   0x01f8
 +#       define R300_MC_IND_ADDR_MASK        0x3f
 +#       define R300_MC_IND_WR_EN            (1 << 8)
 +#define R300_MC_IND_DATA                    0x01fc
 +#define R300_MC_READ_CNTL_AB                0x017c
 +#       define R300_MEM_RBS_POSITION_A_MASK 0x03
 +#define R300_MC_READ_CNTL_CD_mcind        0x24
 +#       define R300_MEM_RBS_POSITION_C_MASK 0x03
 +
 +#define RADEON_N_VIF_COUNT                  0x0248
 +
 +#define RADEON_OV0_AUTO_FLIP_CNTL           0x0470
 +#       define  RADEON_OV0_AUTO_FLIP_CNTL_SOFT_BUF_NUM        0x00000007
 +#       define  RADEON_OV0_AUTO_FLIP_CNTL_SOFT_REPEAT_FIELD   0x00000008
 +#       define  RADEON_OV0_AUTO_FLIP_CNTL_SOFT_BUF_ODD        0x00000010
 +#       define  RADEON_OV0_AUTO_FLIP_CNTL_IGNORE_REPEAT_FIELD 0x00000020
 +#       define  RADEON_OV0_AUTO_FLIP_CNTL_SOFT_EOF_TOGGLE     0x00000040
 +#       define  RADEON_OV0_AUTO_FLIP_CNTL_VID_PORT_SELECT     0x00000300
 +#       define  RADEON_OV0_AUTO_FLIP_CNTL_P1_FIRST_LINE_EVEN  0x00010000
 +#       define  RADEON_OV0_AUTO_FLIP_CNTL_SHIFT_EVEN_DOWN     0x00040000
 +#       define  RADEON_OV0_AUTO_FLIP_CNTL_SHIFT_ODD_DOWN      0x00080000
 +#       define  RADEON_OV0_AUTO_FLIP_CNTL_FIELD_POL_SOURCE    0x00800000
 +
 +#define RADEON_OV0_COLOUR_CNTL              0x04E0
 +#define RADEON_OV0_DEINTERLACE_PATTERN      0x0474
 +#define RADEON_OV0_EXCLUSIVE_HORZ           0x0408
 +#       define  RADEON_EXCL_HORZ_START_MASK        0x000000ff
 +#       define  RADEON_EXCL_HORZ_END_MASK          0x0000ff00
 +#       define  RADEON_EXCL_HORZ_BACK_PORCH_MASK   0x00ff0000
 +#       define  RADEON_EXCL_HORZ_EXCLUSIVE_EN      0x80000000
 +#define RADEON_OV0_EXCLUSIVE_VERT           0x040C
 +#       define  RADEON_EXCL_VERT_START_MASK        0x000003ff
 +#       define  RADEON_EXCL_VERT_END_MASK          0x03ff0000
 +#define RADEON_OV0_FILTER_CNTL              0x04A0
 +#       define RADEON_FILTER_PROGRAMMABLE_COEF            0x0
 +#       define RADEON_FILTER_HC_COEF_HORZ_Y               0x1
 +#       define RADEON_FILTER_HC_COEF_HORZ_UV              0x2
 +#       define RADEON_FILTER_HC_COEF_VERT_Y               0x4
 +#       define RADEON_FILTER_HC_COEF_VERT_UV              0x8
 +#       define RADEON_FILTER_HARDCODED_COEF               0xf
 +#       define RADEON_FILTER_COEF_MASK                    0xf
 +
 +#define RADEON_OV0_FOUR_TAP_COEF_0          0x04B0
 +#define RADEON_OV0_FOUR_TAP_COEF_1          0x04B4
 +#define RADEON_OV0_FOUR_TAP_COEF_2          0x04B8
 +#define RADEON_OV0_FOUR_TAP_COEF_3          0x04BC
 +#define RADEON_OV0_FOUR_TAP_COEF_4          0x04C0
 +#define RADEON_OV0_FLAG_CNTL                0x04DC
 +#define RADEON_OV0_GAMMA_000_00F            0x0d40
 +#define RADEON_OV0_GAMMA_010_01F            0x0d44
 +#define RADEON_OV0_GAMMA_020_03F            0x0d48
 +#define RADEON_OV0_GAMMA_040_07F            0x0d4c
 +#define RADEON_OV0_GAMMA_080_0BF            0x0e00
 +#define RADEON_OV0_GAMMA_0C0_0FF            0x0e04
 +#define RADEON_OV0_GAMMA_100_13F            0x0e08
 +#define RADEON_OV0_GAMMA_140_17F            0x0e0c
 +#define RADEON_OV0_GAMMA_180_1BF            0x0e10
 +#define RADEON_OV0_GAMMA_1C0_1FF            0x0e14
 +#define RADEON_OV0_GAMMA_200_23F            0x0e18
 +#define RADEON_OV0_GAMMA_240_27F            0x0e1c
 +#define RADEON_OV0_GAMMA_280_2BF            0x0e20
 +#define RADEON_OV0_GAMMA_2C0_2FF            0x0e24
 +#define RADEON_OV0_GAMMA_300_33F            0x0e28
 +#define RADEON_OV0_GAMMA_340_37F            0x0e2c
 +#define RADEON_OV0_GAMMA_380_3BF            0x0d50
 +#define RADEON_OV0_GAMMA_3C0_3FF            0x0d54
 +#define RADEON_OV0_GRAPHICS_KEY_CLR_LOW     0x04EC
 +#define RADEON_OV0_GRAPHICS_KEY_CLR_HIGH    0x04F0
 +#define RADEON_OV0_H_INC                    0x0480
 +#define RADEON_OV0_KEY_CNTL                 0x04F4
 +#       define  RADEON_VIDEO_KEY_FN_MASK    0x00000003L
 +#       define  RADEON_VIDEO_KEY_FN_FALSE   0x00000000L
 +#       define  RADEON_VIDEO_KEY_FN_TRUE    0x00000001L
 +#       define  RADEON_VIDEO_KEY_FN_EQ      0x00000002L
 +#       define  RADEON_VIDEO_KEY_FN_NE      0x00000003L
 +#       define  RADEON_GRAPHIC_KEY_FN_MASK  0x00000030L
 +#       define  RADEON_GRAPHIC_KEY_FN_FALSE 0x00000000L
 +#       define  RADEON_GRAPHIC_KEY_FN_TRUE  0x00000010L
 +#       define  RADEON_GRAPHIC_KEY_FN_EQ    0x00000020L
 +#       define  RADEON_GRAPHIC_KEY_FN_NE    0x00000030L
 +#       define  RADEON_CMP_MIX_MASK         0x00000100L
 +#       define  RADEON_CMP_MIX_OR           0x00000000L
 +#       define  RADEON_CMP_MIX_AND          0x00000100L
 +#define RADEON_OV0_LIN_TRANS_A              0x0d20
 +#define RADEON_OV0_LIN_TRANS_B              0x0d24
 +#define RADEON_OV0_LIN_TRANS_C              0x0d28
 +#define RADEON_OV0_LIN_TRANS_D              0x0d2c
 +#define RADEON_OV0_LIN_TRANS_E              0x0d30
 +#define RADEON_OV0_LIN_TRANS_F              0x0d34
 +#define RADEON_OV0_P1_BLANK_LINES_AT_TOP    0x0430
 +#       define  RADEON_P1_BLNK_LN_AT_TOP_M1_MASK   0x00000fffL
 +#       define  RADEON_P1_ACTIVE_LINES_M1          0x0fff0000L
 +#define RADEON_OV0_P1_H_ACCUM_INIT          0x0488
 +#define RADEON_OV0_P1_V_ACCUM_INIT          0x0428
 +#       define  RADEON_OV0_P1_MAX_LN_IN_PER_LN_OUT 0x00000003L
 +#       define  RADEON_OV0_P1_V_ACCUM_INIT_MASK    0x01ff8000L
 +#define RADEON_OV0_P1_X_START_END           0x0494
 +#define RADEON_OV0_P2_X_START_END           0x0498
 +#define RADEON_OV0_P23_BLANK_LINES_AT_TOP   0x0434
 +#       define  RADEON_P23_BLNK_LN_AT_TOP_M1_MASK  0x000007ffL
 +#       define  RADEON_P23_ACTIVE_LINES_M1         0x07ff0000L
 +#define RADEON_OV0_P23_H_ACCUM_INIT         0x048C
 +#define RADEON_OV0_P23_V_ACCUM_INIT         0x042C
 +#define RADEON_OV0_P3_X_START_END           0x049C
 +#define RADEON_OV0_REG_LOAD_CNTL            0x0410
 +#       define  RADEON_REG_LD_CTL_LOCK                 0x00000001L
 +#       define  RADEON_REG_LD_CTL_VBLANK_DURING_LOCK   0x00000002L
 +#       define  RADEON_REG_LD_CTL_STALL_GUI_UNTIL_FLIP 0x00000004L
 +#       define  RADEON_REG_LD_CTL_LOCK_READBACK        0x00000008L
 +#       define  RADEON_REG_LD_CTL_FLIP_READBACK        0x00000010L
 +#define RADEON_OV0_SCALE_CNTL               0x0420
 +#       define  RADEON_SCALER_HORZ_PICK_NEAREST    0x00000004L
 +#       define  RADEON_SCALER_VERT_PICK_NEAREST    0x00000008L
 +#       define  RADEON_SCALER_SIGNED_UV            0x00000010L
 +#       define  RADEON_SCALER_GAMMA_SEL_MASK       0x00000060L
 +#       define  RADEON_SCALER_GAMMA_SEL_BRIGHT     0x00000000L
 +#       define  RADEON_SCALER_GAMMA_SEL_G22        0x00000020L
 +#       define  RADEON_SCALER_GAMMA_SEL_G18        0x00000040L
 +#       define  RADEON_SCALER_GAMMA_SEL_G14        0x00000060L
 +#       define  RADEON_SCALER_COMCORE_SHIFT_UP_ONE 0x00000080L
 +#       define  RADEON_SCALER_SURFAC_FORMAT        0x00000f00L
 +#       define  RADEON_SCALER_SOURCE_15BPP         0x00000300L
 +#       define  RADEON_SCALER_SOURCE_16BPP         0x00000400L
 +#       define  RADEON_SCALER_SOURCE_32BPP         0x00000600L
 +#       define  RADEON_SCALER_SOURCE_YUV9          0x00000900L
 +#       define  RADEON_SCALER_SOURCE_YUV12         0x00000A00L
 +#       define  RADEON_SCALER_SOURCE_VYUY422       0x00000B00L
 +#       define  RADEON_SCALER_SOURCE_YVYU422       0x00000C00L
 +#       define  RADEON_SCALER_ADAPTIVE_DEINT       0x00001000L
 +#       define  RADEON_SCALER_TEMPORAL_DEINT       0x00002000L
 +#       define  RADEON_SCALER_CRTC_SEL             0x00004000L
 +#       define  RADEON_SCALER_SMART_SWITCH         0x00008000L
 +#       define  RADEON_SCALER_BURST_PER_PLANE      0x007F0000L
 +#       define  RADEON_SCALER_DOUBLE_BUFFER        0x01000000L
 +#       define  RADEON_SCALER_DIS_LIMIT            0x08000000L
 +#       define  RADEON_SCALER_LIN_TRANS_BYPASS     0x10000000L
 +#       define  RADEON_SCALER_INT_EMU              0x20000000L
 +#       define  RADEON_SCALER_ENABLE               0x40000000L
 +#       define  RADEON_SCALER_SOFT_RESET           0x80000000L
 +#define RADEON_OV0_STEP_BY                  0x0484
 +#define RADEON_OV0_TEST                     0x04F8
 +#define RADEON_OV0_V_INC                    0x0424
 +#define RADEON_OV0_VID_BUF_PITCH0_VALUE     0x0460
 +#define RADEON_OV0_VID_BUF_PITCH1_VALUE     0x0464
 +#define RADEON_OV0_VID_BUF0_BASE_ADRS       0x0440
 +#       define  RADEON_VIF_BUF0_PITCH_SEL          0x00000001L
 +#       define  RADEON_VIF_BUF0_TILE_ADRS          0x00000002L
 +#       define  RADEON_VIF_BUF0_BASE_ADRS_MASK     0x03fffff0L
 +#       define  RADEON_VIF_BUF0_1ST_LINE_LSBS_MASK 0x48000000L
 +#define RADEON_OV0_VID_BUF1_BASE_ADRS       0x0444
 +#       define  RADEON_VIF_BUF1_PITCH_SEL          0x00000001L
 +#       define  RADEON_VIF_BUF1_TILE_ADRS          0x00000002L
 +#       define  RADEON_VIF_BUF1_BASE_ADRS_MASK     0x03fffff0L
 +#       define  RADEON_VIF_BUF1_1ST_LINE_LSBS_MASK 0x48000000L
 +#define RADEON_OV0_VID_BUF2_BASE_ADRS       0x0448
 +#       define  RADEON_VIF_BUF2_PITCH_SEL          0x00000001L
 +#       define  RADEON_VIF_BUF2_TILE_ADRS          0x00000002L
 +#       define  RADEON_VIF_BUF2_BASE_ADRS_MASK     0x03fffff0L
 +#       define  RADEON_VIF_BUF2_1ST_LINE_LSBS_MASK 0x48000000L
 +#define RADEON_OV0_VID_BUF3_BASE_ADRS       0x044C
 +#define RADEON_OV0_VID_BUF4_BASE_ADRS       0x0450
 +#define RADEON_OV0_VID_BUF5_BASE_ADRS       0x0454
 +#define RADEON_OV0_VIDEO_KEY_CLR_HIGH       0x04E8
 +#define RADEON_OV0_VIDEO_KEY_CLR_LOW        0x04E4
 +#define RADEON_OV0_Y_X_START                0x0400
 +#define RADEON_OV0_Y_X_END                  0x0404
 +#define RADEON_OV1_Y_X_START                0x0600
 +#define RADEON_OV1_Y_X_END                  0x0604
 +#define RADEON_OVR_CLR                      0x0230
 +#define RADEON_OVR_WID_LEFT_RIGHT           0x0234
 +#define RADEON_OVR_WID_TOP_BOTTOM           0x0238
 +
 +/* first capture unit */
 +
 +#define RADEON_CAP0_BUF0_OFFSET           0x0920
 +#define RADEON_CAP0_BUF1_OFFSET           0x0924
 +#define RADEON_CAP0_BUF0_EVEN_OFFSET      0x0928
 +#define RADEON_CAP0_BUF1_EVEN_OFFSET      0x092C
 +
 +#define RADEON_CAP0_BUF_PITCH             0x0930
 +#define RADEON_CAP0_V_WINDOW              0x0934
 +#define RADEON_CAP0_H_WINDOW              0x0938
 +#define RADEON_CAP0_VBI0_OFFSET           0x093C
 +#define RADEON_CAP0_VBI1_OFFSET           0x0940
 +#define RADEON_CAP0_VBI_V_WINDOW          0x0944
 +#define RADEON_CAP0_VBI_H_WINDOW          0x0948
 +#define RADEON_CAP0_PORT_MODE_CNTL        0x094C
 +#define RADEON_CAP0_TRIG_CNTL             0x0950
 +#define RADEON_CAP0_DEBUG                 0x0954
 +#define RADEON_CAP0_CONFIG                0x0958
 +#       define RADEON_CAP0_CONFIG_CONTINUOS          0x00000001
 +#       define RADEON_CAP0_CONFIG_START_FIELD_EVEN   0x00000002
 +#       define RADEON_CAP0_CONFIG_START_BUF_GET      0x00000004
 +#       define RADEON_CAP0_CONFIG_START_BUF_SET      0x00000008
 +#       define RADEON_CAP0_CONFIG_BUF_TYPE_ALT       0x00000010
 +#       define RADEON_CAP0_CONFIG_BUF_TYPE_FRAME     0x00000020
 +#       define RADEON_CAP0_CONFIG_ONESHOT_MODE_FRAME 0x00000040
 +#       define RADEON_CAP0_CONFIG_BUF_MODE_DOUBLE    0x00000080
 +#       define RADEON_CAP0_CONFIG_BUF_MODE_TRIPLE    0x00000100
 +#       define RADEON_CAP0_CONFIG_MIRROR_EN          0x00000200
 +#       define RADEON_CAP0_CONFIG_ONESHOT_MIRROR_EN  0x00000400
 +#       define RADEON_CAP0_CONFIG_VIDEO_SIGNED_UV    0x00000800
 +#       define RADEON_CAP0_CONFIG_ANC_DECODE_EN      0x00001000
 +#       define RADEON_CAP0_CONFIG_VBI_EN             0x00002000
 +#       define RADEON_CAP0_CONFIG_SOFT_PULL_DOWN_EN  0x00004000
 +#       define RADEON_CAP0_CONFIG_VIP_EXTEND_FLAG_EN 0x00008000
 +#       define RADEON_CAP0_CONFIG_FAKE_FIELD_EN      0x00010000
 +#       define RADEON_CAP0_CONFIG_ODD_ONE_MORE_LINE  0x00020000
 +#       define RADEON_CAP0_CONFIG_EVEN_ONE_MORE_LINE 0x00040000
 +#       define RADEON_CAP0_CONFIG_HORZ_DIVIDE_2      0x00080000
 +#       define RADEON_CAP0_CONFIG_HORZ_DIVIDE_4      0x00100000
 +#       define RADEON_CAP0_CONFIG_VERT_DIVIDE_2      0x00200000
 +#       define RADEON_CAP0_CONFIG_VERT_DIVIDE_4      0x00400000
 +#       define RADEON_CAP0_CONFIG_FORMAT_BROOKTREE   0x00000000
 +#       define RADEON_CAP0_CONFIG_FORMAT_CCIR656     0x00800000
 +#       define RADEON_CAP0_CONFIG_FORMAT_ZV          0x01000000
 +#       define RADEON_CAP0_CONFIG_FORMAT_VIP         0x01800000
 +#       define RADEON_CAP0_CONFIG_FORMAT_TRANSPORT   0x02000000
 +#       define RADEON_CAP0_CONFIG_HORZ_DECIMATOR     0x04000000
 +#       define RADEON_CAP0_CONFIG_VIDEO_IN_YVYU422   0x00000000
 +#       define RADEON_CAP0_CONFIG_VIDEO_IN_VYUY422   0x20000000
 +#       define RADEON_CAP0_CONFIG_VBI_DIVIDE_2       0x40000000
 +#       define RADEON_CAP0_CONFIG_VBI_DIVIDE_4       0x80000000
 +#define RADEON_CAP0_ANC_ODD_OFFSET        0x095C
 +#define RADEON_CAP0_ANC_EVEN_OFFSET       0x0960
 +#define RADEON_CAP0_ANC_H_WINDOW          0x0964
 +#define RADEON_CAP0_VIDEO_SYNC_TEST       0x0968
 +#define RADEON_CAP0_ONESHOT_BUF_OFFSET    0x096C
 +#define RADEON_CAP0_BUF_STATUS            0x0970
 +/* #define RADEON_CAP0_DWNSC_XRATIO       0x0978 */
 +/* #define RADEON_CAP0_XSHARPNESS                 0x097C */
 +#define RADEON_CAP0_VBI2_OFFSET           0x0980
 +#define RADEON_CAP0_VBI3_OFFSET           0x0984
 +#define RADEON_CAP0_ANC2_OFFSET           0x0988
 +#define RADEON_CAP0_ANC3_OFFSET           0x098C
 +#define RADEON_VID_BUFFER_CONTROL         0x0900
 +
 +/* second capture unit */
 +
 +#define RADEON_CAP1_BUF0_OFFSET           0x0990
 +#define RADEON_CAP1_BUF1_OFFSET           0x0994
 +#define RADEON_CAP1_BUF0_EVEN_OFFSET      0x0998
 +#define RADEON_CAP1_BUF1_EVEN_OFFSET      0x099C
 +
 +#define RADEON_CAP1_BUF_PITCH             0x09A0
 +#define RADEON_CAP1_V_WINDOW              0x09A4
 +#define RADEON_CAP1_H_WINDOW              0x09A8
 +#define RADEON_CAP1_VBI_ODD_OFFSET        0x09AC
 +#define RADEON_CAP1_VBI_EVEN_OFFSET       0x09B0
 +#define RADEON_CAP1_VBI_V_WINDOW                  0x09B4
 +#define RADEON_CAP1_VBI_H_WINDOW                  0x09B8
 +#define RADEON_CAP1_PORT_MODE_CNTL        0x09BC
 +#define RADEON_CAP1_TRIG_CNTL             0x09C0
 +#define RADEON_CAP1_DEBUG                         0x09C4
 +#define RADEON_CAP1_CONFIG                0x09C8
 +#define RADEON_CAP1_ANC_ODD_OFFSET        0x09CC
 +#define RADEON_CAP1_ANC_EVEN_OFFSET       0x09D0
 +#define RADEON_CAP1_ANC_H_WINDOW                  0x09D4
 +#define RADEON_CAP1_VIDEO_SYNC_TEST       0x09D8
 +#define RADEON_CAP1_ONESHOT_BUF_OFFSET    0x09DC
 +#define RADEON_CAP1_BUF_STATUS            0x09E0
 +#define RADEON_CAP1_DWNSC_XRATIO                  0x09E8
 +#define RADEON_CAP1_XSHARPNESS            0x09EC
 +
 +/* misc multimedia registers */
 +
 +#define RADEON_IDCT_RUNS                  0x1F80
 +#define RADEON_IDCT_LEVELS                0x1F84
 +#define RADEON_IDCT_CONTROL               0x1FBC
 +#define RADEON_IDCT_AUTH_CONTROL          0x1F88
 +#define RADEON_IDCT_AUTH                  0x1F8C
 +
 +#define RADEON_P2PLL_CNTL                   0x002a /* P2PLL */
 +#       define RADEON_P2PLL_RESET                (1 <<  0)
 +#       define RADEON_P2PLL_SLEEP                (1 <<  1)
 +#       define RADEON_P2PLL_PVG_MASK             (7 << 11)
 +#       define RADEON_P2PLL_PVG_SHIFT            11
 +#       define RADEON_P2PLL_ATOMIC_UPDATE_EN     (1 << 16)
 +#       define RADEON_P2PLL_VGA_ATOMIC_UPDATE_EN (1 << 17)
 +#       define RADEON_P2PLL_ATOMIC_UPDATE_VSYNC  (1 << 18)
 +#define RADEON_P2PLL_DIV_0                  0x002c
 +#       define RADEON_P2PLL_FB0_DIV_MASK    0x07ff
 +#       define RADEON_P2PLL_POST0_DIV_MASK  0x00070000
 +#define RADEON_P2PLL_REF_DIV                0x002B /* PLL */
 +#       define RADEON_P2PLL_REF_DIV_MASK    0x03ff
 +#       define RADEON_P2PLL_ATOMIC_UPDATE_R (1 << 15) /* same as _W */
 +#       define RADEON_P2PLL_ATOMIC_UPDATE_W (1 << 15) /* same as _R */
 +#       define R300_PPLL_REF_DIV_ACC_MASK   (0x3ff << 18)
 +#       define R300_PPLL_REF_DIV_ACC_SHIFT  18
 +#define RADEON_PALETTE_DATA                 0x00b4
 +#define RADEON_PALETTE_30_DATA              0x00b8
 +#define RADEON_PALETTE_INDEX                0x00b0
 +#define RADEON_PCI_GART_PAGE                0x017c
 +#define RADEON_PIXCLKS_CNTL                 0x002d
 +#       define RADEON_PIX2CLK_SRC_SEL_MASK     0x03
 +#       define RADEON_PIX2CLK_SRC_SEL_CPUCLK   0x00
 +#       define RADEON_PIX2CLK_SRC_SEL_PSCANCLK 0x01
 +#       define RADEON_PIX2CLK_SRC_SEL_BYTECLK  0x02
 +#       define RADEON_PIX2CLK_SRC_SEL_P2PLLCLK 0x03
 +#       define RADEON_PIX2CLK_ALWAYS_ONb       (1<<6)
 +#       define RADEON_PIX2CLK_DAC_ALWAYS_ONb   (1<<7)
 +#       define RADEON_PIXCLK_TV_SRC_SEL        (1 << 8)
 +#       define RADEON_DISP_TVOUT_PIXCLK_TV_ALWAYS_ONb (1 << 9)
 +#       define R300_DVOCLK_ALWAYS_ONb          (1 << 10)
 +#       define RADEON_PIXCLK_BLEND_ALWAYS_ONb  (1 << 11)
 +#       define RADEON_PIXCLK_GV_ALWAYS_ONb     (1 << 12)
 +#       define RADEON_PIXCLK_DIG_TMDS_ALWAYS_ONb (1 << 13)
 +#       define R300_PIXCLK_DVO_ALWAYS_ONb      (1 << 13)
 +#       define RADEON_PIXCLK_LVDS_ALWAYS_ONb   (1 << 14)
 +#       define RADEON_PIXCLK_TMDS_ALWAYS_ONb   (1 << 15)
 +#       define R300_PIXCLK_TRANS_ALWAYS_ONb    (1 << 16)
 +#       define R300_PIXCLK_TVO_ALWAYS_ONb      (1 << 17)
 +#       define R300_P2G2CLK_ALWAYS_ONb         (1 << 18)
 +#       define R300_P2G2CLK_DAC_ALWAYS_ONb     (1 << 19)
 +#       define R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF (1 << 23)
 +#define RADEON_PLANE_3D_MASK_C              0x1d44
 +#define RADEON_PLL_TEST_CNTL                0x0013 /* PLL */
 +#       define RADEON_PLL_MASK_READ_B          (1 << 9)
 +#define RADEON_PMI_CAP_ID                   0x0f5c /* PCI */
 +#define RADEON_PMI_DATA                     0x0f63 /* PCI */
 +#define RADEON_PMI_NXT_CAP_PTR              0x0f5d /* PCI */
 +#define RADEON_PMI_PMC_REG                  0x0f5e /* PCI */
 +#define RADEON_PMI_PMCSR_REG                0x0f60 /* PCI */
 +#define RADEON_PMI_REGISTER                 0x0f5c /* PCI */
 +#define RADEON_PPLL_CNTL                    0x0002 /* PLL */
 +#       define RADEON_PPLL_RESET                (1 <<  0)
 +#       define RADEON_PPLL_SLEEP                (1 <<  1)
 +#       define RADEON_PPLL_PVG_MASK             (7 << 11)
 +#       define RADEON_PPLL_PVG_SHIFT            11
 +#       define RADEON_PPLL_ATOMIC_UPDATE_EN     (1 << 16)
 +#       define RADEON_PPLL_VGA_ATOMIC_UPDATE_EN (1 << 17)
 +#       define RADEON_PPLL_ATOMIC_UPDATE_VSYNC  (1 << 18)
 +#define RADEON_PPLL_DIV_0                   0x0004 /* PLL */
 +#define RADEON_PPLL_DIV_1                   0x0005 /* PLL */
 +#define RADEON_PPLL_DIV_2                   0x0006 /* PLL */
 +#define RADEON_PPLL_DIV_3                   0x0007 /* PLL */
 +#       define RADEON_PPLL_FB3_DIV_MASK     0x07ff
 +#       define RADEON_PPLL_POST3_DIV_MASK   0x00070000
 +#define RADEON_PPLL_REF_DIV                 0x0003 /* PLL */
 +#       define RADEON_PPLL_REF_DIV_MASK     0x03ff
 +#       define RADEON_PPLL_ATOMIC_UPDATE_R  (1 << 15) /* same as _W */
 +#       define RADEON_PPLL_ATOMIC_UPDATE_W  (1 << 15) /* same as _R */
 +#define RADEON_PWR_MNGMT_CNTL_STATUS        0x0f60 /* PCI */
 +
 +#define RADEON_RBBM_GUICNTL                 0x172c
 +#       define RADEON_HOST_DATA_SWAP_NONE   (0 << 0)
 +#       define RADEON_HOST_DATA_SWAP_16BIT  (1 << 0)
 +#       define RADEON_HOST_DATA_SWAP_32BIT  (2 << 0)
 +#       define RADEON_HOST_DATA_SWAP_HDW    (3 << 0)
 +#define RADEON_RBBM_SOFT_RESET              0x00f0
 +#       define RADEON_SOFT_RESET_CP         (1 <<  0)
 +#       define RADEON_SOFT_RESET_HI         (1 <<  1)
 +#       define RADEON_SOFT_RESET_SE         (1 <<  2)
 +#       define RADEON_SOFT_RESET_RE         (1 <<  3)
 +#       define RADEON_SOFT_RESET_PP         (1 <<  4)
 +#       define RADEON_SOFT_RESET_E2         (1 <<  5)
 +#       define RADEON_SOFT_RESET_RB         (1 <<  6)
 +#       define RADEON_SOFT_RESET_HDP        (1 <<  7)
 +#define RADEON_RBBM_STATUS                  0x0e40
 +#       define RADEON_RBBM_FIFOCNT_MASK     0x007f
 +#       define RADEON_RBBM_ACTIVE           (1 << 31)
 +#define RADEON_RB2D_DSTCACHE_CTLSTAT        0x342c
 +#       define RADEON_RB2D_DC_FLUSH         (3 << 0)
 +#       define RADEON_RB2D_DC_FREE          (3 << 2)
 +#       define RADEON_RB2D_DC_FLUSH_ALL     0xf
 +#       define RADEON_RB2D_DC_BUSY          (1 << 31)
 +#define RADEON_RB2D_DSTCACHE_MODE           0x3428
 +#define RADEON_DSTCACHE_CTLSTAT             0x1714
 +
 +#define RADEON_RB3D_ZCACHE_MODE             0x3250
 +#define RADEON_RB3D_ZCACHE_CTLSTAT          0x3254
 +#       define RADEON_RB3D_ZC_FLUSH_ALL     0x5
 +#define RADEON_RB3D_DSTCACHE_MODE           0x3258
 +# define RADEON_RB3D_DC_CACHE_ENABLE            (0)
 +# define RADEON_RB3D_DC_2D_CACHE_DISABLE        (1)
 +# define RADEON_RB3D_DC_3D_CACHE_DISABLE        (2)
 +# define RADEON_RB3D_DC_CACHE_DISABLE           (3)
 +# define RADEON_RB3D_DC_2D_CACHE_LINESIZE_128   (1 << 2)
 +# define RADEON_RB3D_DC_3D_CACHE_LINESIZE_128   (2 << 2)
 +# define RADEON_RB3D_DC_2D_CACHE_AUTOFLUSH      (1 << 8)
 +# define RADEON_RB3D_DC_3D_CACHE_AUTOFLUSH      (2 << 8)
 +# define R200_RB3D_DC_2D_CACHE_AUTOFREE         (1 << 10)
 +# define R200_RB3D_DC_3D_CACHE_AUTOFREE         (2 << 10)
 +# define RADEON_RB3D_DC_FORCE_RMW               (1 << 16)
 +# define RADEON_RB3D_DC_DISABLE_RI_FILL         (1 << 24)
 +# define RADEON_RB3D_DC_DISABLE_RI_READ         (1 << 25)
 +
 +#define RADEON_RB3D_DSTCACHE_CTLSTAT            0x325C
 +# define RADEON_RB3D_DC_FLUSH                   (3 << 0)
 +# define RADEON_RB3D_DC_FREE                    (3 << 2)
 +# define RADEON_RB3D_DC_FLUSH_ALL               0xf
 +# define RADEON_RB3D_DC_BUSY                    (1 << 31)
 +
 +#define RADEON_REG_BASE                     0x0f18 /* PCI */
 +#define RADEON_REGPROG_INF                  0x0f09 /* PCI */
 +#define RADEON_REVISION_ID                  0x0f08 /* PCI */
 +
 +#define RADEON_SC_BOTTOM                    0x164c
 +#define RADEON_SC_BOTTOM_RIGHT              0x16f0
 +#define RADEON_SC_BOTTOM_RIGHT_C            0x1c8c
 +#define RADEON_SC_LEFT                      0x1640
 +#define RADEON_SC_RIGHT                     0x1644
 +#define RADEON_SC_TOP                       0x1648
 +#define RADEON_SC_TOP_LEFT                  0x16ec
 +#define RADEON_SC_TOP_LEFT_C                0x1c88
 +#       define RADEON_SC_SIGN_MASK_LO       0x8000
 +#       define RADEON_SC_SIGN_MASK_HI       0x80000000
 +#define RADEON_SCLK_CNTL                    0x000d /* PLL */
 +#       define RADEON_SCLK_SRC_SEL_MASK     0x0007
 +#       define RADEON_DYN_STOP_LAT_MASK     0x00007ff8
 +#       define RADEON_CP_MAX_DYN_STOP_LAT   0x0008
 +#       define RADEON_SCLK_FORCEON_MASK     0xffff8000
 +#       define RADEON_SCLK_FORCE_DISP2      (1<<15)
 +#       define RADEON_SCLK_FORCE_CP         (1<<16)
 +#       define RADEON_SCLK_FORCE_HDP        (1<<17)
 +#       define RADEON_SCLK_FORCE_DISP1      (1<<18)
 +#       define RADEON_SCLK_FORCE_TOP        (1<<19)
 +#       define RADEON_SCLK_FORCE_E2         (1<<20)
 +#       define RADEON_SCLK_FORCE_SE         (1<<21)
 +#       define RADEON_SCLK_FORCE_IDCT       (1<<22)
 +#       define RADEON_SCLK_FORCE_VIP        (1<<23)
 +#       define RADEON_SCLK_FORCE_RE         (1<<24)
 +#       define RADEON_SCLK_FORCE_PB         (1<<25)
 +#       define RADEON_SCLK_FORCE_TAM        (1<<26)
 +#       define RADEON_SCLK_FORCE_TDM        (1<<27)
 +#       define RADEON_SCLK_FORCE_RB         (1<<28)
 +#       define RADEON_SCLK_FORCE_TV_SCLK    (1<<29)
 +#       define RADEON_SCLK_FORCE_SUBPIC     (1<<30)
 +#       define RADEON_SCLK_FORCE_OV0        (1<<31)
 +#       define R300_SCLK_FORCE_VAP          (1<<21)
 +#       define R300_SCLK_FORCE_SR           (1<<25)
 +#       define R300_SCLK_FORCE_PX           (1<<26)
 +#       define R300_SCLK_FORCE_TX           (1<<27)
 +#       define R300_SCLK_FORCE_US           (1<<28)
 +#       define R300_SCLK_FORCE_SU           (1<<30)
 +#define R300_SCLK_CNTL2                     0x1e   /* PLL */
 +#       define R300_SCLK_TCL_MAX_DYN_STOP_LAT (1<<10)
 +#       define R300_SCLK_GA_MAX_DYN_STOP_LAT  (1<<11)
 +#       define R300_SCLK_CBA_MAX_DYN_STOP_LAT (1<<12)
 +#       define R300_SCLK_FORCE_TCL          (1<<13)
 +#       define R300_SCLK_FORCE_CBA          (1<<14)
 +#       define R300_SCLK_FORCE_GA           (1<<15)
 +#define RADEON_SCLK_MORE_CNTL               0x0035 /* PLL */
 +#       define RADEON_SCLK_MORE_MAX_DYN_STOP_LAT 0x0007
 +#       define RADEON_SCLK_MORE_FORCEON     0x0700
 +#define RADEON_SDRAM_MODE_REG               0x0158
 +#define RADEON_SEQ8_DATA                    0x03c5 /* VGA */
 +#define RADEON_SEQ8_IDX                     0x03c4 /* VGA */
 +#define RADEON_SNAPSHOT_F_COUNT             0x0244
 +#define RADEON_SNAPSHOT_VH_COUNTS           0x0240
 +#define RADEON_SNAPSHOT_VIF_COUNT           0x024c
 +#define RADEON_SRC_OFFSET                   0x15ac
 +#define RADEON_SRC_PITCH                    0x15b0
 +#define RADEON_SRC_PITCH_OFFSET             0x1428
 +#define RADEON_SRC_SC_BOTTOM                0x165c
 +#define RADEON_SRC_SC_BOTTOM_RIGHT          0x16f4
 +#define RADEON_SRC_SC_RIGHT                 0x1654
 +#define RADEON_SRC_X                        0x1414
 +#define RADEON_SRC_X_Y                      0x1590
 +#define RADEON_SRC_Y                        0x1418
 +#define RADEON_SRC_Y_X                      0x1434
 +#define RADEON_STATUS                       0x0f06 /* PCI */
 +#define RADEON_SUBPIC_CNTL                  0x0540 /* ? */
 +#define RADEON_SUB_CLASS                    0x0f0a /* PCI */
 +#define RADEON_SURFACE_CNTL                 0x0b00
 +#       define RADEON_SURF_TRANSLATION_DIS  (1 << 8)
 +#       define RADEON_NONSURF_AP0_SWP_16BPP (1 << 20)
 +#       define RADEON_NONSURF_AP0_SWP_32BPP (1 << 21)
 +#       define RADEON_NONSURF_AP1_SWP_16BPP (1 << 22)
 +#       define RADEON_NONSURF_AP1_SWP_32BPP (1 << 23)
 +#define RADEON_SURFACE0_INFO                0x0b0c
 +#       define RADEON_SURF_TILE_COLOR_MACRO (0 << 16)
 +#       define RADEON_SURF_TILE_COLOR_BOTH  (1 << 16)
 +#       define RADEON_SURF_TILE_DEPTH_32BPP (2 << 16)
 +#       define RADEON_SURF_TILE_DEPTH_16BPP (3 << 16)
 +#       define R200_SURF_TILE_NONE          (0 << 16)
 +#       define R200_SURF_TILE_COLOR_MACRO   (1 << 16)
 +#       define R200_SURF_TILE_COLOR_MICRO   (2 << 16)
 +#       define R200_SURF_TILE_COLOR_BOTH    (3 << 16)
 +#       define R200_SURF_TILE_DEPTH_32BPP   (4 << 16)
 +#       define R200_SURF_TILE_DEPTH_16BPP   (5 << 16)
 +#       define R300_SURF_TILE_NONE          (0 << 16)
 +#       define R300_SURF_TILE_COLOR_MACRO   (1 << 16)
 +#       define R300_SURF_TILE_DEPTH_32BPP   (2 << 16)
 +#       define RADEON_SURF_AP0_SWP_16BPP    (1 << 20)
 +#       define RADEON_SURF_AP0_SWP_32BPP    (1 << 21)
 +#       define RADEON_SURF_AP1_SWP_16BPP    (1 << 22)
 +#       define RADEON_SURF_AP1_SWP_32BPP    (1 << 23)
 +#define RADEON_SURFACE0_LOWER_BOUND         0x0b04
 +#define RADEON_SURFACE0_UPPER_BOUND         0x0b08
 +#define RADEON_SURFACE1_INFO                0x0b1c
 +#define RADEON_SURFACE1_LOWER_BOUND         0x0b14
 +#define RADEON_SURFACE1_UPPER_BOUND         0x0b18
 +#define RADEON_SURFACE2_INFO                0x0b2c
 +#define RADEON_SURFACE2_LOWER_BOUND         0x0b24
 +#define RADEON_SURFACE2_UPPER_BOUND         0x0b28
 +#define RADEON_SURFACE3_INFO                0x0b3c
 +#define RADEON_SURFACE3_LOWER_BOUND         0x0b34
 +#define RADEON_SURFACE3_UPPER_BOUND         0x0b38
 +#define RADEON_SURFACE4_INFO                0x0b4c
 +#define RADEON_SURFACE4_LOWER_BOUND         0x0b44
 +#define RADEON_SURFACE4_UPPER_BOUND         0x0b48
 +#define RADEON_SURFACE5_INFO                0x0b5c
 +#define RADEON_SURFACE5_LOWER_BOUND         0x0b54
 +#define RADEON_SURFACE5_UPPER_BOUND         0x0b58
 +#define RADEON_SURFACE6_INFO                0x0b6c
 +#define RADEON_SURFACE6_LOWER_BOUND         0x0b64
 +#define RADEON_SURFACE6_UPPER_BOUND         0x0b68
 +#define RADEON_SURFACE7_INFO                0x0b7c
 +#define RADEON_SURFACE7_LOWER_BOUND         0x0b74
 +#define RADEON_SURFACE7_UPPER_BOUND         0x0b78
 +#define RADEON_SW_SEMAPHORE                 0x013c
 +
 +#define RADEON_TEST_DEBUG_CNTL              0x0120
 +#define RADEON_TEST_DEBUG_CNTL__TEST_DEBUG_OUT_EN 0x00000001
 +
 +#define RADEON_TEST_DEBUG_MUX               0x0124
 +#define RADEON_TEST_DEBUG_OUT               0x012c
 +#define RADEON_TMDS_PLL_CNTL                0x02a8
 +#define RADEON_TMDS_TRANSMITTER_CNTL        0x02a4
 +#       define RADEON_TMDS_TRANSMITTER_PLLEN  1
 +#       define RADEON_TMDS_TRANSMITTER_PLLRST 2
 +#define RADEON_TRAIL_BRES_DEC               0x1614
 +#define RADEON_TRAIL_BRES_ERR               0x160c
 +#define RADEON_TRAIL_BRES_INC               0x1610
 +#define RADEON_TRAIL_X                      0x1618
 +#define RADEON_TRAIL_X_SUB                  0x1620
 +
 +#define RADEON_VCLK_ECP_CNTL                0x0008 /* PLL */
 +#       define RADEON_VCLK_SRC_SEL_MASK     0x03
 +#       define RADEON_VCLK_SRC_SEL_CPUCLK   0x00
 +#       define RADEON_VCLK_SRC_SEL_PSCANCLK 0x01
 +#       define RADEON_VCLK_SRC_SEL_BYTECLK  0x02
 +#       define RADEON_VCLK_SRC_SEL_PPLLCLK  0x03
 +#       define RADEON_PIXCLK_ALWAYS_ONb     (1<<6)
 +#       define RADEON_PIXCLK_DAC_ALWAYS_ONb (1<<7)
 +#       define R300_DISP_DAC_PIXCLK_DAC_BLANK_OFF (1<<23)
 +
 +#define RADEON_VENDOR_ID                    0x0f00 /* PCI */
 +#define RADEON_VGA_DDA_CONFIG               0x02e8
 +#define RADEON_VGA_DDA_ON_OFF               0x02ec
 +#define RADEON_VID_BUFFER_CONTROL           0x0900
 +#define RADEON_VIDEOMUX_CNTL                0x0190
 +
 +                 /* VIP bus */
 +#define RADEON_VIPH_CH0_DATA                0x0c00
 +#define RADEON_VIPH_CH1_DATA                0x0c04
 +#define RADEON_VIPH_CH2_DATA                0x0c08
 +#define RADEON_VIPH_CH3_DATA                0x0c0c
 +#define RADEON_VIPH_CH0_ADDR                0x0c10
 +#define RADEON_VIPH_CH1_ADDR                0x0c14
 +#define RADEON_VIPH_CH2_ADDR                0x0c18
 +#define RADEON_VIPH_CH3_ADDR                0x0c1c
 +#define RADEON_VIPH_CH0_SBCNT               0x0c20
 +#define RADEON_VIPH_CH1_SBCNT               0x0c24
 +#define RADEON_VIPH_CH2_SBCNT               0x0c28
 +#define RADEON_VIPH_CH3_SBCNT               0x0c2c
 +#define RADEON_VIPH_CH0_ABCNT               0x0c30
 +#define RADEON_VIPH_CH1_ABCNT               0x0c34
 +#define RADEON_VIPH_CH2_ABCNT               0x0c38
 +#define RADEON_VIPH_CH3_ABCNT               0x0c3c
 +#define RADEON_VIPH_CONTROL                 0x0c40
 +#       define RADEON_VIP_BUSY 0
 +#       define RADEON_VIP_IDLE 1
 +#       define RADEON_VIP_RESET 2
 +#       define RADEON_VIPH_EN               (1 << 21)
 +#define RADEON_VIPH_DV_LAT                  0x0c44
 +#define RADEON_VIPH_BM_CHUNK                0x0c48
 +#define RADEON_VIPH_DV_INT                  0x0c4c
 +#define RADEON_VIPH_TIMEOUT_STAT            0x0c50
 +#define RADEON_VIPH_TIMEOUT_STAT__VIPH_REG_STAT 0x00000010
 +#define RADEON_VIPH_TIMEOUT_STAT__VIPH_REG_AK   0x00000010
 +#define RADEON_VIPH_TIMEOUT_STAT__VIPH_REGR_DIS 0x01000000
 +
 +#define RADEON_VIPH_REG_DATA                0x0084
 +#define RADEON_VIPH_REG_ADDR                0x0080
 +
 +
 +#define RADEON_WAIT_UNTIL                   0x1720
 +#       define RADEON_WAIT_CRTC_PFLIP       (1 << 0)
 +#       define RADEON_WAIT_RE_CRTC_VLINE    (1 << 1)
 +#       define RADEON_WAIT_FE_CRTC_VLINE    (1 << 2)
 +#       define RADEON_WAIT_CRTC_VLINE       (1 << 3)
 +#       define RADEON_WAIT_DMA_VID_IDLE     (1 << 8)
 +#       define RADEON_WAIT_DMA_GUI_IDLE     (1 << 9)
 +#       define RADEON_WAIT_CMDFIFO          (1 << 10) /* wait for CMDFIFO_ENTRIES */
 +#       define RADEON_WAIT_OV0_FLIP         (1 << 11)
 +#       define RADEON_WAIT_AGP_FLUSH        (1 << 13)
 +#       define RADEON_WAIT_2D_IDLE          (1 << 14)
 +#       define RADEON_WAIT_3D_IDLE          (1 << 15)
 +#       define RADEON_WAIT_2D_IDLECLEAN     (1 << 16)
 +#       define RADEON_WAIT_3D_IDLECLEAN     (1 << 17)
 +#       define RADEON_WAIT_HOST_IDLECLEAN   (1 << 18)
 +#       define RADEON_CMDFIFO_ENTRIES_SHIFT 10
 +#       define RADEON_CMDFIFO_ENTRIES_MASK  0x7f
 +#       define RADEON_WAIT_VAP_IDLE         (1 << 28)
 +#       define RADEON_WAIT_BOTH_CRTC_PFLIP  (1 << 30)
 +#       define RADEON_ENG_DISPLAY_SELECT_CRTC0    (0 << 31)
 +#       define RADEON_ENG_DISPLAY_SELECT_CRTC1    (1 << 31)
 +
 +#define RADEON_X_MPLL_REF_FB_DIV            0x000a /* PLL */
 +#define RADEON_XCLK_CNTL                    0x000d /* PLL */
 +#define RADEON_XDLL_CNTL                    0x000c /* PLL */
 +#define RADEON_XPLL_CNTL                    0x000b /* PLL */
 +
 +
 +
 +                              /* Registers for 3D/TCL */
 +#define RADEON_PP_BORDER_COLOR_0            0x1d40
 +#define RADEON_PP_BORDER_COLOR_1            0x1d44
 +#define RADEON_PP_BORDER_COLOR_2            0x1d48
 +#define RADEON_PP_CNTL                      0x1c38
 +#       define RADEON_STIPPLE_ENABLE        (1 <<  0)
 +#       define RADEON_SCISSOR_ENABLE        (1 <<  1)
 +#       define RADEON_PATTERN_ENABLE        (1 <<  2)
 +#       define RADEON_SHADOW_ENABLE         (1 <<  3)
 +#       define RADEON_TEX_ENABLE_MASK       (0xf << 4)
 +#       define RADEON_TEX_0_ENABLE          (1 <<  4)
 +#       define RADEON_TEX_1_ENABLE          (1 <<  5)
 +#       define RADEON_TEX_2_ENABLE          (1 <<  6)
 +#       define RADEON_TEX_3_ENABLE          (1 <<  7)
 +#       define RADEON_TEX_BLEND_ENABLE_MASK (0xf << 12)
 +#       define RADEON_TEX_BLEND_0_ENABLE    (1 << 12)
 +#       define RADEON_TEX_BLEND_1_ENABLE    (1 << 13)
 +#       define RADEON_TEX_BLEND_2_ENABLE    (1 << 14)
 +#       define RADEON_TEX_BLEND_3_ENABLE    (1 << 15)
 +#       define RADEON_PLANAR_YUV_ENABLE     (1 << 20)
 +#       define RADEON_SPECULAR_ENABLE       (1 << 21)
 +#       define RADEON_FOG_ENABLE            (1 << 22)
 +#       define RADEON_ALPHA_TEST_ENABLE     (1 << 23)
 +#       define RADEON_ANTI_ALIAS_NONE       (0 << 24)
 +#       define RADEON_ANTI_ALIAS_LINE       (1 << 24)
 +#       define RADEON_ANTI_ALIAS_POLY       (2 << 24)
 +#       define RADEON_ANTI_ALIAS_LINE_POLY  (3 << 24)
 +#       define RADEON_BUMP_MAP_ENABLE       (1 << 26)
 +#       define RADEON_BUMPED_MAP_T0         (0 << 27)
 +#       define RADEON_BUMPED_MAP_T1         (1 << 27)
 +#       define RADEON_BUMPED_MAP_T2         (2 << 27)
 +#       define RADEON_TEX_3D_ENABLE_0       (1 << 29)
 +#       define RADEON_TEX_3D_ENABLE_1       (1 << 30)
 +#       define RADEON_MC_ENABLE             (1 << 31)
 +#define RADEON_PP_FOG_COLOR                 0x1c18
 +#       define RADEON_FOG_COLOR_MASK        0x00ffffff
 +#       define RADEON_FOG_VERTEX            (0 << 24)
 +#       define RADEON_FOG_TABLE             (1 << 24)
 +#       define RADEON_FOG_USE_DEPTH         (0 << 25)
 +#       define RADEON_FOG_USE_DIFFUSE_ALPHA (2 << 25)
 +#       define RADEON_FOG_USE_SPEC_ALPHA    (3 << 25)
 +#define RADEON_PP_LUM_MATRIX                0x1d00
 +#define RADEON_PP_MISC                      0x1c14
 +#       define RADEON_REF_ALPHA_MASK        0x000000ff
 +#       define RADEON_ALPHA_TEST_FAIL       (0 << 8)
 +#       define RADEON_ALPHA_TEST_LESS       (1 << 8)
 +#       define RADEON_ALPHA_TEST_LEQUAL     (2 << 8)
 +#       define RADEON_ALPHA_TEST_EQUAL      (3 << 8)
 +#       define RADEON_ALPHA_TEST_GEQUAL     (4 << 8)
 +#       define RADEON_ALPHA_TEST_GREATER    (5 << 8)
 +#       define RADEON_ALPHA_TEST_NEQUAL     (6 << 8)
 +#       define RADEON_ALPHA_TEST_PASS       (7 << 8)
 +#       define RADEON_ALPHA_TEST_OP_MASK    (7 << 8)
 +#       define RADEON_CHROMA_FUNC_FAIL      (0 << 16)
 +#       define RADEON_CHROMA_FUNC_PASS      (1 << 16)
 +#       define RADEON_CHROMA_FUNC_NEQUAL    (2 << 16)
 +#       define RADEON_CHROMA_FUNC_EQUAL     (3 << 16)
 +#       define RADEON_CHROMA_KEY_NEAREST    (0 << 18)
 +#       define RADEON_CHROMA_KEY_ZERO       (1 << 18)
 +#       define RADEON_SHADOW_ID_AUTO_INC    (1 << 20)
 +#       define RADEON_SHADOW_FUNC_EQUAL     (0 << 21)
 +#       define RADEON_SHADOW_FUNC_NEQUAL    (1 << 21)
 +#       define RADEON_SHADOW_PASS_1         (0 << 22)
 +#       define RADEON_SHADOW_PASS_2         (1 << 22)
 +#       define RADEON_RIGHT_HAND_CUBE_D3D   (0 << 24)
 +#       define RADEON_RIGHT_HAND_CUBE_OGL   (1 << 24)
 +#define RADEON_PP_ROT_MATRIX_0              0x1d58
 +#define RADEON_PP_ROT_MATRIX_1              0x1d5c
 +#define RADEON_PP_TXFILTER_0                0x1c54
 +#define RADEON_PP_TXFILTER_1                0x1c6c
 +#define RADEON_PP_TXFILTER_2                0x1c84
 +#       define RADEON_MAG_FILTER_NEAREST                   (0  <<  0)
 +#       define RADEON_MAG_FILTER_LINEAR                    (1  <<  0)
 +#       define RADEON_MAG_FILTER_MASK                      (1  <<  0)
 +#       define RADEON_MIN_FILTER_NEAREST                   (0  <<  1)
 +#       define RADEON_MIN_FILTER_LINEAR                    (1  <<  1)
 +#       define RADEON_MIN_FILTER_NEAREST_MIP_NEAREST       (2  <<  1)
 +#       define RADEON_MIN_FILTER_NEAREST_MIP_LINEAR        (3  <<  1)
 +#       define RADEON_MIN_FILTER_LINEAR_MIP_NEAREST        (6  <<  1)
 +#       define RADEON_MIN_FILTER_LINEAR_MIP_LINEAR         (7  <<  1)
 +#       define RADEON_MIN_FILTER_ANISO_NEAREST             (8  <<  1)
 +#       define RADEON_MIN_FILTER_ANISO_LINEAR              (9  <<  1)
 +#       define RADEON_MIN_FILTER_ANISO_NEAREST_MIP_NEAREST (10 <<  1)
 +#       define RADEON_MIN_FILTER_ANISO_NEAREST_MIP_LINEAR  (11 <<  1)
 +#       define RADEON_MIN_FILTER_MASK                      (15 <<  1)
 +#       define RADEON_MAX_ANISO_1_TO_1                     (0  <<  5)
 +#       define RADEON_MAX_ANISO_2_TO_1                     (1  <<  5)
 +#       define RADEON_MAX_ANISO_4_TO_1                     (2  <<  5)
 +#       define RADEON_MAX_ANISO_8_TO_1                     (3  <<  5)
 +#       define RADEON_MAX_ANISO_16_TO_1                    (4  <<  5)
 +#       define RADEON_MAX_ANISO_MASK                       (7  <<  5)
 +#       define RADEON_LOD_BIAS_MASK                        (0xff <<  8)
 +#       define RADEON_LOD_BIAS_SHIFT                       8
 +#       define RADEON_MAX_MIP_LEVEL_MASK                   (0x0f << 16)
 +#       define RADEON_MAX_MIP_LEVEL_SHIFT                  16
 +#       define RADEON_YUV_TO_RGB                           (1  << 20)
 +#       define RADEON_YUV_TEMPERATURE_COOL                 (0  << 21)
 +#       define RADEON_YUV_TEMPERATURE_HOT                  (1  << 21)
 +#       define RADEON_YUV_TEMPERATURE_MASK                 (1  << 21)
 +#       define RADEON_WRAPEN_S                             (1  << 22)
 +#       define RADEON_CLAMP_S_WRAP                         (0  << 23)
 +#       define RADEON_CLAMP_S_MIRROR                       (1  << 23)
 +#       define RADEON_CLAMP_S_CLAMP_LAST                   (2  << 23)
 +#       define RADEON_CLAMP_S_MIRROR_CLAMP_LAST            (3  << 23)
 +#       define RADEON_CLAMP_S_CLAMP_BORDER                 (4  << 23)
 +#       define RADEON_CLAMP_S_MIRROR_CLAMP_BORDER          (5  << 23)
 +#       define RADEON_CLAMP_S_CLAMP_GL                     (6  << 23)
 +#       define RADEON_CLAMP_S_MIRROR_CLAMP_GL              (7  << 23)
 +#       define RADEON_CLAMP_S_MASK                         (7  << 23)
 +#       define RADEON_WRAPEN_T                             (1  << 26)
 +#       define RADEON_CLAMP_T_WRAP                         (0  << 27)
 +#       define RADEON_CLAMP_T_MIRROR                       (1  << 27)
 +#       define RADEON_CLAMP_T_CLAMP_LAST                   (2  << 27)
 +#       define RADEON_CLAMP_T_MIRROR_CLAMP_LAST            (3  << 27)
 +#       define RADEON_CLAMP_T_CLAMP_BORDER                 (4  << 27)
 +#       define RADEON_CLAMP_T_MIRROR_CLAMP_BORDER          (5  << 27)
 +#       define RADEON_CLAMP_T_CLAMP_GL                     (6  << 27)
 +#       define RADEON_CLAMP_T_MIRROR_CLAMP_GL              (7  << 27)
 +#       define RADEON_CLAMP_T_MASK                         (7  << 27)
 +#       define RADEON_BORDER_MODE_OGL                      (0  << 31)
 +#       define RADEON_BORDER_MODE_D3D                      (1  << 31)
 +#define RADEON_PP_TXFORMAT_0                0x1c58
 +#define RADEON_PP_TXFORMAT_1                0x1c70
 +#define RADEON_PP_TXFORMAT_2                0x1c88
 +#       define RADEON_TXFORMAT_I8                 (0  <<  0)
 +#       define RADEON_TXFORMAT_AI88               (1  <<  0)
 +#       define RADEON_TXFORMAT_RGB332             (2  <<  0)
 +#       define RADEON_TXFORMAT_ARGB1555           (3  <<  0)
 +#       define RADEON_TXFORMAT_RGB565             (4  <<  0)
 +#       define RADEON_TXFORMAT_ARGB4444           (5  <<  0)
 +#       define RADEON_TXFORMAT_ARGB8888           (6  <<  0)
 +#       define RADEON_TXFORMAT_RGBA8888           (7  <<  0)
 +#       define RADEON_TXFORMAT_Y8                 (8  <<  0)
 +#       define RADEON_TXFORMAT_VYUY422            (10 <<  0)
 +#       define RADEON_TXFORMAT_YVYU422            (11 <<  0)
 +#       define RADEON_TXFORMAT_DXT1               (12 <<  0)
 +#       define RADEON_TXFORMAT_DXT23              (14 <<  0)
 +#       define RADEON_TXFORMAT_DXT45              (15 <<  0)
 +#       define RADEON_TXFORMAT_FORMAT_MASK        (31 <<  0)
 +#       define RADEON_TXFORMAT_FORMAT_SHIFT       0
 +#       define RADEON_TXFORMAT_APPLE_YUV_MODE     (1  <<  5)
 +#       define RADEON_TXFORMAT_ALPHA_IN_MAP       (1  <<  6)
 +#       define RADEON_TXFORMAT_NON_POWER2         (1  <<  7)
 +#       define RADEON_TXFORMAT_WIDTH_MASK         (15 <<  8)
 +#       define RADEON_TXFORMAT_WIDTH_SHIFT        8
 +#       define RADEON_TXFORMAT_HEIGHT_MASK        (15 << 12)
 +#       define RADEON_TXFORMAT_HEIGHT_SHIFT       12
 +#       define RADEON_TXFORMAT_F5_WIDTH_MASK      (15 << 16)
 +#       define RADEON_TXFORMAT_F5_WIDTH_SHIFT     16
 +#       define RADEON_TXFORMAT_F5_HEIGHT_MASK     (15 << 20)
 +#       define RADEON_TXFORMAT_F5_HEIGHT_SHIFT    20
 +#       define RADEON_TXFORMAT_ST_ROUTE_STQ0      (0  << 24)
 +#       define RADEON_TXFORMAT_ST_ROUTE_MASK      (3  << 24)
 +#       define RADEON_TXFORMAT_ST_ROUTE_STQ1      (1  << 24)
 +#       define RADEON_TXFORMAT_ST_ROUTE_STQ2      (2  << 24)
 +#       define RADEON_TXFORMAT_ENDIAN_NO_SWAP     (0  << 26)
 +#       define RADEON_TXFORMAT_ENDIAN_16BPP_SWAP  (1  << 26)
 +#       define RADEON_TXFORMAT_ENDIAN_32BPP_SWAP  (2  << 26)
 +#       define RADEON_TXFORMAT_ENDIAN_HALFDW_SWAP (3  << 26)
 +#       define RADEON_TXFORMAT_ALPHA_MASK_ENABLE  (1  << 28)
 +#       define RADEON_TXFORMAT_CHROMA_KEY_ENABLE  (1  << 29)
 +#       define RADEON_TXFORMAT_CUBIC_MAP_ENABLE   (1  << 30)
 +#       define RADEON_TXFORMAT_PERSPECTIVE_ENABLE (1  << 31)
 +#define RADEON_PP_CUBIC_FACES_0             0x1d24
 +#define RADEON_PP_CUBIC_FACES_1             0x1d28
 +#define RADEON_PP_CUBIC_FACES_2             0x1d2c
 +#       define RADEON_FACE_WIDTH_1_SHIFT          0
 +#       define RADEON_FACE_HEIGHT_1_SHIFT         4
 +#       define RADEON_FACE_WIDTH_1_MASK           (0xf << 0)
 +#       define RADEON_FACE_HEIGHT_1_MASK          (0xf << 4)
 +#       define RADEON_FACE_WIDTH_2_SHIFT          8
 +#       define RADEON_FACE_HEIGHT_2_SHIFT         12
 +#       define RADEON_FACE_WIDTH_2_MASK           (0xf << 8)
 +#       define RADEON_FACE_HEIGHT_2_MASK          (0xf << 12)
 +#       define RADEON_FACE_WIDTH_3_SHIFT          16
 +#       define RADEON_FACE_HEIGHT_3_SHIFT         20
 +#       define RADEON_FACE_WIDTH_3_MASK           (0xf << 16)
 +#       define RADEON_FACE_HEIGHT_3_MASK          (0xf << 20)
 +#       define RADEON_FACE_WIDTH_4_SHIFT          24
 +#       define RADEON_FACE_HEIGHT_4_SHIFT         28
 +#       define RADEON_FACE_WIDTH_4_MASK           (0xf << 24)
 +#       define RADEON_FACE_HEIGHT_4_MASK          (0xf << 28)
 +
 +#define RADEON_PP_TXOFFSET_0                0x1c5c
 +#define RADEON_PP_TXOFFSET_1                0x1c74
 +#define RADEON_PP_TXOFFSET_2                0x1c8c
 +#       define RADEON_TXO_ENDIAN_NO_SWAP     (0 << 0)
 +#       define RADEON_TXO_ENDIAN_BYTE_SWAP   (1 << 0)
 +#       define RADEON_TXO_ENDIAN_WORD_SWAP   (2 << 0)
 +#       define RADEON_TXO_ENDIAN_HALFDW_SWAP (3 << 0)
 +#       define RADEON_TXO_MACRO_LINEAR       (0 << 2)
 +#       define RADEON_TXO_MACRO_TILE         (1 << 2)
 +#       define RADEON_TXO_MICRO_LINEAR       (0 << 3)
 +#       define RADEON_TXO_MICRO_TILE_X2      (1 << 3)
 +#       define RADEON_TXO_MICRO_TILE_OPT     (2 << 3)
 +#       define RADEON_TXO_OFFSET_MASK        0xffffffe0
 +#       define RADEON_TXO_OFFSET_SHIFT       5
 +
 +#define RADEON_PP_CUBIC_OFFSET_T0_0         0x1dd0  /* bits [31:5] */
 +#define RADEON_PP_CUBIC_OFFSET_T0_1         0x1dd4
 +#define RADEON_PP_CUBIC_OFFSET_T0_2         0x1dd8
 +#define RADEON_PP_CUBIC_OFFSET_T0_3         0x1ddc
 +#define RADEON_PP_CUBIC_OFFSET_T0_4         0x1de0
 +#define RADEON_PP_CUBIC_OFFSET_T1_0         0x1e00
 +#define RADEON_PP_CUBIC_OFFSET_T1_1         0x1e04
 +#define RADEON_PP_CUBIC_OFFSET_T1_2         0x1e08
 +#define RADEON_PP_CUBIC_OFFSET_T1_3         0x1e0c
 +#define RADEON_PP_CUBIC_OFFSET_T1_4         0x1e10
 +#define RADEON_PP_CUBIC_OFFSET_T2_0         0x1e14
 +#define RADEON_PP_CUBIC_OFFSET_T2_1         0x1e18
 +#define RADEON_PP_CUBIC_OFFSET_T2_2         0x1e1c
 +#define RADEON_PP_CUBIC_OFFSET_T2_3         0x1e20
 +#define RADEON_PP_CUBIC_OFFSET_T2_4         0x1e24
 +
 +#define RADEON_PP_TEX_SIZE_0                0x1d04  /* NPOT */
 +#define RADEON_PP_TEX_SIZE_1                0x1d0c
 +#define RADEON_PP_TEX_SIZE_2                0x1d14
 +#       define RADEON_TEX_USIZE_MASK        (0x7ff << 0)
 +#       define RADEON_TEX_USIZE_SHIFT       0
 +#       define RADEON_TEX_VSIZE_MASK        (0x7ff << 16)
 +#       define RADEON_TEX_VSIZE_SHIFT       16
 +#       define RADEON_SIGNED_RGB_MASK       (1 << 30)
 +#       define RADEON_SIGNED_RGB_SHIFT      30
 +#       define RADEON_SIGNED_ALPHA_MASK     (1 << 31)
 +#       define RADEON_SIGNED_ALPHA_SHIFT    31
 +#define RADEON_PP_TEX_PITCH_0               0x1d08  /* NPOT */
 +#define RADEON_PP_TEX_PITCH_1               0x1d10  /* NPOT */
 +#define RADEON_PP_TEX_PITCH_2               0x1d18  /* NPOT */
 +/* note: bits 13-5: 32 byte aligned stride of texture map */
 +
 +#define RADEON_PP_TXCBLEND_0                0x1c60
 +#define RADEON_PP_TXCBLEND_1                0x1c78
 +#define RADEON_PP_TXCBLEND_2                0x1c90
 +#       define RADEON_COLOR_ARG_A_SHIFT          0
 +#       define RADEON_COLOR_ARG_A_MASK           (0x1f << 0)
 +#       define RADEON_COLOR_ARG_A_ZERO           (0    << 0)
 +#       define RADEON_COLOR_ARG_A_CURRENT_COLOR  (2    << 0)
 +#       define RADEON_COLOR_ARG_A_CURRENT_ALPHA  (3    << 0)
 +#       define RADEON_COLOR_ARG_A_DIFFUSE_COLOR  (4    << 0)
 +#       define RADEON_COLOR_ARG_A_DIFFUSE_ALPHA  (5    << 0)
 +#       define RADEON_COLOR_ARG_A_SPECULAR_COLOR (6    << 0)
 +#       define RADEON_COLOR_ARG_A_SPECULAR_ALPHA (7    << 0)
 +#       define RADEON_COLOR_ARG_A_TFACTOR_COLOR  (8    << 0)
 +#       define RADEON_COLOR_ARG_A_TFACTOR_ALPHA  (9    << 0)
 +#       define RADEON_COLOR_ARG_A_T0_COLOR       (10   << 0)
 +#       define RADEON_COLOR_ARG_A_T0_ALPHA       (11   << 0)
 +#       define RADEON_COLOR_ARG_A_T1_COLOR       (12   << 0)
 +#       define RADEON_COLOR_ARG_A_T1_ALPHA       (13   << 0)
 +#       define RADEON_COLOR_ARG_A_T2_COLOR       (14   << 0)
 +#       define RADEON_COLOR_ARG_A_T2_ALPHA       (15   << 0)
 +#       define RADEON_COLOR_ARG_A_T3_COLOR       (16   << 0)
 +#       define RADEON_COLOR_ARG_A_T3_ALPHA       (17   << 0)
 +#       define RADEON_COLOR_ARG_B_SHIFT          5
 +#       define RADEON_COLOR_ARG_B_MASK           (0x1f << 5)
 +#       define RADEON_COLOR_ARG_B_ZERO           (0    << 5)
 +#       define RADEON_COLOR_ARG_B_CURRENT_COLOR  (2    << 5)
 +#       define RADEON_COLOR_ARG_B_CURRENT_ALPHA  (3    << 5)
 +#       define RADEON_COLOR_ARG_B_DIFFUSE_COLOR  (4    << 5)
 +#       define RADEON_COLOR_ARG_B_DIFFUSE_ALPHA  (5    << 5)
 +#       define RADEON_COLOR_ARG_B_SPECULAR_COLOR (6    << 5)
 +#       define RADEON_COLOR_ARG_B_SPECULAR_ALPHA (7    << 5)
 +#       define RADEON_COLOR_ARG_B_TFACTOR_COLOR  (8    << 5)
 +#       define RADEON_COLOR_ARG_B_TFACTOR_ALPHA  (9    << 5)
 +#       define RADEON_COLOR_ARG_B_T0_COLOR       (10   << 5)
 +#       define RADEON_COLOR_ARG_B_T0_ALPHA       (11   << 5)
 +#       define RADEON_COLOR_ARG_B_T1_COLOR       (12   << 5)
 +#       define RADEON_COLOR_ARG_B_T1_ALPHA       (13   << 5)
 +#       define RADEON_COLOR_ARG_B_T2_COLOR       (14   << 5)
 +#       define RADEON_COLOR_ARG_B_T2_ALPHA       (15   << 5)
 +#       define RADEON_COLOR_ARG_B_T3_COLOR       (16   << 5)
 +#       define RADEON_COLOR_ARG_B_T3_ALPHA       (17   << 5)
 +#       define RADEON_COLOR_ARG_C_SHIFT          10
 +#       define RADEON_COLOR_ARG_C_MASK           (0x1f << 10)
 +#       define RADEON_COLOR_ARG_C_ZERO           (0    << 10)
 +#       define RADEON_COLOR_ARG_C_CURRENT_COLOR  (2    << 10)
 +#       define RADEON_COLOR_ARG_C_CURRENT_ALPHA  (3    << 10)
 +#       define RADEON_COLOR_ARG_C_DIFFUSE_COLOR  (4    << 10)
 +#       define RADEON_COLOR_ARG_C_DIFFUSE_ALPHA  (5    << 10)
 +#       define RADEON_COLOR_ARG_C_SPECULAR_COLOR (6    << 10)
 +#       define RADEON_COLOR_ARG_C_SPECULAR_ALPHA (7    << 10)
 +#       define RADEON_COLOR_ARG_C_TFACTOR_COLOR  (8    << 10)
 +#       define RADEON_COLOR_ARG_C_TFACTOR_ALPHA  (9    << 10)
 +#       define RADEON_COLOR_ARG_C_T0_COLOR       (10   << 10)
 +#       define RADEON_COLOR_ARG_C_T0_ALPHA       (11   << 10)
 +#       define RADEON_COLOR_ARG_C_T1_COLOR       (12   << 10)
 +#       define RADEON_COLOR_ARG_C_T1_ALPHA       (13   << 10)
 +#       define RADEON_COLOR_ARG_C_T2_COLOR       (14   << 10)
 +#       define RADEON_COLOR_ARG_C_T2_ALPHA       (15   << 10)
 +#       define RADEON_COLOR_ARG_C_T3_COLOR       (16   << 10)
 +#       define RADEON_COLOR_ARG_C_T3_ALPHA       (17   << 10)
 +#       define RADEON_COMP_ARG_A                 (1 << 15)
 +#       define RADEON_COMP_ARG_A_SHIFT           15
 +#       define RADEON_COMP_ARG_B                 (1 << 16)
 +#       define RADEON_COMP_ARG_B_SHIFT           16
 +#       define RADEON_COMP_ARG_C                 (1 << 17)
 +#       define RADEON_COMP_ARG_C_SHIFT           17
 +#       define RADEON_BLEND_CTL_MASK             (7 << 18)
 +#       define RADEON_BLEND_CTL_ADD              (0 << 18)
 +#       define RADEON_BLEND_CTL_SUBTRACT         (1 << 18)
 +#       define RADEON_BLEND_CTL_ADDSIGNED        (2 << 18)
 +#       define RADEON_BLEND_CTL_BLEND            (3 << 18)
 +#       define RADEON_BLEND_CTL_DOT3             (4 << 18)
 +#       define RADEON_SCALE_SHIFT                21
 +#       define RADEON_SCALE_MASK                 (3 << 21)
 +#       define RADEON_SCALE_1X                   (0 << 21)
 +#       define RADEON_SCALE_2X                   (1 << 21)
 +#       define RADEON_SCALE_4X                   (2 << 21)
 +#       define RADEON_CLAMP_TX                   (1 << 23)
 +#       define RADEON_T0_EQ_TCUR                 (1 << 24)
 +#       define RADEON_T1_EQ_TCUR                 (1 << 25)
 +#       define RADEON_T2_EQ_TCUR                 (1 << 26)
 +#       define RADEON_T3_EQ_TCUR                 (1 << 27)
 +#       define RADEON_COLOR_ARG_MASK             0x1f
 +#       define RADEON_COMP_ARG_SHIFT             15
 +#define RADEON_PP_TXABLEND_0                0x1c64
 +#define RADEON_PP_TXABLEND_1                0x1c7c
 +#define RADEON_PP_TXABLEND_2                0x1c94
 +#       define RADEON_ALPHA_ARG_A_SHIFT          0
 +#       define RADEON_ALPHA_ARG_A_MASK           (0xf << 0)
 +#       define RADEON_ALPHA_ARG_A_ZERO           (0   << 0)
 +#       define RADEON_ALPHA_ARG_A_CURRENT_ALPHA  (1   << 0)
 +#       define RADEON_ALPHA_ARG_A_DIFFUSE_ALPHA  (2   << 0)
 +#       define RADEON_ALPHA_ARG_A_SPECULAR_ALPHA (3   << 0)
 +#       define RADEON_ALPHA_ARG_A_TFACTOR_ALPHA  (4   << 0)
 +#       define RADEON_ALPHA_ARG_A_T0_ALPHA       (5   << 0)
 +#       define RADEON_ALPHA_ARG_A_T1_ALPHA       (6   << 0)
 +#       define RADEON_ALPHA_ARG_A_T2_ALPHA       (7   << 0)
 +#       define RADEON_ALPHA_ARG_A_T3_ALPHA       (8   << 0)
 +#       define RADEON_ALPHA_ARG_B_SHIFT          4
 +#       define RADEON_ALPHA_ARG_B_MASK           (0xf << 4)
 +#       define RADEON_ALPHA_ARG_B_ZERO           (0   << 4)
 +#       define RADEON_ALPHA_ARG_B_CURRENT_ALPHA  (1   << 4)
 +#       define RADEON_ALPHA_ARG_B_DIFFUSE_ALPHA  (2   << 4)
 +#       define RADEON_ALPHA_ARG_B_SPECULAR_ALPHA (3   << 4)
 +#       define RADEON_ALPHA_ARG_B_TFACTOR_ALPHA  (4   << 4)
 +#       define RADEON_ALPHA_ARG_B_T0_ALPHA       (5   << 4)
 +#       define RADEON_ALPHA_ARG_B_T1_ALPHA       (6   << 4)
 +#       define RADEON_ALPHA_ARG_B_T2_ALPHA       (7   << 4)
 +#       define RADEON_ALPHA_ARG_B_T3_ALPHA       (8   << 4)
 +#       define RADEON_ALPHA_ARG_C_SHIFT          8
 +#       define RADEON_ALPHA_ARG_C_MASK           (0xf << 8)
 +#       define RADEON_ALPHA_ARG_C_ZERO           (0   << 8)
 +#       define RADEON_ALPHA_ARG_C_CURRENT_ALPHA  (1   << 8)
 +#       define RADEON_ALPHA_ARG_C_DIFFUSE_ALPHA  (2   << 8)
 +#       define RADEON_ALPHA_ARG_C_SPECULAR_ALPHA (3   << 8)
 +#       define RADEON_ALPHA_ARG_C_TFACTOR_ALPHA  (4   << 8)
 +#       define RADEON_ALPHA_ARG_C_T0_ALPHA       (5   << 8)
 +#       define RADEON_ALPHA_ARG_C_T1_ALPHA       (6   << 8)
 +#       define RADEON_ALPHA_ARG_C_T2_ALPHA       (7   << 8)
 +#       define RADEON_ALPHA_ARG_C_T3_ALPHA       (8   << 8)
 +#       define RADEON_DOT_ALPHA_DONT_REPLICATE   (1   << 9)
 +#       define RADEON_ALPHA_ARG_MASK             0xf
 +
 +#define RADEON_PP_TFACTOR_0                 0x1c68
 +#define RADEON_PP_TFACTOR_1                 0x1c80
 +#define RADEON_PP_TFACTOR_2                 0x1c98
 +
 +#define RADEON_RB3D_BLENDCNTL               0x1c20
 +#       define RADEON_COMB_FCN_MASK                    (3  << 12)
 +#       define RADEON_COMB_FCN_ADD_CLAMP               (0  << 12)
 +#       define RADEON_COMB_FCN_ADD_NOCLAMP             (1  << 12)
 +#       define RADEON_COMB_FCN_SUB_CLAMP               (2  << 12)
 +#       define RADEON_COMB_FCN_SUB_NOCLAMP             (3  << 12)
 +#       define RADEON_SRC_BLEND_GL_ZERO                (32 << 16)
 +#       define RADEON_SRC_BLEND_GL_ONE                 (33 << 16)
 +#       define RADEON_SRC_BLEND_GL_SRC_COLOR           (34 << 16)
 +#       define RADEON_SRC_BLEND_GL_ONE_MINUS_SRC_COLOR (35 << 16)
 +#       define RADEON_SRC_BLEND_GL_DST_COLOR           (36 << 16)
 +#       define RADEON_SRC_BLEND_GL_ONE_MINUS_DST_COLOR (37 << 16)
 +#       define RADEON_SRC_BLEND_GL_SRC_ALPHA           (38 << 16)
 +#       define RADEON_SRC_BLEND_GL_ONE_MINUS_SRC_ALPHA (39 << 16)
 +#       define RADEON_SRC_BLEND_GL_DST_ALPHA           (40 << 16)
 +#       define RADEON_SRC_BLEND_GL_ONE_MINUS_DST_ALPHA (41 << 16)
 +#       define RADEON_SRC_BLEND_GL_SRC_ALPHA_SATURATE  (42 << 16)
 +#       define RADEON_SRC_BLEND_MASK                   (63 << 16)
 +#       define RADEON_DST_BLEND_GL_ZERO                (32 << 24)
 +#       define RADEON_DST_BLEND_GL_ONE                 (33 << 24)
 +#       define RADEON_DST_BLEND_GL_SRC_COLOR           (34 << 24)
 +#       define RADEON_DST_BLEND_GL_ONE_MINUS_SRC_COLOR (35 << 24)
 +#       define RADEON_DST_BLEND_GL_DST_COLOR           (36 << 24)
 +#       define RADEON_DST_BLEND_GL_ONE_MINUS_DST_COLOR (37 << 24)
 +#       define RADEON_DST_BLEND_GL_SRC_ALPHA           (38 << 24)
 +#       define RADEON_DST_BLEND_GL_ONE_MINUS_SRC_ALPHA (39 << 24)
 +#       define RADEON_DST_BLEND_GL_DST_ALPHA           (40 << 24)
 +#       define RADEON_DST_BLEND_GL_ONE_MINUS_DST_ALPHA (41 << 24)
 +#       define RADEON_DST_BLEND_MASK                   (63 << 24)
 +#define RADEON_RB3D_CNTL                    0x1c3c
 +#       define RADEON_ALPHA_BLEND_ENABLE       (1  <<  0)
 +#       define RADEON_PLANE_MASK_ENABLE        (1  <<  1)
 +#       define RADEON_DITHER_ENABLE            (1  <<  2)
 +#       define RADEON_ROUND_ENABLE             (1  <<  3)
 +#       define RADEON_SCALE_DITHER_ENABLE      (1  <<  4)
 +#       define RADEON_DITHER_INIT              (1  <<  5)
 +#       define RADEON_ROP_ENABLE               (1  <<  6)
 +#       define RADEON_STENCIL_ENABLE           (1  <<  7)
 +#       define RADEON_Z_ENABLE                 (1  <<  8)
 +#       define RADEON_DEPTH_XZ_OFFEST_ENABLE   (1  <<  9)
 +#       define RADEON_COLOR_FORMAT_ARGB1555    (3  << 10)
 +#       define RADEON_COLOR_FORMAT_RGB565      (4  << 10)
 +#       define RADEON_COLOR_FORMAT_ARGB8888    (6  << 10)
 +#       define RADEON_COLOR_FORMAT_RGB332      (7  << 10)
 +#       define RADEON_COLOR_FORMAT_Y8          (8  << 10)
 +#       define RADEON_COLOR_FORMAT_RGB8        (9  << 10)
 +#       define RADEON_COLOR_FORMAT_YUV422_VYUY (11 << 10)
 +#       define RADEON_COLOR_FORMAT_YUV422_YVYU (12 << 10)
 +#       define RADEON_COLOR_FORMAT_aYUV444     (14 << 10)
 +#       define RADEON_COLOR_FORMAT_ARGB4444    (15 << 10)
 +#       define RADEON_CLRCMP_FLIP_ENABLE       (1  << 14)
 +#define RADEON_RB3D_COLOROFFSET             0x1c40
 +#       define RADEON_COLOROFFSET_MASK      0xfffffff0
 +#define RADEON_RB3D_COLORPITCH              0x1c48
 +#       define RADEON_COLORPITCH_MASK         0x000001ff8
 +#       define RADEON_COLOR_TILE_ENABLE       (1 << 16)
 +#       define RADEON_COLOR_MICROTILE_ENABLE  (1 << 17)
 +#       define RADEON_COLOR_ENDIAN_NO_SWAP    (0 << 18)
 +#       define RADEON_COLOR_ENDIAN_WORD_SWAP  (1 << 18)
 +#       define RADEON_COLOR_ENDIAN_DWORD_SWAP (2 << 18)
 +#define RADEON_RB3D_DEPTHOFFSET             0x1c24
 +#define RADEON_RB3D_DEPTHPITCH              0x1c28
 +#       define RADEON_DEPTHPITCH_MASK         0x00001ff8
 +#       define RADEON_DEPTH_ENDIAN_NO_SWAP    (0 << 18)
 +#       define RADEON_DEPTH_ENDIAN_WORD_SWAP  (1 << 18)
 +#       define RADEON_DEPTH_ENDIAN_DWORD_SWAP (2 << 18)
 +#define RADEON_RB3D_PLANEMASK               0x1d84
 +#define RADEON_RB3D_ROPCNTL                 0x1d80
 +#       define RADEON_ROP_MASK              (15 << 8)
 +#       define RADEON_ROP_CLEAR             (0  << 8)
 +#       define RADEON_ROP_NOR               (1  << 8)
 +#       define RADEON_ROP_AND_INVERTED      (2  << 8)
 +#       define RADEON_ROP_COPY_INVERTED     (3  << 8)
 +#       define RADEON_ROP_AND_REVERSE       (4  << 8)
 +#       define RADEON_ROP_INVERT            (5  << 8)
 +#       define RADEON_ROP_XOR               (6  << 8)
 +#       define RADEON_ROP_NAND              (7  << 8)
 +#       define RADEON_ROP_AND               (8  << 8)
 +#       define RADEON_ROP_EQUIV             (9  << 8)
 +#       define RADEON_ROP_NOOP              (10 << 8)
 +#       define RADEON_ROP_OR_INVERTED       (11 << 8)
 +#       define RADEON_ROP_COPY              (12 << 8)
 +#       define RADEON_ROP_OR_REVERSE        (13 << 8)
 +#       define RADEON_ROP_OR                (14 << 8)
 +#       define RADEON_ROP_SET               (15 << 8)
 +#define RADEON_RB3D_STENCILREFMASK          0x1d7c
 +#       define RADEON_STENCIL_REF_SHIFT       0
 +#       define RADEON_STENCIL_REF_MASK        (0xff << 0)
 +#       define RADEON_STENCIL_MASK_SHIFT      16
 +#       define RADEON_STENCIL_VALUE_MASK      (0xff << 16)
 +#       define RADEON_STENCIL_WRITEMASK_SHIFT 24
 +#       define RADEON_STENCIL_WRITE_MASK      (0xff << 24)
 +#define RADEON_RB3D_ZSTENCILCNTL            0x1c2c
 +#       define RADEON_DEPTH_FORMAT_MASK          (0xf << 0)
 +#       define RADEON_DEPTH_FORMAT_16BIT_INT_Z   (0  <<  0)
 +#       define RADEON_DEPTH_FORMAT_24BIT_INT_Z   (2  <<  0)
 +#       define RADEON_DEPTH_FORMAT_24BIT_FLOAT_Z (3  <<  0)
 +#       define RADEON_DEPTH_FORMAT_32BIT_INT_Z   (4  <<  0)
 +#       define RADEON_DEPTH_FORMAT_32BIT_FLOAT_Z (5  <<  0)
 +#       define RADEON_DEPTH_FORMAT_16BIT_FLOAT_W (7  <<  0)
 +#       define RADEON_DEPTH_FORMAT_24BIT_FLOAT_W (9  <<  0)
 +#       define RADEON_DEPTH_FORMAT_32BIT_FLOAT_W (11 <<  0)
 +#       define RADEON_Z_TEST_NEVER               (0  <<  4)
 +#       define RADEON_Z_TEST_LESS                (1  <<  4)
 +#       define RADEON_Z_TEST_LEQUAL              (2  <<  4)
 +#       define RADEON_Z_TEST_EQUAL               (3  <<  4)
 +#       define RADEON_Z_TEST_GEQUAL              (4  <<  4)
 +#       define RADEON_Z_TEST_GREATER             (5  <<  4)
 +#       define RADEON_Z_TEST_NEQUAL              (6  <<  4)
 +#       define RADEON_Z_TEST_ALWAYS              (7  <<  4)
 +#       define RADEON_Z_TEST_MASK                (7  <<  4)
 +#       define RADEON_STENCIL_TEST_NEVER         (0  << 12)
 +#       define RADEON_STENCIL_TEST_LESS          (1  << 12)
 +#       define RADEON_STENCIL_TEST_LEQUAL        (2  << 12)
 +#       define RADEON_STENCIL_TEST_EQUAL         (3  << 12)
 +#       define RADEON_STENCIL_TEST_GEQUAL        (4  << 12)
 +#       define RADEON_STENCIL_TEST_GREATER       (5  << 12)
 +#       define RADEON_STENCIL_TEST_NEQUAL        (6  << 12)
 +#       define RADEON_STENCIL_TEST_ALWAYS        (7  << 12)
 +#       define RADEON_STENCIL_TEST_MASK          (0x7 << 12)
 +#       define RADEON_STENCIL_FAIL_KEEP          (0  << 16)
 +#       define RADEON_STENCIL_FAIL_ZERO          (1  << 16)
 +#       define RADEON_STENCIL_FAIL_REPLACE       (2  << 16)
 +#       define RADEON_STENCIL_FAIL_INC           (3  << 16)
 +#       define RADEON_STENCIL_FAIL_DEC           (4  << 16)
 +#       define RADEON_STENCIL_FAIL_INVERT        (5  << 16)
 +#       define RADEON_STENCIL_FAIL_MASK          (0x7 << 16)
 +#       define RADEON_STENCIL_ZPASS_KEEP         (0  << 20)
 +#       define RADEON_STENCIL_ZPASS_ZERO         (1  << 20)
 +#       define RADEON_STENCIL_ZPASS_REPLACE      (2  << 20)
 +#       define RADEON_STENCIL_ZPASS_INC          (3  << 20)
 +#       define RADEON_STENCIL_ZPASS_DEC          (4  << 20)
 +#       define RADEON_STENCIL_ZPASS_INVERT       (5  << 20)
 +#       define RADEON_STENCIL_ZPASS_MASK         (0x7 << 20)
 +#       define RADEON_STENCIL_ZFAIL_KEEP         (0  << 24)
 +#       define RADEON_STENCIL_ZFAIL_ZERO         (1  << 24)
 +#       define RADEON_STENCIL_ZFAIL_REPLACE      (2  << 24)
 +#       define RADEON_STENCIL_ZFAIL_INC          (3  << 24)
 +#       define RADEON_STENCIL_ZFAIL_DEC          (4  << 24)
 +#       define RADEON_STENCIL_ZFAIL_INVERT       (5  << 24)
 +#       define RADEON_STENCIL_ZFAIL_MASK         (0x7 << 24)
 +#       define RADEON_Z_COMPRESSION_ENABLE       (1  << 28)
 +#       define RADEON_FORCE_Z_DIRTY              (1  << 29)
 +#       define RADEON_Z_WRITE_ENABLE             (1  << 30)
 +#define RADEON_RE_LINE_PATTERN              0x1cd0
 +#       define RADEON_LINE_PATTERN_MASK             0x0000ffff
 +#       define RADEON_LINE_REPEAT_COUNT_SHIFT       16
 +#       define RADEON_LINE_PATTERN_START_SHIFT      24
 +#       define RADEON_LINE_PATTERN_LITTLE_BIT_ORDER (0 << 28)
 +#       define RADEON_LINE_PATTERN_BIG_BIT_ORDER    (1 << 28)
 +#       define RADEON_LINE_PATTERN_AUTO_RESET       (1 << 29)
 +#define RADEON_RE_LINE_STATE                0x1cd4
 +#       define RADEON_LINE_CURRENT_PTR_SHIFT   0
 +#       define RADEON_LINE_CURRENT_COUNT_SHIFT 8
 +#define RADEON_RE_MISC                      0x26c4
 +#       define RADEON_STIPPLE_COORD_MASK       0x1f
 +#       define RADEON_STIPPLE_X_OFFSET_SHIFT   0
 +#       define RADEON_STIPPLE_X_OFFSET_MASK    (0x1f << 0)
 +#       define RADEON_STIPPLE_Y_OFFSET_SHIFT   8
 +#       define RADEON_STIPPLE_Y_OFFSET_MASK    (0x1f << 8)
 +#       define RADEON_STIPPLE_LITTLE_BIT_ORDER (0 << 16)
 +#       define RADEON_STIPPLE_BIG_BIT_ORDER    (1 << 16)
 +#define RADEON_RE_SOLID_COLOR               0x1c1c
 +#define RADEON_RE_TOP_LEFT                  0x26c0
 +#       define RADEON_RE_LEFT_SHIFT         0
 +#       define RADEON_RE_TOP_SHIFT          16
 +#define RADEON_RE_WIDTH_HEIGHT              0x1c44
 +#       define RADEON_RE_WIDTH_SHIFT        0
 +#       define RADEON_RE_HEIGHT_SHIFT       16
 +
 +#define RADEON_SE_CNTL                      0x1c4c
 +#       define RADEON_FFACE_CULL_CW          (0 <<  0)
 +#       define RADEON_FFACE_CULL_CCW         (1 <<  0)
 +#       define RADEON_FFACE_CULL_DIR_MASK    (1 <<  0)
 +#       define RADEON_BFACE_CULL             (0 <<  1)
 +#       define RADEON_BFACE_SOLID            (3 <<  1)
 +#       define RADEON_FFACE_CULL             (0 <<  3)
 +#       define RADEON_FFACE_SOLID            (3 <<  3)
 +#       define RADEON_FFACE_CULL_MASK        (3 <<  3)
 +#       define RADEON_BADVTX_CULL_DISABLE    (1 <<  5)
 +#       define RADEON_FLAT_SHADE_VTX_0       (0 <<  6)
 +#       define RADEON_FLAT_SHADE_VTX_1       (1 <<  6)
 +#       define RADEON_FLAT_SHADE_VTX_2       (2 <<  6)
 +#       define RADEON_FLAT_SHADE_VTX_LAST    (3 <<  6)
 +#       define RADEON_DIFFUSE_SHADE_SOLID    (0 <<  8)
 +#       define RADEON_DIFFUSE_SHADE_FLAT     (1 <<  8)
 +#       define RADEON_DIFFUSE_SHADE_GOURAUD  (2 <<  8)
 +#       define RADEON_DIFFUSE_SHADE_MASK     (3 <<  8)
 +#       define RADEON_ALPHA_SHADE_SOLID      (0 << 10)
 +#       define RADEON_ALPHA_SHADE_FLAT       (1 << 10)
 +#       define RADEON_ALPHA_SHADE_GOURAUD    (2 << 10)
 +#       define RADEON_ALPHA_SHADE_MASK       (3 << 10)
 +#       define RADEON_SPECULAR_SHADE_SOLID   (0 << 12)
 +#       define RADEON_SPECULAR_SHADE_FLAT    (1 << 12)
 +#       define RADEON_SPECULAR_SHADE_GOURAUD (2 << 12)
 +#       define RADEON_SPECULAR_SHADE_MASK    (3 << 12)
 +#       define RADEON_FOG_SHADE_SOLID        (0 << 14)
 +#       define RADEON_FOG_SHADE_FLAT         (1 << 14)
 +#       define RADEON_FOG_SHADE_GOURAUD      (2 << 14)
 +#       define RADEON_FOG_SHADE_MASK         (3 << 14)
 +#       define RADEON_ZBIAS_ENABLE_POINT     (1 << 16)
 +#       define RADEON_ZBIAS_ENABLE_LINE      (1 << 17)
 +#       define RADEON_ZBIAS_ENABLE_TRI       (1 << 18)
 +#       define RADEON_WIDELINE_ENABLE        (1 << 20)
 +#       define RADEON_VPORT_XY_XFORM_ENABLE  (1 << 24)
 +#       define RADEON_VPORT_Z_XFORM_ENABLE   (1 << 25)
 +#       define RADEON_VTX_PIX_CENTER_D3D     (0 << 27)
 +#       define RADEON_VTX_PIX_CENTER_OGL     (1 << 27)
 +#       define RADEON_ROUND_MODE_TRUNC       (0 << 28)
 +#       define RADEON_ROUND_MODE_ROUND       (1 << 28)
 +#       define RADEON_ROUND_MODE_ROUND_EVEN  (2 << 28)
 +#       define RADEON_ROUND_MODE_ROUND_ODD   (3 << 28)
 +#       define RADEON_ROUND_PREC_16TH_PIX    (0 << 30)
 +#       define RADEON_ROUND_PREC_8TH_PIX     (1 << 30)
 +#       define RADEON_ROUND_PREC_4TH_PIX     (2 << 30)
 +#       define RADEON_ROUND_PREC_HALF_PIX    (3 << 30)
 +#define R200_RE_CNTL                          0x1c50 
 +#       define R200_STIPPLE_ENABLE            0x1
 +#       define R200_SCISSOR_ENABLE            0x2
 +#       define R200_PATTERN_ENABLE            0x4
 +#       define R200_PERSPECTIVE_ENABLE                0x8
 +#       define R200_POINT_SMOOTH              0x20
 +#       define R200_VTX_STQ0_D3D              0x00010000
 +#       define R200_VTX_STQ1_D3D              0x00040000
 +#       define R200_VTX_STQ2_D3D              0x00100000
 +#       define R200_VTX_STQ3_D3D              0x00400000
 +#       define R200_VTX_STQ4_D3D              0x01000000
 +#       define R200_VTX_STQ5_D3D              0x04000000
 +#define RADEON_SE_CNTL_STATUS               0x2140
 +#       define RADEON_VC_NO_SWAP            (0 << 0)
 +#       define RADEON_VC_16BIT_SWAP         (1 << 0)
 +#       define RADEON_VC_32BIT_SWAP         (2 << 0)
 +#       define RADEON_VC_HALF_DWORD_SWAP    (3 << 0)
 +#       define RADEON_TCL_BYPASS            (1 << 8)
 +#define RADEON_SE_COORD_FMT                 0x1c50
 +#       define RADEON_VTX_XY_PRE_MULT_1_OVER_W0  (1 <<  0)
 +#       define RADEON_VTX_Z_PRE_MULT_1_OVER_W0   (1 <<  1)
 +#       define RADEON_VTX_ST0_NONPARAMETRIC      (1 <<  8)
 +#       define RADEON_VTX_ST1_NONPARAMETRIC      (1 <<  9)
 +#       define RADEON_VTX_ST2_NONPARAMETRIC      (1 << 10)
 +#       define RADEON_VTX_ST3_NONPARAMETRIC      (1 << 11)
 +#       define RADEON_VTX_W0_NORMALIZE           (1 << 12)
 +#       define RADEON_VTX_W0_IS_NOT_1_OVER_W0    (1 << 16)
 +#       define RADEON_VTX_ST0_PRE_MULT_1_OVER_W0 (1 << 17)
 +#       define RADEON_VTX_ST1_PRE_MULT_1_OVER_W0 (1 << 19)
 +#       define RADEON_VTX_ST2_PRE_MULT_1_OVER_W0 (1 << 21)
 +#       define RADEON_VTX_ST3_PRE_MULT_1_OVER_W0 (1 << 23)
 +#       define RADEON_TEX1_W_ROUTING_USE_W0      (0 << 26)
 +#       define RADEON_TEX1_W_ROUTING_USE_Q1      (1 << 26)
 +#define RADEON_SE_LINE_WIDTH                0x1db8
 +#define RADEON_SE_TCL_LIGHT_MODEL_CTL       0x226c
 +#       define RADEON_LIGHTING_ENABLE              (1 << 0)
 +#       define RADEON_LIGHT_IN_MODELSPACE          (1 << 1)
 +#       define RADEON_LOCAL_VIEWER                 (1 << 2)
 +#       define RADEON_NORMALIZE_NORMALS            (1 << 3)
 +#       define RADEON_RESCALE_NORMALS              (1 << 4)
 +#       define RADEON_SPECULAR_LIGHTS              (1 << 5)
 +#       define RADEON_DIFFUSE_SPECULAR_COMBINE     (1 << 6)
 +#       define RADEON_LIGHT_ALPHA                  (1 << 7)
 +#       define RADEON_LOCAL_LIGHT_VEC_GL           (1 << 8)
 +#       define RADEON_LIGHT_NO_NORMAL_AMBIENT_ONLY (1 << 9)
 +#       define RADEON_LM_SOURCE_STATE_PREMULT      0
 +#       define RADEON_LM_SOURCE_STATE_MULT         1
 +#       define RADEON_LM_SOURCE_VERTEX_DIFFUSE     2
 +#       define RADEON_LM_SOURCE_VERTEX_SPECULAR    3
 +#       define RADEON_EMISSIVE_SOURCE_SHIFT        16
 +#       define RADEON_AMBIENT_SOURCE_SHIFT         18
 +#       define RADEON_DIFFUSE_SOURCE_SHIFT         20
 +#       define RADEON_SPECULAR_SOURCE_SHIFT        22
 +#define RADEON_SE_TCL_MATERIAL_AMBIENT_RED     0x2220
 +#define RADEON_SE_TCL_MATERIAL_AMBIENT_GREEN   0x2224
 +#define RADEON_SE_TCL_MATERIAL_AMBIENT_BLUE    0x2228
 +#define RADEON_SE_TCL_MATERIAL_AMBIENT_ALPHA   0x222c
 +#define RADEON_SE_TCL_MATERIAL_DIFFUSE_RED     0x2230
 +#define RADEON_SE_TCL_MATERIAL_DIFFUSE_GREEN   0x2234
 +#define RADEON_SE_TCL_MATERIAL_DIFFUSE_BLUE    0x2238
 +#define RADEON_SE_TCL_MATERIAL_DIFFUSE_ALPHA   0x223c
 +#define RADEON_SE_TCL_MATERIAL_EMMISSIVE_RED   0x2210
 +#define RADEON_SE_TCL_MATERIAL_EMMISSIVE_GREEN 0x2214
 +#define RADEON_SE_TCL_MATERIAL_EMMISSIVE_BLUE  0x2218
 +#define RADEON_SE_TCL_MATERIAL_EMMISSIVE_ALPHA 0x221c
 +#define RADEON_SE_TCL_MATERIAL_SPECULAR_RED    0x2240
 +#define RADEON_SE_TCL_MATERIAL_SPECULAR_GREEN  0x2244
 +#define RADEON_SE_TCL_MATERIAL_SPECULAR_BLUE   0x2248
 +#define RADEON_SE_TCL_MATERIAL_SPECULAR_ALPHA  0x224c
 +#define RADEON_SE_TCL_MATRIX_SELECT_0       0x225c
 +#       define RADEON_MODELVIEW_0_SHIFT        0
 +#       define RADEON_MODELVIEW_1_SHIFT        4
 +#       define RADEON_MODELVIEW_2_SHIFT        8
 +#       define RADEON_MODELVIEW_3_SHIFT        12
 +#       define RADEON_IT_MODELVIEW_0_SHIFT     16
 +#       define RADEON_IT_MODELVIEW_1_SHIFT     20
 +#       define RADEON_IT_MODELVIEW_2_SHIFT     24
 +#       define RADEON_IT_MODELVIEW_3_SHIFT     28
 +#define RADEON_SE_TCL_MATRIX_SELECT_1       0x2260
 +#       define RADEON_MODELPROJECT_0_SHIFT     0
 +#       define RADEON_MODELPROJECT_1_SHIFT     4
 +#       define RADEON_MODELPROJECT_2_SHIFT     8
 +#       define RADEON_MODELPROJECT_3_SHIFT     12
 +#       define RADEON_TEXMAT_0_SHIFT           16
 +#       define RADEON_TEXMAT_1_SHIFT           20
 +#       define RADEON_TEXMAT_2_SHIFT           24
 +#       define RADEON_TEXMAT_3_SHIFT           28
 +
 +
 +#define RADEON_SE_TCL_OUTPUT_VTX_FMT        0x2254
 +#       define RADEON_TCL_VTX_W0                 (1 <<  0)
 +#       define RADEON_TCL_VTX_FP_DIFFUSE         (1 <<  1)
 +#       define RADEON_TCL_VTX_FP_ALPHA           (1 <<  2)
 +#       define RADEON_TCL_VTX_PK_DIFFUSE         (1 <<  3)
 +#       define RADEON_TCL_VTX_FP_SPEC            (1 <<  4)
 +#       define RADEON_TCL_VTX_FP_FOG             (1 <<  5)
 +#       define RADEON_TCL_VTX_PK_SPEC            (1 <<  6)
 +#       define RADEON_TCL_VTX_ST0                (1 <<  7)
 +#       define RADEON_TCL_VTX_ST1                (1 <<  8)
 +#       define RADEON_TCL_VTX_Q1                 (1 <<  9)
 +#       define RADEON_TCL_VTX_ST2                (1 << 10)
 +#       define RADEON_TCL_VTX_Q2                 (1 << 11)
 +#       define RADEON_TCL_VTX_ST3                (1 << 12)
 +#       define RADEON_TCL_VTX_Q3                 (1 << 13)
 +#       define RADEON_TCL_VTX_Q0                 (1 << 14)
 +#       define RADEON_TCL_VTX_WEIGHT_COUNT_SHIFT 15
 +#       define RADEON_TCL_VTX_NORM0              (1 << 18)
 +#       define RADEON_TCL_VTX_XY1                (1 << 27)
 +#       define RADEON_TCL_VTX_Z1                 (1 << 28)
 +#       define RADEON_TCL_VTX_W1                 (1 << 29)
 +#       define RADEON_TCL_VTX_NORM1              (1 << 30)
 +#       define RADEON_TCL_VTX_Z0                 (1 << 31)
 +
 +#define RADEON_SE_TCL_OUTPUT_VTX_SEL        0x2258
 +#       define RADEON_TCL_COMPUTE_XYZW           (1 << 0)
 +#       define RADEON_TCL_COMPUTE_DIFFUSE        (1 << 1)
 +#       define RADEON_TCL_COMPUTE_SPECULAR       (1 << 2)
 +#       define RADEON_TCL_FORCE_NAN_IF_COLOR_NAN (1 << 3)
 +#       define RADEON_TCL_FORCE_INORDER_PROC     (1 << 4)
 +#       define RADEON_TCL_TEX_INPUT_TEX_0        0
 +#       define RADEON_TCL_TEX_INPUT_TEX_1        1
 +#       define RADEON_TCL_TEX_INPUT_TEX_2        2
 +#       define RADEON_TCL_TEX_INPUT_TEX_3        3
 +#       define RADEON_TCL_TEX_COMPUTED_TEX_0     8
 +#       define RADEON_TCL_TEX_COMPUTED_TEX_1     9
 +#       define RADEON_TCL_TEX_COMPUTED_TEX_2     10
 +#       define RADEON_TCL_TEX_COMPUTED_TEX_3     11
 +#       define RADEON_TCL_TEX_0_OUTPUT_SHIFT     16
 +#       define RADEON_TCL_TEX_1_OUTPUT_SHIFT     20
 +#       define RADEON_TCL_TEX_2_OUTPUT_SHIFT     24
 +#       define RADEON_TCL_TEX_3_OUTPUT_SHIFT     28
 +
 +#define RADEON_SE_TCL_PER_LIGHT_CTL_0       0x2270
 +#       define RADEON_LIGHT_0_ENABLE               (1 <<  0)
 +#       define RADEON_LIGHT_0_ENABLE_AMBIENT       (1 <<  1)
 +#       define RADEON_LIGHT_0_ENABLE_SPECULAR      (1 <<  2)
 +#       define RADEON_LIGHT_0_IS_LOCAL             (1 <<  3)
 +#       define RADEON_LIGHT_0_IS_SPOT              (1 <<  4)
 +#       define RADEON_LIGHT_0_DUAL_CONE            (1 <<  5)
 +#       define RADEON_LIGHT_0_ENABLE_RANGE_ATTEN   (1 <<  6)
 +#       define RADEON_LIGHT_0_CONSTANT_RANGE_ATTEN (1 <<  7)
 +#       define RADEON_LIGHT_0_SHIFT                0
 +#       define RADEON_LIGHT_1_ENABLE               (1 << 16)
 +#       define RADEON_LIGHT_1_ENABLE_AMBIENT       (1 << 17)
 +#       define RADEON_LIGHT_1_ENABLE_SPECULAR      (1 << 18)
 +#       define RADEON_LIGHT_1_IS_LOCAL             (1 << 19)
 +#       define RADEON_LIGHT_1_IS_SPOT              (1 << 20)
 +#       define RADEON_LIGHT_1_DUAL_CONE            (1 << 21)
 +#       define RADEON_LIGHT_1_ENABLE_RANGE_ATTEN   (1 << 22)
 +#       define RADEON_LIGHT_1_CONSTANT_RANGE_ATTEN (1 << 23)
 +#       define RADEON_LIGHT_1_SHIFT                16
 +#define RADEON_SE_TCL_PER_LIGHT_CTL_1       0x2274
 +#       define RADEON_LIGHT_2_SHIFT            0
 +#       define RADEON_LIGHT_3_SHIFT            16
 +#define RADEON_SE_TCL_PER_LIGHT_CTL_2       0x2278
 +#       define RADEON_LIGHT_4_SHIFT            0
 +#       define RADEON_LIGHT_5_SHIFT            16
 +#define RADEON_SE_TCL_PER_LIGHT_CTL_3       0x227c
 +#       define RADEON_LIGHT_6_SHIFT            0
 +#       define RADEON_LIGHT_7_SHIFT            16
 +
 +#define RADEON_SE_TCL_SHININESS             0x2250
 +
 +#define RADEON_SE_TCL_TEXTURE_PROC_CTL      0x2268
 +#       define RADEON_TEXGEN_TEXMAT_0_ENABLE      (1 << 0)
 +#       define RADEON_TEXGEN_TEXMAT_1_ENABLE      (1 << 1)
 +#       define RADEON_TEXGEN_TEXMAT_2_ENABLE      (1 << 2)
 +#       define RADEON_TEXGEN_TEXMAT_3_ENABLE      (1 << 3)
 +#       define RADEON_TEXMAT_0_ENABLE             (1 << 4)
 +#       define RADEON_TEXMAT_1_ENABLE             (1 << 5)
 +#       define RADEON_TEXMAT_2_ENABLE             (1 << 6)
 +#       define RADEON_TEXMAT_3_ENABLE             (1 << 7)
 +#       define RADEON_TEXGEN_INPUT_MASK           0xf
 +#       define RADEON_TEXGEN_INPUT_TEXCOORD_0     0
 +#       define RADEON_TEXGEN_INPUT_TEXCOORD_1     1
 +#       define RADEON_TEXGEN_INPUT_TEXCOORD_2     2
 +#       define RADEON_TEXGEN_INPUT_TEXCOORD_3     3
 +#       define RADEON_TEXGEN_INPUT_OBJ            4
 +#       define RADEON_TEXGEN_INPUT_EYE            5
 +#       define RADEON_TEXGEN_INPUT_EYE_NORMAL     6
 +#       define RADEON_TEXGEN_INPUT_EYE_REFLECT    7
 +#       define RADEON_TEXGEN_INPUT_EYE_NORMALIZED 8
 +#       define RADEON_TEXGEN_0_INPUT_SHIFT        16
 +#       define RADEON_TEXGEN_1_INPUT_SHIFT        20
 +#       define RADEON_TEXGEN_2_INPUT_SHIFT        24
 +#       define RADEON_TEXGEN_3_INPUT_SHIFT        28
 +
 +#define RADEON_SE_TCL_UCP_VERT_BLEND_CTL    0x2264
 +#       define RADEON_UCP_IN_CLIP_SPACE            (1 <<  0)
 +#       define RADEON_UCP_IN_MODEL_SPACE           (1 <<  1)
 +#       define RADEON_UCP_ENABLE_0                 (1 <<  2)
 +#       define RADEON_UCP_ENABLE_1                 (1 <<  3)
 +#       define RADEON_UCP_ENABLE_2                 (1 <<  4)
 +#       define RADEON_UCP_ENABLE_3                 (1 <<  5)
 +#       define RADEON_UCP_ENABLE_4                 (1 <<  6)
 +#       define RADEON_UCP_ENABLE_5                 (1 <<  7)
 +#       define RADEON_TCL_FOG_MASK                 (3 <<  8)
 +#       define RADEON_TCL_FOG_DISABLE              (0 <<  8)
 +#       define RADEON_TCL_FOG_EXP                  (1 <<  8)
 +#       define RADEON_TCL_FOG_EXP2                 (2 <<  8)
 +#       define RADEON_TCL_FOG_LINEAR               (3 <<  8)
 +#       define RADEON_RNG_BASED_FOG                (1 << 10)
 +#       define RADEON_LIGHT_TWOSIDE                (1 << 11)
 +#       define RADEON_BLEND_OP_COUNT_MASK          (7 << 12)
 +#       define RADEON_BLEND_OP_COUNT_SHIFT         12
 +#       define RADEON_POSITION_BLEND_OP_ENABLE     (1 << 16)
 +#       define RADEON_NORMAL_BLEND_OP_ENABLE       (1 << 17)
 +#       define RADEON_VERTEX_BLEND_SRC_0_PRIMARY   (1 << 18)
 +#       define RADEON_VERTEX_BLEND_SRC_0_SECONDARY (1 << 18)
 +#       define RADEON_VERTEX_BLEND_SRC_1_PRIMARY   (1 << 19)
 +#       define RADEON_VERTEX_BLEND_SRC_1_SECONDARY (1 << 19)
 +#       define RADEON_VERTEX_BLEND_SRC_2_PRIMARY   (1 << 20)
 +#       define RADEON_VERTEX_BLEND_SRC_2_SECONDARY (1 << 20)
 +#       define RADEON_VERTEX_BLEND_SRC_3_PRIMARY   (1 << 21)
 +#       define RADEON_VERTEX_BLEND_SRC_3_SECONDARY (1 << 21)
 +#       define RADEON_VERTEX_BLEND_WGT_MINUS_ONE   (1 << 22)
 +#       define RADEON_CULL_FRONT_IS_CW             (0 << 28)
 +#       define RADEON_CULL_FRONT_IS_CCW            (1 << 28)
 +#       define RADEON_CULL_FRONT                   (1 << 29)
 +#       define RADEON_CULL_BACK                    (1 << 30)
 +#       define RADEON_FORCE_W_TO_ONE               (1 << 31)
 +
 +#define RADEON_SE_VPORT_XSCALE              0x1d98
 +#define RADEON_SE_VPORT_XOFFSET             0x1d9c
 +#define RADEON_SE_VPORT_YSCALE              0x1da0
 +#define RADEON_SE_VPORT_YOFFSET             0x1da4
 +#define RADEON_SE_VPORT_ZSCALE              0x1da8
 +#define RADEON_SE_VPORT_ZOFFSET             0x1dac
 +#define RADEON_SE_ZBIAS_FACTOR              0x1db0
 +#define RADEON_SE_ZBIAS_CONSTANT            0x1db4
 +
 +#define RADEON_SE_VTX_FMT                   0x2080
 +#       define RADEON_SE_VTX_FMT_XY         0x00000000
 +#       define RADEON_SE_VTX_FMT_W0         0x00000001
 +#       define RADEON_SE_VTX_FMT_FPCOLOR    0x00000002
 +#       define RADEON_SE_VTX_FMT_FPALPHA    0x00000004
 +#       define RADEON_SE_VTX_FMT_PKCOLOR    0x00000008
 +#       define RADEON_SE_VTX_FMT_FPSPEC     0x00000010
 +#       define RADEON_SE_VTX_FMT_FPFOG      0x00000020
 +#       define RADEON_SE_VTX_FMT_PKSPEC     0x00000040
 +#       define RADEON_SE_VTX_FMT_ST0        0x00000080
 +#       define RADEON_SE_VTX_FMT_ST1        0x00000100
 +#       define RADEON_SE_VTX_FMT_Q1         0x00000200
 +#       define RADEON_SE_VTX_FMT_ST2        0x00000400
 +#       define RADEON_SE_VTX_FMT_Q2         0x00000800
 +#       define RADEON_SE_VTX_FMT_ST3        0x00001000
 +#       define RADEON_SE_VTX_FMT_Q3         0x00002000
 +#       define RADEON_SE_VTX_FMT_Q0         0x00004000
 +#       define RADEON_SE_VTX_FMT_BLND_WEIGHT_CNT_MASK  0x00038000
 +#       define RADEON_SE_VTX_FMT_N0         0x00040000
 +#       define RADEON_SE_VTX_FMT_XY1        0x08000000
 +#       define RADEON_SE_VTX_FMT_Z1         0x10000000
 +#       define RADEON_SE_VTX_FMT_W1         0x20000000
 +#       define RADEON_SE_VTX_FMT_N1         0x40000000
 +#       define RADEON_SE_VTX_FMT_Z          0x80000000
 +
 +#define RADEON_SE_VF_CNTL                             0x2084
 +#       define RADEON_VF_PRIM_TYPE_POINT_LIST         1
 +#       define RADEON_VF_PRIM_TYPE_LINE_LIST          2
 +#       define RADEON_VF_PRIM_TYPE_LINE_STRIP         3
 +#       define RADEON_VF_PRIM_TYPE_TRIANGLE_LIST      4
 +#       define RADEON_VF_PRIM_TYPE_TRIANGLE_FAN       5
 +#       define RADEON_VF_PRIM_TYPE_TRIANGLE_STRIP     6
 +#       define RADEON_VF_PRIM_TYPE_TRIANGLE_FLAG      7
 +#       define RADEON_VF_PRIM_TYPE_RECTANGLE_LIST     8
 +#       define RADEON_VF_PRIM_TYPE_POINT_LIST_3       9
 +#       define RADEON_VF_PRIM_TYPE_LINE_LIST_3        10
 +#       define RADEON_VF_PRIM_TYPE_SPIRIT_LIST        11
 +#       define RADEON_VF_PRIM_TYPE_LINE_LOOP          12
 +#       define RADEON_VF_PRIM_TYPE_QUAD_LIST          13
 +#       define RADEON_VF_PRIM_TYPE_QUAD_STRIP         14
 +#       define RADEON_VF_PRIM_TYPE_POLYGON            15
 +#       define RADEON_VF_PRIM_WALK_STATE              (0<<4)
 +#       define RADEON_VF_PRIM_WALK_INDEX              (1<<4)
 +#       define RADEON_VF_PRIM_WALK_LIST               (2<<4)
 +#       define RADEON_VF_PRIM_WALK_DATA               (3<<4)
 +#       define RADEON_VF_COLOR_ORDER_RGBA             (1<<6)
 +#       define RADEON_VF_RADEON_MODE                  (1<<8)
 +#       define RADEON_VF_TCL_OUTPUT_CTL_ENA           (1<<9)
 +#       define RADEON_VF_PROG_STREAM_ENA              (1<<10)
 +#       define RADEON_VF_INDEX_SIZE_SHIFT             11
 +#       define RADEON_VF_NUM_VERTICES_SHIFT           16
 +
 +#define RADEON_SE_PORT_DATA0                  0x2000
 + 
 +#define R200_SE_VAP_CNTL                      0x2080
 +#       define R200_VAP_TCL_ENABLE            0x00000001
 +#       define R200_VAP_SINGLE_BUF_STATE_ENABLE       0x00000010
 +#       define R200_VAP_FORCE_W_TO_ONE                0x00010000
 +#       define R200_VAP_D3D_TEX_DEFAULT               0x00020000
 +#       define R200_VAP_VF_MAX_VTX_NUM__SHIFT 18
 +#       define R200_VAP_VF_MAX_VTX_NUM                (9 << 18)
 +#       define R200_VAP_DX_CLIP_SPACE_DEF     0x00400000
 +#define R200_VF_MAX_VTX_INDX                  0x210c
 +#define R200_VF_MIN_VTX_INDX                  0x2110
 +#define R200_SE_VTE_CNTL                      0x20b0
 +#       define R200_VPORT_X_SCALE_ENA                 0x00000001
 +#       define R200_VPORT_X_OFFSET_ENA                        0x00000002
 +#       define R200_VPORT_Y_SCALE_ENA                 0x00000004
 +#       define R200_VPORT_Y_OFFSET_ENA                        0x00000008
 +#       define R200_VPORT_Z_SCALE_ENA                 0x00000010
 +#       define R200_VPORT_Z_OFFSET_ENA                        0x00000020
 +#       define R200_VTX_XY_FMT                                0x00000100
 +#       define R200_VTX_Z_FMT                         0x00000200
 +#       define R200_VTX_W0_FMT                                0x00000400
 +#       define R200_VTX_W0_NORMALIZE                  0x00000800
 +#       define R200_VTX_ST_DENORMALIZED               0x00001000
 +#define R200_SE_VAP_CNTL_STATUS                       0x2140
 +#       define R200_VC_NO_SWAP                        (0 << 0)
 +#       define R200_VC_16BIT_SWAP             (1 << 0)
 +#       define R200_VC_32BIT_SWAP             (2 << 0)
 +#define R200_PP_TXFILTER_0                    0x2c00 
 +#define R200_PP_TXFILTER_1                    0x2c20
 +#define R200_PP_TXFILTER_2                    0x2c40
 +#define R200_PP_TXFILTER_3                    0x2c60
 +#define R200_PP_TXFILTER_4                    0x2c80
 +#define R200_PP_TXFILTER_5                    0x2ca0
 +#       define R200_MAG_FILTER_NEAREST                (0  <<  0)
 +#       define R200_MAG_FILTER_LINEAR         (1  <<  0)
 +#       define R200_MAG_FILTER_MASK           (1  <<  0)
 +#       define R200_MIN_FILTER_NEAREST                (0  <<  1)
 +#       define R200_MIN_FILTER_LINEAR         (1  <<  1)
 +#       define R200_MIN_FILTER_NEAREST_MIP_NEAREST (2  <<  1)
 +#       define R200_MIN_FILTER_NEAREST_MIP_LINEAR (3  <<  1)
 +#       define R200_MIN_FILTER_LINEAR_MIP_NEAREST (6  <<  1)
 +#       define R200_MIN_FILTER_LINEAR_MIP_LINEAR (7  <<  1)
 +#       define R200_MIN_FILTER_ANISO_NEAREST  (8  <<  1)
 +#       define R200_MIN_FILTER_ANISO_LINEAR   (9  <<  1)
 +#       define R200_MIN_FILTER_ANISO_NEAREST_MIP_NEAREST (10 <<  1)
 +#       define R200_MIN_FILTER_ANISO_NEAREST_MIP_LINEAR (11 <<  1)
 +#       define R200_MIN_FILTER_MASK           (15 <<  1)
 +#       define R200_MAX_ANISO_1_TO_1          (0  <<  5)
 +#       define R200_MAX_ANISO_2_TO_1          (1  <<  5)
 +#       define R200_MAX_ANISO_4_TO_1          (2  <<  5)
 +#       define R200_MAX_ANISO_8_TO_1          (3  <<  5)
 +#       define R200_MAX_ANISO_16_TO_1         (4  <<  5)
 +#       define R200_MAX_ANISO_MASK            (7  <<  5)
 +#       define R200_MAX_MIP_LEVEL_MASK                (0x0f << 16)
 +#       define R200_MAX_MIP_LEVEL_SHIFT               16
 +#       define R200_YUV_TO_RGB                        (1  << 20)
 +#       define R200_YUV_TEMPERATURE_COOL      (0  << 21)
 +#       define R200_YUV_TEMPERATURE_HOT               (1  << 21)
 +#       define R200_YUV_TEMPERATURE_MASK      (1  << 21)
 +#       define R200_WRAPEN_S                  (1  << 22)
 +#       define R200_CLAMP_S_WRAP              (0  << 23)
 +#       define R200_CLAMP_S_MIRROR            (1  << 23)
 +#       define R200_CLAMP_S_CLAMP_LAST                (2  << 23)
 +#       define R200_CLAMP_S_MIRROR_CLAMP_LAST (3  << 23)
 +#       define R200_CLAMP_S_CLAMP_BORDER      (4  << 23)
 +#       define R200_CLAMP_S_MIRROR_CLAMP_BORDER       (5  << 23)
 +#       define R200_CLAMP_S_CLAMP_GL          (6  << 23)
 +#       define R200_CLAMP_S_MIRROR_CLAMP_GL   (7  << 23)
 +#       define R200_CLAMP_S_MASK              (7  << 23)
 +#       define R200_WRAPEN_T                  (1  << 26)
 +#       define R200_CLAMP_T_WRAP              (0  << 27)
 +#       define R200_CLAMP_T_MIRROR            (1  << 27)
 +#       define R200_CLAMP_T_CLAMP_LAST                (2  << 27)
 +#       define R200_CLAMP_T_MIRROR_CLAMP_LAST (3  << 27)
 +#       define R200_CLAMP_T_CLAMP_BORDER      (4  << 27)
 +#       define R200_CLAMP_T_MIRROR_CLAMP_BORDER       (5  << 27)
 +#       define R200_CLAMP_T_CLAMP_GL          (6  << 27)
 +#       define R200_CLAMP_T_MIRROR_CLAMP_GL   (7  << 27)
 +#       define R200_CLAMP_T_MASK              (7  << 27)
 +#       define R200_KILL_LT_ZERO              (1  << 30)
 +#       define R200_BORDER_MODE_OGL           (0  << 31)
 +#       define R200_BORDER_MODE_D3D           (1  << 31)
 +#define R200_PP_TXFORMAT_0                    0x2c04
 +#define R200_PP_TXFORMAT_1                    0x2c24
 +#define R200_PP_TXFORMAT_2                    0x2c44
 +#define R200_PP_TXFORMAT_3                    0x2c64
 +#define R200_PP_TXFORMAT_4                    0x2c84
 +#define R200_PP_TXFORMAT_5                    0x2ca4
 +#       define R200_TXFORMAT_I8                       (0 << 0)
 +#       define R200_TXFORMAT_AI88             (1 << 0)
 +#       define R200_TXFORMAT_RGB332           (2 << 0)
 +#       define R200_TXFORMAT_ARGB1555         (3 << 0)
 +#       define R200_TXFORMAT_RGB565           (4 << 0)
 +#       define R200_TXFORMAT_ARGB4444         (5 << 0)
 +#       define R200_TXFORMAT_ARGB8888         (6 << 0)
 +#       define R200_TXFORMAT_RGBA8888         (7 << 0)
 +#       define R200_TXFORMAT_Y8                       (8 << 0)
 +#       define R200_TXFORMAT_AVYU4444         (9 << 0)
 +#       define R200_TXFORMAT_VYUY422          (10 << 0)
 +#       define R200_TXFORMAT_YVYU422          (11 << 0)
 +#       define R200_TXFORMAT_DXT1             (12 << 0)
 +#       define R200_TXFORMAT_DXT23            (14 << 0)
 +#       define R200_TXFORMAT_DXT45            (15 << 0)
 +#       define R200_TXFORMAT_ABGR8888         (22 << 0)
 +#       define R200_TXFORMAT_FORMAT_MASK      (31 <<  0)
 +#       define R200_TXFORMAT_FORMAT_SHIFT     0
 +#       define R200_TXFORMAT_ALPHA_IN_MAP     (1 << 6)
 +#       define R200_TXFORMAT_NON_POWER2               (1 << 7)
 +#       define R200_TXFORMAT_WIDTH_MASK               (15 <<  8)
 +#       define R200_TXFORMAT_WIDTH_SHIFT      8
 +#       define R200_TXFORMAT_HEIGHT_MASK      (15 << 12)
 +#       define R200_TXFORMAT_HEIGHT_SHIFT     12
 +#       define R200_TXFORMAT_F5_WIDTH_MASK    (15 << 16)      /* cube face 5 */
 +#       define R200_TXFORMAT_F5_WIDTH_SHIFT   16
 +#       define R200_TXFORMAT_F5_HEIGHT_MASK   (15 << 20)
 +#       define R200_TXFORMAT_F5_HEIGHT_SHIFT  20
 +#       define R200_TXFORMAT_ST_ROUTE_STQ0    (0 << 24)
 +#       define R200_TXFORMAT_ST_ROUTE_STQ1    (1 << 24)
 +#       define R200_TXFORMAT_ST_ROUTE_STQ2    (2 << 24)
 +#       define R200_TXFORMAT_ST_ROUTE_STQ3    (3 << 24)
 +#       define R200_TXFORMAT_ST_ROUTE_STQ4    (4 << 24)
 +#       define R200_TXFORMAT_ST_ROUTE_STQ5    (5 << 24)
 +#       define R200_TXFORMAT_ST_ROUTE_MASK    (7 << 24)
 +#       define R200_TXFORMAT_ST_ROUTE_SHIFT   24
 +#       define R200_TXFORMAT_ALPHA_MASK_ENABLE        (1 << 28)
 +#       define R200_TXFORMAT_CHROMA_KEY_ENABLE        (1 << 29)
 +#       define R200_TXFORMAT_CUBIC_MAP_ENABLE         (1 << 30)
 +#define R200_PP_TXFORMAT_X_0                    0x2c08
 +#define R200_PP_TXFORMAT_X_1                    0x2c28
 +#define R200_PP_TXFORMAT_X_2                    0x2c48
 +#define R200_PP_TXFORMAT_X_3                    0x2c68
 +#define R200_PP_TXFORMAT_X_4                    0x2c88
 +#define R200_PP_TXFORMAT_X_5                    0x2ca8
 +
 +#define R200_PP_TXSIZE_0                      0x2c0c /* NPOT only */
 +#define R200_PP_TXSIZE_1                      0x2c2c /* NPOT only */
 +#define R200_PP_TXSIZE_2                      0x2c4c /* NPOT only */
 +#define R200_PP_TXSIZE_3                      0x2c6c /* NPOT only */
 +#define R200_PP_TXSIZE_4                      0x2c8c /* NPOT only */
 +#define R200_PP_TXSIZE_5                      0x2cac /* NPOT only */
 +
 +#define R200_PP_TXPITCH_0                       0x2c10 /* NPOT only */
 +#define R200_PP_TXPITCH_1                     0x2c30 /* NPOT only */
 +#define R200_PP_TXPITCH_2                     0x2c50 /* NPOT only */
 +#define R200_PP_TXPITCH_3                     0x2c70 /* NPOT only */
 +#define R200_PP_TXPITCH_4                     0x2c90 /* NPOT only */
 +#define R200_PP_TXPITCH_5                     0x2cb0 /* NPOT only */
 +
 +#define R200_PP_TXOFFSET_0                    0x2d00
 +#       define R200_TXO_ENDIAN_NO_SWAP                (0 << 0)
 +#       define R200_TXO_ENDIAN_BYTE_SWAP      (1 << 0)
 +#       define R200_TXO_ENDIAN_WORD_SWAP      (2 << 0)
 +#       define R200_TXO_ENDIAN_HALFDW_SWAP    (3 << 0)
 +#       define R200_TXO_MACRO_LINEAR          (0 << 2)
 +#       define R200_TXO_MACRO_TILE            (1 << 2)
 +#       define R200_TXO_MICRO_LINEAR          (0 << 3)
 +#       define R200_TXO_MICRO_TILE            (1 << 3)
 +#       define R200_TXO_OFFSET_MASK           0xffffffe0
 +#       define R200_TXO_OFFSET_SHIFT          5
 +#define R200_PP_TXOFFSET_1                    0x2d18
 +#define R200_PP_TXOFFSET_2                    0x2d30
 +#define R200_PP_TXOFFSET_3                    0x2d48
 +#define R200_PP_TXOFFSET_4                    0x2d60
 +#define R200_PP_TXOFFSET_5                    0x2d78
 +
 +#define R200_PP_TFACTOR_0                     0x2ee0
 +#define R200_PP_TFACTOR_1                     0x2ee4
 +#define R200_PP_TFACTOR_2                     0x2ee8
 +#define R200_PP_TFACTOR_3                     0x2eec
 +#define R200_PP_TFACTOR_4                     0x2ef0
 +#define R200_PP_TFACTOR_5                     0x2ef4
 +
 +#define R200_PP_TXCBLEND_0                    0x2f00
 +#       define R200_TXC_ARG_A_ZERO            (0)
 +#       define R200_TXC_ARG_A_CURRENT_COLOR   (2)
 +#       define R200_TXC_ARG_A_CURRENT_ALPHA   (3)
 +#       define R200_TXC_ARG_A_DIFFUSE_COLOR   (4)
 +#       define R200_TXC_ARG_A_DIFFUSE_ALPHA   (5)
 +#       define R200_TXC_ARG_A_SPECULAR_COLOR  (6)
 +#       define R200_TXC_ARG_A_SPECULAR_ALPHA  (7)
 +#       define R200_TXC_ARG_A_TFACTOR_COLOR   (8)
 +#       define R200_TXC_ARG_A_TFACTOR_ALPHA   (9)
 +#       define R200_TXC_ARG_A_R0_COLOR                (10)
 +#       define R200_TXC_ARG_A_R0_ALPHA                (11)
 +#       define R200_TXC_ARG_A_R1_COLOR                (12)
 +#       define R200_TXC_ARG_A_R1_ALPHA                (13)
 +#       define R200_TXC_ARG_A_R2_COLOR                (14)
 +#       define R200_TXC_ARG_A_R2_ALPHA                (15)
 +#       define R200_TXC_ARG_A_R3_COLOR                (16)
 +#       define R200_TXC_ARG_A_R3_ALPHA                (17)
 +#       define R200_TXC_ARG_A_R4_COLOR                (18)
 +#       define R200_TXC_ARG_A_R4_ALPHA                (19)
 +#       define R200_TXC_ARG_A_R5_COLOR                (20)
 +#       define R200_TXC_ARG_A_R5_ALPHA                (21)
 +#       define R200_TXC_ARG_A_TFACTOR1_COLOR  (26)
 +#       define R200_TXC_ARG_A_TFACTOR1_ALPHA  (27)
 +#       define R200_TXC_ARG_A_MASK            (31 << 0)
 +#       define R200_TXC_ARG_A_SHIFT           0
 +#       define R200_TXC_ARG_B_ZERO            (0 << 5)
 +#       define R200_TXC_ARG_B_CURRENT_COLOR   (2 << 5)
 +#       define R200_TXC_ARG_B_CURRENT_ALPHA   (3 << 5)
 +#       define R200_TXC_ARG_B_DIFFUSE_COLOR   (4 << 5)
 +#       define R200_TXC_ARG_B_DIFFUSE_ALPHA   (5 << 5)
 +#       define R200_TXC_ARG_B_SPECULAR_COLOR  (6 << 5)
 +#       define R200_TXC_ARG_B_SPECULAR_ALPHA  (7 << 5)
 +#       define R200_TXC_ARG_B_TFACTOR_COLOR   (8 << 5)
 +#       define R200_TXC_ARG_B_TFACTOR_ALPHA   (9 << 5)
 +#       define R200_TXC_ARG_B_R0_COLOR                (10 << 5)
 +#       define R200_TXC_ARG_B_R0_ALPHA                (11 << 5)
 +#       define R200_TXC_ARG_B_R1_COLOR                (12 << 5)
 +#       define R200_TXC_ARG_B_R1_ALPHA                (13 << 5)
 +#       define R200_TXC_ARG_B_R2_COLOR                (14 << 5)
 +#       define R200_TXC_ARG_B_R2_ALPHA                (15 << 5)
 +#       define R200_TXC_ARG_B_R3_COLOR                (16 << 5)
 +#       define R200_TXC_ARG_B_R3_ALPHA                (17 << 5)
 +#       define R200_TXC_ARG_B_R4_COLOR                (18 << 5)
 +#       define R200_TXC_ARG_B_R4_ALPHA                (19 << 5)
 +#       define R200_TXC_ARG_B_R5_COLOR                (20 << 5)
 +#       define R200_TXC_ARG_B_R5_ALPHA                (21 << 5)
 +#       define R200_TXC_ARG_B_TFACTOR1_COLOR  (26 << 5)
 +#       define R200_TXC_ARG_B_TFACTOR1_ALPHA  (27 << 5)
 +#       define R200_TXC_ARG_B_MASK            (31 << 5)
 +#       define R200_TXC_ARG_B_SHIFT           5
 +#       define R200_TXC_ARG_C_ZERO            (0 << 10)
 +#       define R200_TXC_ARG_C_CURRENT_COLOR   (2 << 10)
 +#       define R200_TXC_ARG_C_CURRENT_ALPHA   (3 << 10)
 +#       define R200_TXC_ARG_C_DIFFUSE_COLOR   (4 << 10)
 +#       define R200_TXC_ARG_C_DIFFUSE_ALPHA   (5 << 10)
 +#       define R200_TXC_ARG_C_SPECULAR_COLOR  (6 << 10)
 +#       define R200_TXC_ARG_C_SPECULAR_ALPHA  (7 << 10)
 +#       define R200_TXC_ARG_C_TFACTOR_COLOR   (8 << 10)
 +#       define R200_TXC_ARG_C_TFACTOR_ALPHA   (9 << 10)
 +#       define R200_TXC_ARG_C_R0_COLOR                (10 << 10)
 +#       define R200_TXC_ARG_C_R0_ALPHA                (11 << 10)
 +#       define R200_TXC_ARG_C_R1_COLOR                (12 << 10)
 +#       define R200_TXC_ARG_C_R1_ALPHA                (13 << 10)
 +#       define R200_TXC_ARG_C_R2_COLOR                (14 << 10)
 +#       define R200_TXC_ARG_C_R2_ALPHA                (15 << 10)
 +#       define R200_TXC_ARG_C_R3_COLOR                (16 << 10)
 +#       define R200_TXC_ARG_C_R3_ALPHA                (17 << 10)
 +#       define R200_TXC_ARG_C_R4_COLOR                (18 << 10)
 +#       define R200_TXC_ARG_C_R4_ALPHA                (19 << 10)
 +#       define R200_TXC_ARG_C_R5_COLOR                (20 << 10)
 +#       define R200_TXC_ARG_C_R5_ALPHA                (21 << 10)
 +#       define R200_TXC_ARG_C_TFACTOR1_COLOR  (26 << 10)
 +#       define R200_TXC_ARG_C_TFACTOR1_ALPHA  (27 << 10)
 +#       define R200_TXC_ARG_C_MASK            (31 << 10)
 +#       define R200_TXC_ARG_C_SHIFT           10
 +#       define R200_TXC_COMP_ARG_A            (1 << 16)
 +#       define R200_TXC_COMP_ARG_A_SHIFT      (16)
 +#       define R200_TXC_BIAS_ARG_A            (1 << 17)
 +#       define R200_TXC_SCALE_ARG_A           (1 << 18)
 +#       define R200_TXC_NEG_ARG_A             (1 << 19)
 +#       define R200_TXC_COMP_ARG_B            (1 << 20)
 +#       define R200_TXC_COMP_ARG_B_SHIFT      (20)
 +#       define R200_TXC_BIAS_ARG_B            (1 << 21)
 +#       define R200_TXC_SCALE_ARG_B           (1 << 22)
 +#       define R200_TXC_NEG_ARG_B             (1 << 23)
 +#       define R200_TXC_COMP_ARG_C            (1 << 24)
 +#       define R200_TXC_COMP_ARG_C_SHIFT      (24)
 +#       define R200_TXC_BIAS_ARG_C            (1 << 25)
 +#       define R200_TXC_SCALE_ARG_C           (1 << 26)
 +#       define R200_TXC_NEG_ARG_C             (1 << 27)
 +#       define R200_TXC_OP_MADD                       (0 << 28)
 +#       define R200_TXC_OP_CND0                       (2 << 28)
 +#       define R200_TXC_OP_LERP                       (3 << 28)
 +#       define R200_TXC_OP_DOT3                       (4 << 28)
 +#       define R200_TXC_OP_DOT4                       (5 << 28)
 +#       define R200_TXC_OP_CONDITIONAL                (6 << 28)
 +#       define R200_TXC_OP_DOT2_ADD           (7 << 28)
 +#       define R200_TXC_OP_MASK                       (7 << 28)
 +#define R200_PP_TXCBLEND2_0           0x2f04
 +#       define R200_TXC_TFACTOR_SEL_SHIFT     0
 +#       define R200_TXC_TFACTOR_SEL_MASK      0x7
 +#       define R200_TXC_TFACTOR1_SEL_SHIFT    4
 +#       define R200_TXC_TFACTOR1_SEL_MASK     (0x7 << 4)
 +#       define R200_TXC_SCALE_SHIFT           8
 +#       define R200_TXC_SCALE_MASK            (7 << 8)
 +#       define R200_TXC_SCALE_1X              (0 << 8)
 +#       define R200_TXC_SCALE_2X              (1 << 8)
 +#       define R200_TXC_SCALE_4X              (2 << 8)
 +#       define R200_TXC_SCALE_8X              (3 << 8)
 +#       define R200_TXC_SCALE_INV2            (5 << 8)
 +#       define R200_TXC_SCALE_INV4            (6 << 8)
 +#       define R200_TXC_SCALE_INV8            (7 << 8)
 +#       define R200_TXC_CLAMP_SHIFT           12
 +#       define R200_TXC_CLAMP_MASK            (3 << 12)
 +#       define R200_TXC_CLAMP_WRAP            (0 << 12)
 +#       define R200_TXC_CLAMP_0_1             (1 << 12)
 +#       define R200_TXC_CLAMP_8_8             (2 << 12)
 +#       define R200_TXC_OUTPUT_REG_MASK               (7 << 16)
 +#       define R200_TXC_OUTPUT_REG_NONE               (0 << 16)
 +#       define R200_TXC_OUTPUT_REG_R0         (1 << 16)
 +#       define R200_TXC_OUTPUT_REG_R1         (2 << 16)
 +#       define R200_TXC_OUTPUT_REG_R2         (3 << 16)
 +#       define R200_TXC_OUTPUT_REG_R3         (4 << 16)
 +#       define R200_TXC_OUTPUT_REG_R4         (5 << 16)
 +#       define R200_TXC_OUTPUT_REG_R5         (6 << 16)
 +#       define R200_TXC_OUTPUT_MASK_MASK      (7 << 20)
 +#       define R200_TXC_OUTPUT_MASK_RGB               (0 << 20)
 +#       define R200_TXC_OUTPUT_MASK_RG                (1 << 20)
 +#       define R200_TXC_OUTPUT_MASK_RB                (2 << 20)
 +#       define R200_TXC_OUTPUT_MASK_R         (3 << 20)
 +#       define R200_TXC_OUTPUT_MASK_GB                (4 << 20)
 +#       define R200_TXC_OUTPUT_MASK_G         (5 << 20)
 +#       define R200_TXC_OUTPUT_MASK_B         (6 << 20)
 +#       define R200_TXC_OUTPUT_MASK_NONE      (7 << 20)
 +#       define R200_TXC_REPL_NORMAL           0
 +#       define R200_TXC_REPL_RED              1
 +#       define R200_TXC_REPL_GREEN            2
 +#       define R200_TXC_REPL_BLUE             3
 +#       define R200_TXC_REPL_ARG_A_SHIFT      26
 +#       define R200_TXC_REPL_ARG_A_MASK               (3 << 26)
 +#       define R200_TXC_REPL_ARG_B_SHIFT      28
 +#       define R200_TXC_REPL_ARG_B_MASK               (3 << 28)
 +#       define R200_TXC_REPL_ARG_C_SHIFT      30
 +#       define R200_TXC_REPL_ARG_C_MASK               (3 << 30)
 +#define R200_PP_TXABLEND_0                    0x2f08
 +#       define R200_TXA_ARG_A_ZERO            (0)
 +#       define R200_TXA_ARG_A_CURRENT_ALPHA   (2) /* guess */
 +#       define R200_TXA_ARG_A_CURRENT_BLUE    (3) /* guess */
 +#       define R200_TXA_ARG_A_DIFFUSE_ALPHA   (4)
 +#       define R200_TXA_ARG_A_DIFFUSE_BLUE    (5)
 +#       define R200_TXA_ARG_A_SPECULAR_ALPHA  (6)
 +#       define R200_TXA_ARG_A_SPECULAR_BLUE   (7)
 +#       define R200_TXA_ARG_A_TFACTOR_ALPHA   (8)
 +#       define R200_TXA_ARG_A_TFACTOR_BLUE    (9)
 +#       define R200_TXA_ARG_A_R0_ALPHA                (10)
 +#       define R200_TXA_ARG_A_R0_BLUE         (11)
 +#       define R200_TXA_ARG_A_R1_ALPHA                (12)
 +#       define R200_TXA_ARG_A_R1_BLUE         (13)
 +#       define R200_TXA_ARG_A_R2_ALPHA                (14)
 +#       define R200_TXA_ARG_A_R2_BLUE         (15)
 +#       define R200_TXA_ARG_A_R3_ALPHA                (16)
 +#       define R200_TXA_ARG_A_R3_BLUE         (17)
 +#       define R200_TXA_ARG_A_R4_ALPHA                (18)
 +#       define R200_TXA_ARG_A_R4_BLUE         (19)
 +#       define R200_TXA_ARG_A_R5_ALPHA                (20)
 +#       define R200_TXA_ARG_A_R5_BLUE         (21)
 +#       define R200_TXA_ARG_A_TFACTOR1_ALPHA  (26)
 +#       define R200_TXA_ARG_A_TFACTOR1_BLUE   (27)
 +#       define R200_TXA_ARG_A_MASK            (31 << 0)
 +#       define R200_TXA_ARG_A_SHIFT           0
 +#       define R200_TXA_ARG_B_ZERO            (0 << 5)
 +#       define R200_TXA_ARG_B_CURRENT_ALPHA   (2 << 5) /* guess */
 +#       define R200_TXA_ARG_B_CURRENT_BLUE    (3 << 5) /* guess */
 +#       define R200_TXA_ARG_B_DIFFUSE_ALPHA   (4 << 5)
 +#       define R200_TXA_ARG_B_DIFFUSE_BLUE    (5 << 5)
 +#       define R200_TXA_ARG_B_SPECULAR_ALPHA  (6 << 5)
 +#       define R200_TXA_ARG_B_SPECULAR_BLUE   (7 << 5)
 +#       define R200_TXA_ARG_B_TFACTOR_ALPHA   (8 << 5)
 +#       define R200_TXA_ARG_B_TFACTOR_BLUE    (9 << 5)
 +#       define R200_TXA_ARG_B_R0_ALPHA                (10 << 5)
 +#       define R200_TXA_ARG_B_R0_BLUE         (11 << 5)
 +#       define R200_TXA_ARG_B_R1_ALPHA                (12 << 5)
 +#       define R200_TXA_ARG_B_R1_BLUE         (13 << 5)
 +#       define R200_TXA_ARG_B_R2_ALPHA                (14 << 5)
 +#       define R200_TXA_ARG_B_R2_BLUE         (15 << 5)
 +#       define R200_TXA_ARG_B_R3_ALPHA                (16 << 5)
 +#       define R200_TXA_ARG_B_R3_BLUE         (17 << 5)
 +#       define R200_TXA_ARG_B_R4_ALPHA                (18 << 5)
 +#       define R200_TXA_ARG_B_R4_BLUE         (19 << 5)
 +#       define R200_TXA_ARG_B_R5_ALPHA                (20 << 5)
 +#       define R200_TXA_ARG_B_R5_BLUE         (21 << 5)
 +#       define R200_TXA_ARG_B_TFACTOR1_ALPHA  (26 << 5)
 +#       define R200_TXA_ARG_B_TFACTOR1_BLUE   (27 << 5)
 +#       define R200_TXA_ARG_B_MASK            (31 << 5)
 +#       define R200_TXA_ARG_B_SHIFT                   5
 +#       define R200_TXA_ARG_C_ZERO            (0 << 10)
 +#       define R200_TXA_ARG_C_CURRENT_ALPHA   (2 << 10) /* guess */
 +#       define R200_TXA_ARG_C_CURRENT_BLUE    (3 << 10) /* guess */
 +#       define R200_TXA_ARG_C_DIFFUSE_ALPHA   (4 << 10)
 +#       define R200_TXA_ARG_C_DIFFUSE_BLUE    (5 << 10)
 +#       define R200_TXA_ARG_C_SPECULAR_ALPHA  (6 << 10)
 +#       define R200_TXA_ARG_C_SPECULAR_BLUE   (7 << 10)
 +#       define R200_TXA_ARG_C_TFACTOR_ALPHA   (8 << 10)
 +#       define R200_TXA_ARG_C_TFACTOR_BLUE    (9 << 10)
 +#       define R200_TXA_ARG_C_R0_ALPHA                (10 << 10)
 +#       define R200_TXA_ARG_C_R0_BLUE         (11 << 10)
 +#       define R200_TXA_ARG_C_R1_ALPHA                (12 << 10)
 +#       define R200_TXA_ARG_C_R1_BLUE         (13 << 10)
 +#       define R200_TXA_ARG_C_R2_ALPHA                (14 << 10)
 +#       define R200_TXA_ARG_C_R2_BLUE         (15 << 10)
 +#       define R200_TXA_ARG_C_R3_ALPHA                (16 << 10)
 +#       define R200_TXA_ARG_C_R3_BLUE         (17 << 10)
 +#       define R200_TXA_ARG_C_R4_ALPHA                (18 << 10)
 +#       define R200_TXA_ARG_C_R4_BLUE         (19 << 10)
 +#       define R200_TXA_ARG_C_R5_ALPHA                (20 << 10)
 +#       define R200_TXA_ARG_C_R5_BLUE         (21 << 10)
 +#       define R200_TXA_ARG_C_TFACTOR1_ALPHA  (26 << 10)
 +#       define R200_TXA_ARG_C_TFACTOR1_BLUE   (27 << 10)
 +#       define R200_TXA_ARG_C_MASK            (31 << 10)
 +#       define R200_TXA_ARG_C_SHIFT           10
 +#       define R200_TXA_COMP_ARG_A            (1 << 16)
 +#       define R200_TXA_COMP_ARG_A_SHIFT      (16)
 +#       define R200_TXA_BIAS_ARG_A            (1 << 17)
 +#       define R200_TXA_SCALE_ARG_A           (1 << 18)
 +#       define R200_TXA_NEG_ARG_A             (1 << 19)
 +#       define R200_TXA_COMP_ARG_B            (1 << 20)
 +#       define R200_TXA_COMP_ARG_B_SHIFT      (20)
 +#       define R200_TXA_BIAS_ARG_B            (1 << 21)
 +#       define R200_TXA_SCALE_ARG_B           (1 << 22)
 +#       define R200_TXA_NEG_ARG_B             (1 << 23)
 +#       define R200_TXA_COMP_ARG_C            (1 << 24)
 +#       define R200_TXA_COMP_ARG_C_SHIFT      (24)
 +#       define R200_TXA_BIAS_ARG_C            (1 << 25)
 +#       define R200_TXA_SCALE_ARG_C           (1 << 26)
 +#       define R200_TXA_NEG_ARG_C             (1 << 27)
 +#       define R200_TXA_OP_MADD                       (0 << 28)
 +#       define R200_TXA_OP_CND0                       (2 << 28)
 +#       define R200_TXA_OP_LERP                       (3 << 28)
 +#       define R200_TXA_OP_CONDITIONAL                (6 << 28)
 +#       define R200_TXA_OP_MASK                       (7 << 28)
 +#define R200_PP_TXABLEND2_0                   0x2f0c
 +#       define R200_TXA_TFACTOR_SEL_SHIFT     0
 +#       define R200_TXA_TFACTOR_SEL_MASK      0x7
 +#       define R200_TXA_TFACTOR1_SEL_SHIFT    4
 +#       define R200_TXA_TFACTOR1_SEL_MASK     (0x7 << 4)
 +#       define R200_TXA_SCALE_SHIFT           8
 +#       define R200_TXA_SCALE_MASK            (7 << 8)
 +#       define R200_TXA_SCALE_1X              (0 << 8)
 +#       define R200_TXA_SCALE_2X              (1 << 8)
 +#       define R200_TXA_SCALE_4X              (2 << 8)
 +#       define R200_TXA_SCALE_8X              (3 << 8)
 +#       define R200_TXA_SCALE_INV2            (5 << 8)
 +#       define R200_TXA_SCALE_INV4            (6 << 8)
 +#       define R200_TXA_SCALE_INV8            (7 << 8)
 +#       define R200_TXA_CLAMP_SHIFT           12
 +#       define R200_TXA_CLAMP_MASK            (3 << 12)
 +#       define R200_TXA_CLAMP_WRAP            (0 << 12)
 +#       define R200_TXA_CLAMP_0_1             (1 << 12)
 +#       define R200_TXA_CLAMP_8_8             (2 << 12)
 +#       define R200_TXA_OUTPUT_REG_MASK               (7 << 16)
 +#       define R200_TXA_OUTPUT_REG_NONE               (0 << 16)
 +#       define R200_TXA_OUTPUT_REG_R0         (1 << 16)
 +#       define R200_TXA_OUTPUT_REG_R1         (2 << 16)
 +#       define R200_TXA_OUTPUT_REG_R2         (3 << 16)
 +#       define R200_TXA_OUTPUT_REG_R3         (4 << 16)
 +#       define R200_TXA_OUTPUT_REG_R4         (5 << 16)
 +#       define R200_TXA_OUTPUT_REG_R5         (6 << 16)
 +#       define R200_TXA_DOT_ALPHA             (1 << 20)
 +#       define R200_TXA_REPL_NORMAL           0
 +#       define R200_TXA_REPL_RED              1
 +#       define R200_TXA_REPL_GREEN            2
 +#       define R200_TXA_REPL_ARG_A_SHIFT      26
 +#       define R200_TXA_REPL_ARG_A_MASK               (3 << 26)
 +#       define R200_TXA_REPL_ARG_B_SHIFT      28
 +#       define R200_TXA_REPL_ARG_B_MASK               (3 << 28)
 +#       define R200_TXA_REPL_ARG_C_SHIFT      30
 +#       define R200_TXA_REPL_ARG_C_MASK               (3 << 30)
 +
 +#define R200_SE_VTX_FMT_0                     0x2088
 +#       define R200_VTX_XY                    0 /* always have xy */
 +#       define R200_VTX_Z0                    (1<<0)
 +#       define R200_VTX_W0                    (1<<1)
 +#       define R200_VTX_WEIGHT_COUNT_SHIFT    (2)
 +#       define R200_VTX_PV_MATRIX_SEL         (1<<5)
 +#       define R200_VTX_N0                    (1<<6)
 +#       define R200_VTX_POINT_SIZE            (1<<7)
 +#       define R200_VTX_DISCRETE_FOG          (1<<8)
 +#       define R200_VTX_SHININESS_0           (1<<9)
 +#       define R200_VTX_SHININESS_1           (1<<10)
 +#       define   R200_VTX_COLOR_NOT_PRESENT   0
 +#       define   R200_VTX_PK_RGBA             1
 +#       define   R200_VTX_FP_RGB              2
 +#       define   R200_VTX_FP_RGBA             3
 +#       define   R200_VTX_COLOR_MASK          3
 +#       define R200_VTX_COLOR_0_SHIFT         11
 +#       define R200_VTX_COLOR_1_SHIFT         13
 +#       define R200_VTX_COLOR_2_SHIFT         15
 +#       define R200_VTX_COLOR_3_SHIFT         17
 +#       define R200_VTX_COLOR_4_SHIFT         19
 +#       define R200_VTX_COLOR_5_SHIFT         21
 +#       define R200_VTX_COLOR_6_SHIFT         23
 +#       define R200_VTX_COLOR_7_SHIFT         25
 +#       define R200_VTX_XY1                   (1<<28)
 +#       define R200_VTX_Z1                    (1<<29)
 +#       define R200_VTX_W1                    (1<<30)
 +#       define R200_VTX_N1                    (1<<31)
 +#define R200_SE_VTX_FMT_1                     0x208c
 +#       define R200_VTX_TEX0_COMP_CNT_SHIFT   0
 +#       define R200_VTX_TEX1_COMP_CNT_SHIFT   3
 +#       define R200_VTX_TEX2_COMP_CNT_SHIFT   6
 +#       define R200_VTX_TEX3_COMP_CNT_SHIFT   9
 +#       define R200_VTX_TEX4_COMP_CNT_SHIFT   12
 +#       define R200_VTX_TEX5_COMP_CNT_SHIFT   15
 +
 +#define R200_SE_TCL_OUTPUT_VTX_FMT_0          0x2090
 +#define R200_SE_TCL_OUTPUT_VTX_FMT_1          0x2094
 +#define R200_SE_TCL_OUTPUT_VTX_COMP_SEL               0x2250
 +#       define R200_OUTPUT_XYZW                       (1<<0)
 +#       define R200_OUTPUT_COLOR_0            (1<<8)
 +#       define R200_OUTPUT_COLOR_1            (1<<9)
 +#       define R200_OUTPUT_TEX_0              (1<<16)
 +#       define R200_OUTPUT_TEX_1              (1<<17)
 +#       define R200_OUTPUT_TEX_2              (1<<18)
 +#       define R200_OUTPUT_TEX_3              (1<<19)
 +#       define R200_OUTPUT_TEX_4              (1<<20)
 +#       define R200_OUTPUT_TEX_5              (1<<21)
 +#       define R200_OUTPUT_TEX_MASK           (0x3f<<16)
 +#       define R200_OUTPUT_DISCRETE_FOG               (1<<24)
 +#       define R200_OUTPUT_PT_SIZE            (1<<25)
 +#       define R200_FORCE_INORDER_PROC                (1<<31)
 +#define R200_PP_CNTL_X                                0x2cc4
 +#define R200_PP_TXMULTI_CTL_0                 0x2c1c
 +#define R200_SE_VTX_STATE_CNTL                        0x2180
 +#       define R200_UPDATE_USER_COLOR_0_ENA_MASK (1<<16)
 +
 +                              /* Registers for CP and Microcode Engine */
 +#define RADEON_CP_ME_RAM_ADDR               0x07d4
 +#define RADEON_CP_ME_RAM_RADDR              0x07d8
 +#define RADEON_CP_ME_RAM_DATAH              0x07dc
 +#define RADEON_CP_ME_RAM_DATAL              0x07e0
 +
 +#define RADEON_CP_RB_BASE                   0x0700
 +#define RADEON_CP_RB_CNTL                   0x0704
 +#define RADEON_CP_RB_RPTR_ADDR              0x070c
 +#define RADEON_CP_RB_RPTR                   0x0710
 +#define RADEON_CP_RB_WPTR                   0x0714
 +
 +#define RADEON_CP_IB_BASE                   0x0738
 +#define RADEON_CP_IB_BUFSZ                  0x073c
 +
 +#define RADEON_CP_CSQ_CNTL                  0x0740
 +#       define RADEON_CSQ_CNT_PRIMARY_MASK     (0xff << 0)
 +#       define RADEON_CSQ_PRIDIS_INDDIS        (0    << 28)
 +#       define RADEON_CSQ_PRIPIO_INDDIS        (1    << 28)
 +#       define RADEON_CSQ_PRIBM_INDDIS         (2    << 28)
 +#       define RADEON_CSQ_PRIPIO_INDBM         (3    << 28)
 +#       define RADEON_CSQ_PRIBM_INDBM          (4    << 28)
 +#       define RADEON_CSQ_PRIPIO_INDPIO        (15   << 28)
 +#define RADEON_CP_CSQ_STAT                  0x07f8
 +#       define RADEON_CSQ_RPTR_PRIMARY_MASK    (0xff <<  0)
 +#       define RADEON_CSQ_WPTR_PRIMARY_MASK    (0xff <<  8)
 +#       define RADEON_CSQ_RPTR_INDIRECT_MASK   (0xff << 16)
 +#       define RADEON_CSQ_WPTR_INDIRECT_MASK   (0xff << 24)
 +#define RADEON_CP_CSQ_ADDR                  0x07f0
 +#define RADEON_CP_CSQ_DATA                  0x07f4
 +#define RADEON_CP_CSQ_APER_PRIMARY          0x1000
 +#define RADEON_CP_CSQ_APER_INDIRECT         0x1300
 +
 +#define RADEON_CP_RB_WPTR_DELAY             0x0718
 +#       define RADEON_PRE_WRITE_TIMER_SHIFT    0
 +#       define RADEON_PRE_WRITE_LIMIT_SHIFT    23
 +
 +#define RADEON_AIC_CNTL                     0x01d0
 +#       define RADEON_PCIGART_TRANSLATE_EN     (1 << 0)
 +#define RADEON_AIC_LO_ADDR                  0x01dc
 +
 +
 +
 +                              /* Constants */
 +//#define RADEON_LAST_FRAME_REG               RADEON_GUI_SCRATCH_REG0
 +//efine RADEON_LAST_CLEAR_REG               RADEON_GUI_SCRATCH_REG2
 +
 +
 +
 +                              /* CP packet types */
 +#define RADEON_CP_PACKET0                           0x00000000
 +#define RADEON_CP_PACKET1                           0x40000000
 +#define RADEON_CP_PACKET2                           0x80000000
 +#define RADEON_CP_PACKET3                           0xC0000000
 +#       define RADEON_CP_PACKET_MASK                0xC0000000
 +#       define RADEON_CP_PACKET_COUNT_MASK          0x3fff0000
 +#       define RADEON_CP_PACKET_MAX_DWORDS          (1 << 12)
 +#       define RADEON_CP_PACKET0_REG_MASK           0x000007ff
 +#       define RADEON_CP_PACKET1_REG0_MASK          0x000007ff
 +#       define RADEON_CP_PACKET1_REG1_MASK          0x003ff800
 +
 +#define RADEON_CP_PACKET0_ONE_REG_WR                0x00008000
 +
 +#define RADEON_CP_PACKET3_NOP                       0xC0001000
 +#define RADEON_CP_PACKET3_NEXT_CHAR                 0xC0001900
 +#define RADEON_CP_PACKET3_PLY_NEXTSCAN              0xC0001D00
 +#define RADEON_CP_PACKET3_SET_SCISSORS              0xC0001E00
 +#define RADEON_CP_PACKET3_3D_RNDR_GEN_INDX_PRIM     0xC0002300
 +#define RADEON_CP_PACKET3_LOAD_MICROCODE            0xC0002400
 +#define RADEON_CP_PACKET3_WAIT_FOR_IDLE             0xC0002600
 +#define RADEON_CP_PACKET3_3D_DRAW_VBUF              0xC0002800
 +#define RADEON_CP_PACKET3_3D_DRAW_IMMD              0xC0002900
 +#define RADEON_CP_PACKET3_3D_DRAW_INDX              0xC0002A00
 +#define RADEON_CP_PACKET3_LOAD_PALETTE              0xC0002C00
 +#define R200_CP_PACKET3_3D_DRAW_IMMD_2              0xc0003500
 +#define RADEON_CP_PACKET3_3D_LOAD_VBPNTR            0xC0002F00
 +#define RADEON_CP_PACKET3_CNTL_PAINT                0xC0009100
 +#define RADEON_CP_PACKET3_CNTL_BITBLT               0xC0009200
 +#define RADEON_CP_PACKET3_CNTL_SMALLTEXT            0xC0009300
 +#define RADEON_CP_PACKET3_CNTL_HOSTDATA_BLT         0xC0009400
 +#define RADEON_CP_PACKET3_CNTL_POLYLINE             0xC0009500
 +#define RADEON_CP_PACKET3_CNTL_POLYSCANLINES        0xC0009800
 +#define RADEON_CP_PACKET3_CNTL_PAINT_MULTI          0xC0009A00
 +#define RADEON_CP_PACKET3_CNTL_BITBLT_MULTI         0xC0009B00
 +#define RADEON_CP_PACKET3_CNTL_TRANS_BITBLT         0xC0009C00
 +
 +
 +#define RADEON_CP_VC_FRMT_XY                        0x00000000
 +#define RADEON_CP_VC_FRMT_W0                        0x00000001
 +#define RADEON_CP_VC_FRMT_FPCOLOR                   0x00000002
 +#define RADEON_CP_VC_FRMT_FPALPHA                   0x00000004
 +#define RADEON_CP_VC_FRMT_PKCOLOR                   0x00000008
 +#define RADEON_CP_VC_FRMT_FPSPEC                    0x00000010
 +#define RADEON_CP_VC_FRMT_FPFOG                     0x00000020
 +#define RADEON_CP_VC_FRMT_PKSPEC                    0x00000040
 +#define RADEON_CP_VC_FRMT_ST0                       0x00000080
 +#define RADEON_CP_VC_FRMT_ST1                       0x00000100
 +#define RADEON_CP_VC_FRMT_Q1                        0x00000200
 +#define RADEON_CP_VC_FRMT_ST2                       0x00000400
 +#define RADEON_CP_VC_FRMT_Q2                        0x00000800
 +#define RADEON_CP_VC_FRMT_ST3                       0x00001000
 +#define RADEON_CP_VC_FRMT_Q3                        0x00002000
 +#define RADEON_CP_VC_FRMT_Q0                        0x00004000
 +#define RADEON_CP_VC_FRMT_BLND_WEIGHT_CNT_MASK      0x00038000
 +#define RADEON_CP_VC_FRMT_N0                        0x00040000
 +#define RADEON_CP_VC_FRMT_XY1                       0x08000000
 +#define RADEON_CP_VC_FRMT_Z1                        0x10000000
 +#define RADEON_CP_VC_FRMT_W1                        0x20000000
 +#define RADEON_CP_VC_FRMT_N1                        0x40000000
 +#define RADEON_CP_VC_FRMT_Z                         0x80000000
 +
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_NONE            0x00000000
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_POINT           0x00000001
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_LINE            0x00000002
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_LINE_STRIP      0x00000003
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_LIST        0x00000004
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_FAN         0x00000005
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_STRIP       0x00000006
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_TRI_TYPE_2      0x00000007
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_RECT_LIST       0x00000008
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_3VRT_POINT_LIST 0x00000009
 +#define RADEON_CP_VC_CNTL_PRIM_TYPE_3VRT_LINE_LIST  0x0000000a
 +#define RADEON_CP_VC_CNTL_PRIM_WALK_IND             0x00000010
 +#define RADEON_CP_VC_CNTL_PRIM_WALK_LIST            0x00000020
 +#define RADEON_CP_VC_CNTL_PRIM_WALK_RING            0x00000030
 +#define RADEON_CP_VC_CNTL_COLOR_ORDER_BGRA          0x00000000
 +#define RADEON_CP_VC_CNTL_COLOR_ORDER_RGBA          0x00000040
 +#define RADEON_CP_VC_CNTL_MAOS_ENABLE               0x00000080
 +#define RADEON_CP_VC_CNTL_VTX_FMT_NON_RADEON_MODE   0x00000000
 +#define RADEON_CP_VC_CNTL_VTX_FMT_RADEON_MODE       0x00000100
 +#define RADEON_CP_VC_CNTL_TCL_DISABLE               0x00000000
 +#define RADEON_CP_VC_CNTL_TCL_ENABLE                0x00000200
 +#define RADEON_CP_VC_CNTL_NUM_SHIFT                 16
 +
 +#define RADEON_VS_MATRIX_0_ADDR                   0
 +#define RADEON_VS_MATRIX_1_ADDR                   4
 +#define RADEON_VS_MATRIX_2_ADDR                   8
 +#define RADEON_VS_MATRIX_3_ADDR                  12
 +#define RADEON_VS_MATRIX_4_ADDR                  16
 +#define RADEON_VS_MATRIX_5_ADDR                  20
 +#define RADEON_VS_MATRIX_6_ADDR                  24
 +#define RADEON_VS_MATRIX_7_ADDR                  28
 +#define RADEON_VS_MATRIX_8_ADDR                  32
 +#define RADEON_VS_MATRIX_9_ADDR                  36
 +#define RADEON_VS_MATRIX_10_ADDR                 40
 +#define RADEON_VS_MATRIX_11_ADDR                 44
 +#define RADEON_VS_MATRIX_12_ADDR                 48
 +#define RADEON_VS_MATRIX_13_ADDR                 52
 +#define RADEON_VS_MATRIX_14_ADDR                 56
 +#define RADEON_VS_MATRIX_15_ADDR                 60
 +#define RADEON_VS_LIGHT_AMBIENT_ADDR             64
 +#define RADEON_VS_LIGHT_DIFFUSE_ADDR             72
 +#define RADEON_VS_LIGHT_SPECULAR_ADDR            80
 +#define RADEON_VS_LIGHT_DIRPOS_ADDR              88
 +#define RADEON_VS_LIGHT_HWVSPOT_ADDR             96
 +#define RADEON_VS_LIGHT_ATTENUATION_ADDR        104
 +#define RADEON_VS_MATRIX_EYE2CLIP_ADDR          112
 +#define RADEON_VS_UCP_ADDR                      116
 +#define RADEON_VS_GLOBAL_AMBIENT_ADDR           122
 +#define RADEON_VS_FOG_PARAM_ADDR                123
 +#define RADEON_VS_EYE_VECTOR_ADDR               124
 +
 +#define RADEON_SS_LIGHT_DCD_ADDR                  0
 +#define RADEON_SS_LIGHT_SPOT_EXPONENT_ADDR        8
 +#define RADEON_SS_LIGHT_SPOT_CUTOFF_ADDR         16
 +#define RADEON_SS_LIGHT_SPECULAR_THRESH_ADDR     24
 +#define RADEON_SS_LIGHT_RANGE_CUTOFF_ADDR        32
 +#define RADEON_SS_VERT_GUARD_CLIP_ADJ_ADDR       48
 +#define RADEON_SS_VERT_GUARD_DISCARD_ADJ_ADDR    49
 +#define RADEON_SS_HORZ_GUARD_CLIP_ADJ_ADDR       50
 +#define RADEON_SS_HORZ_GUARD_DISCARD_ADJ_ADDR    51
 +#define RADEON_SS_SHININESS                      60
 +
 +#define RADEON_TV_MASTER_CNTL                    0x0800
 +#       define RADEON_TV_ASYNC_RST               (1 <<  0)
 +#       define RADEON_CRT_ASYNC_RST              (1 <<  1)
 +#       define RADEON_RESTART_PHASE_FIX          (1 <<  3)
 +#     define RADEON_TV_FIFO_ASYNC_RST          (1 <<  4)
 +#     define RADEON_VIN_ASYNC_RST              (1 <<  5)
 +#     define RADEON_AUD_ASYNC_RST              (1 <<  6)
 +#     define RADEON_DVS_ASYNC_RST              (1 <<  7)
 +#       define RADEON_CRT_FIFO_CE_EN             (1 <<  9)
 +#       define RADEON_TV_FIFO_CE_EN              (1 << 10)
 +#       define RADEON_RE_SYNC_NOW_SEL_MASK       (3 << 14)
 +#       define RADEON_TVCLK_ALWAYS_ONb           (1 << 30)
 +#     define RADEON_TV_ON                      (1 << 31)
 +#define RADEON_TV_PRE_DAC_MUX_CNTL               0x0888
 +#       define RADEON_Y_RED_EN                   (1 << 0)
 +#       define RADEON_C_GRN_EN                   (1 << 1)
 +#       define RADEON_CMP_BLU_EN                 (1 << 2)
 +#       define RADEON_DAC_DITHER_EN              (1 << 3)
 +#       define RADEON_RED_MX_FORCE_DAC_DATA      (6 << 4)
 +#       define RADEON_GRN_MX_FORCE_DAC_DATA      (6 << 8)
 +#       define RADEON_BLU_MX_FORCE_DAC_DATA      (6 << 12)
 +#       define RADEON_TV_FORCE_DAC_DATA_SHIFT    16
 +#define RADEON_TV_RGB_CNTL                           0x0804
 +#       define RADEON_SWITCH_TO_BLUE            (1 <<  4)
 +#       define RADEON_RGB_DITHER_EN             (1 <<  5)
 +#       define RADEON_RGB_SRC_SEL_MASK                  (3 <<  8)
 +#       define RADEON_RGB_SRC_SEL_CRTC1                 (0 <<  8)
 +#       define RADEON_RGB_SRC_SEL_RMX           (1 <<  8)
 +#       define RADEON_RGB_SRC_SEL_CRTC2                 (2 <<  8)
 +#       define RADEON_RGB_CONVERT_BY_PASS       (1 << 10)
 +#       define RADEON_UVRAM_READ_MARGIN_SHIFT   16
 +#       define RADEON_FIFORAM_FFMACRO_READ_MARGIN_SHIFT         20
 +#     define RADEON_TVOUT_SCALE_EN              (1 << 26)
 +#define RADEON_TV_SYNC_CNTL                          0x0808
 +#       define RADEON_SYNC_OE                     (1 <<  0)
 +#       define RADEON_SYNC_OUT                    (1 <<  1)
 +#       define RADEON_SYNC_IN                     (1 <<  2)
 +#       define RADEON_SYNC_PUB                    (1 <<  3)
 +#       define RADEON_SYNC_PD                     (1 <<  4)
 +#       define RADEON_TV_SYNC_IO_DRIVE            (1 <<  5)
 +#define RADEON_TV_HTOTAL                             0x080c
 +#define RADEON_TV_HDISP                              0x0810
 +#define RADEON_TV_HSTART                             0x0818
 +#define RADEON_TV_HCOUNT                             0x081C
 +#define RADEON_TV_VTOTAL                             0x0820
 +#define RADEON_TV_VDISP                              0x0824
 +#define RADEON_TV_VCOUNT                             0x0828
 +#define RADEON_TV_FTOTAL                             0x082c
 +#define RADEON_TV_FCOUNT                             0x0830
 +#define RADEON_TV_FRESTART                           0x0834
 +#define RADEON_TV_HRESTART                           0x0838
 +#define RADEON_TV_VRESTART                           0x083c
 +#define RADEON_TV_HOST_READ_DATA                     0x0840
 +#define RADEON_TV_HOST_WRITE_DATA                    0x0844
 +#define RADEON_TV_HOST_RD_WT_CNTL                    0x0848
 +#     define RADEON_HOST_FIFO_RD               (1 << 12)
 +#     define RADEON_HOST_FIFO_RD_ACK           (1 << 13)
 +#     define RADEON_HOST_FIFO_WT               (1 << 14)
 +#     define RADEON_HOST_FIFO_WT_ACK           (1 << 15)
 +#define RADEON_TV_VSCALER_CNTL1                      0x084c
 +#       define RADEON_UV_INC_MASK                0xffff
 +#       define RADEON_UV_INC_SHIFT               0
 +#       define RADEON_Y_W_EN                   (1 << 24)
 +#       define RADEON_RESTART_FIELD              (1 << 29) /* restart on field 0 */
 +#       define RADEON_Y_DEL_W_SIG_SHIFT          26
 +#define RADEON_TV_TIMING_CNTL                        0x0850
 +#       define RADEON_H_INC_MASK                 0xfff
 +#       define RADEON_H_INC_SHIFT                0
 +#       define RADEON_REQ_Y_FIRST                (1 << 19)
 +#       define RADEON_FORCE_BURST_ALWAYS         (1 << 21)
 +#       define RADEON_UV_POST_SCALE_BYPASS       (1 << 23)
 +#       define RADEON_UV_OUTPUT_POST_SCALE_SHIFT 24
 +#define RADEON_TV_VSCALER_CNTL2                      0x0854
 +#       define RADEON_DITHER_MODE                (1 <<  0)
 +#       define RADEON_Y_OUTPUT_DITHER_EN         (1 <<  1)
 +#       define RADEON_UV_OUTPUT_DITHER_EN        (1 <<  2)
 +#       define RADEON_UV_TO_BUF_DITHER_EN        (1 <<  3)
 +#define RADEON_TV_Y_FALL_CNTL                        0x0858
 +#       define RADEON_Y_FALL_PING_PONG           (1 << 16)
 +#       define RADEON_Y_COEF_EN                  (1 << 17)
 +#define RADEON_TV_Y_RISE_CNTL                        0x085c
 +#       define RADEON_Y_RISE_PING_PONG           (1 << 16)
 +#define RADEON_TV_Y_SAW_TOOTH_CNTL                   0x0860
 +#define RADEON_TV_UPSAMP_AND_GAIN_CNTL               0x0864
 +#     define RADEON_YUPSAMP_EN                 (1 <<  0)
 +#     define RADEON_UVUPSAMP_EN                (1 <<  2)
 +#define RADEON_TV_GAIN_LIMIT_SETTINGS                0x0868
 +#       define RADEON_Y_GAIN_LIMIT_SHIFT         0
 +#       define RADEON_UV_GAIN_LIMIT_SHIFT        16
 +#define RADEON_TV_LINEAR_GAIN_SETTINGS               0x086c
 +#       define RADEON_Y_GAIN_SHIFT               0
 +#       define RADEON_UV_GAIN_SHIFT              16
 +#define RADEON_TV_MODULATOR_CNTL1                    0x0870
 +#     define RADEON_YFLT_EN                    (1 <<  2)
 +#     define RADEON_UVFLT_EN                   (1 <<  3)
 +#       define RADEON_ALT_PHASE_EN               (1 <<  6)
 +#       define RADEON_SYNC_TIP_LEVEL             (1 <<  7)
 +#       define RADEON_BLANK_LEVEL_SHIFT          8
 +#       define RADEON_SET_UP_LEVEL_SHIFT         16
 +#     define RADEON_SLEW_RATE_LIMIT            (1 << 23)
 +#       define RADEON_CY_FILT_BLEND_SHIFT        28
 +#define RADEON_TV_MODULATOR_CNTL2                    0x0874
 +#       define RADEON_TV_U_BURST_LEVEL_MASK     0x1ff
 +#       define RADEON_TV_V_BURST_LEVEL_MASK     0x1ff
 +#       define RADEON_TV_V_BURST_LEVEL_SHIFT    16
 +#define RADEON_TV_CRC_CNTL                           0x0890
 +#define RADEON_TV_UV_ADR                             0x08ac
 +#     define RADEON_MAX_UV_ADR_MASK            0x000000ff
 +#     define RADEON_MAX_UV_ADR_SHIFT           0
 +#     define RADEON_TABLE1_BOT_ADR_MASK        0x0000ff00
 +#     define RADEON_TABLE1_BOT_ADR_SHIFT       8
 +#     define RADEON_TABLE3_TOP_ADR_MASK        0x00ff0000
 +#     define RADEON_TABLE3_TOP_ADR_SHIFT       16
 +#     define RADEON_HCODE_TABLE_SEL_MASK       0x06000000
 +#     define RADEON_HCODE_TABLE_SEL_SHIFT      25
 +#     define RADEON_VCODE_TABLE_SEL_MASK       0x18000000
 +#     define RADEON_VCODE_TABLE_SEL_SHIFT      27
 +#     define RADEON_TV_MAX_FIFO_ADDR           0x1a7
 +#     define RADEON_TV_MAX_FIFO_ADDR_INTERNAL  0x1ff
 +#define RADEON_TV_PLL_FINE_CNTL                            0x0020     /* PLL */
 +#define RADEON_TV_PLL_CNTL                           0x0021   /* PLL */
 +#       define RADEON_TV_M0LO_MASK               0xff
 +#       define RADEON_TV_M0HI_MASK               0x7
 +#       define RADEON_TV_M0HI_SHIFT              18
 +#       define RADEON_TV_N0LO_MASK               0x1ff
 +#       define RADEON_TV_N0LO_SHIFT              8
 +#       define RADEON_TV_N0HI_MASK               0x3
 +#       define RADEON_TV_N0HI_SHIFT              21
 +#       define RADEON_TV_P_MASK                  0xf
 +#       define RADEON_TV_P_SHIFT                 24
 +#       define RADEON_TV_SLIP_EN                 (1 << 23)
 +#       define RADEON_TV_DTO_EN                  (1 << 28)
 +#define RADEON_TV_PLL_CNTL1                          0x0022   /* PLL */
 +#       define RADEON_TVPLL_RESET                (1 <<  1)
 +#       define RADEON_TVPLL_SLEEP                (1 <<  3)
 +#       define RADEON_TVPLL_REFCLK_SEL           (1 <<  4)
 +#       define RADEON_TVPCP_SHIFT                8
 +#       define RADEON_TVPCP_MASK                 (7 << 8)
 +#       define RADEON_TVPVG_SHIFT                11
 +#       define RADEON_TVPVG_MASK                 (7 << 11)
 +#       define RADEON_TVPDC_SHIFT                14
 +#       define RADEON_TVPDC_MASK                 (3 << 14)
 +#       define RADEON_TVPLL_TEST_DIS             (1 << 31)
 +#       define RADEON_TVCLK_SRC_SEL_TVPLL        (1 << 30)
 +
 +#define RS400_DISP2_REQ_CNTL1                 0xe30
 +#       define RS400_DISP2_START_REQ_LEVEL_SHIFT   0
 +#       define RS400_DISP2_START_REQ_LEVEL_MASK    0x3ff
 +#       define RS400_DISP2_STOP_REQ_LEVEL_SHIFT    12
 +#       define RS400_DISP2_STOP_REQ_LEVEL_MASK     0x3ff
 +#       define RS400_DISP2_ALLOW_FID_LEVEL_SHIFT   22
 +#       define RS400_DISP2_ALLOW_FID_LEVEL_MASK    0x3ff
 +#define RS400_DISP2_REQ_CNTL2                 0xe34
 +#       define RS400_DISP2_CRITICAL_POINT_START_SHIFT    12
 +#       define RS400_DISP2_CRITICAL_POINT_START_MASK     0x3ff
 +#       define RS400_DISP2_CRITICAL_POINT_STOP_SHIFT     22
 +#       define RS400_DISP2_CRITICAL_POINT_STOP_MASK      0x3ff
 +#define RS400_DMIF_MEM_CNTL1                  0xe38
 +#       define RS400_DISP2_START_ADR_SHIFT      0
 +#       define RS400_DISP2_START_ADR_MASK       0x3ff
 +#       define RS400_DISP1_CRITICAL_POINT_START_SHIFT    12
 +#       define RS400_DISP1_CRITICAL_POINT_START_MASK     0x3ff
 +#       define RS400_DISP1_CRITICAL_POINT_STOP_SHIFT     22
 +#       define RS400_DISP1_CRITICAL_POINT_STOP_MASK      0x3ff
 +#define RS400_DISP1_REQ_CNTL1                 0xe3c
 +#       define RS400_DISP1_START_REQ_LEVEL_SHIFT   0
 +#       define RS400_DISP1_START_REQ_LEVEL_MASK    0x3ff
 +#       define RS400_DISP1_STOP_REQ_LEVEL_SHIFT    12
 +#       define RS400_DISP1_STOP_REQ_LEVEL_MASK     0x3ff
 +#       define RS400_DISP1_ALLOW_FID_LEVEL_SHIFT   22
 +#       define RS400_DISP1_ALLOW_FID_LEVEL_MASK    0x3ff
 +
 +#define RS690_MC_INDEX                                0x78
 +#     define RS690_MC_INDEX_MASK              0x1ff
 +#     define RS690_MC_INDEX_WR_EN             (1 << 9)
 +#     define RS690_MC_INDEX_WR_ACK            0x7f
 +#define RS690_MC_DATA                         0x7c
 +
 +#define RS690_MC_FB_LOCATION                  0x100
 +#define RS690_MC_AGP_LOCATION                 0x101
 +#define RS690_MC_AGP_BASE                     0x102
 +#define RS690_MC_AGP_BASE_2                     0x103
 +#define RS690_MC_STATUS                         0x90
 +#define RS690_MC_STATUS_IDLE                    (1 << 0)
 +
 +#define RS600_MC_INDEX                                0x78
 +#     define RS600_MC_INDEX_MASK              0xff
 +#     define RS600_MC_INDEX_WR_EN             (1 << 8)
 +#     define RS600_MC_INDEX_WR_ACK            0xff
 +#define RS600_MC_DATA                         0x7c
 +
 +#define RS600_MC_FB_LOCATION                  0xA
 +#define RS600_MC_STATUS                         0x0
 +#define RS600_MC_STATUS_IDLE                    (1 << 0)
 +
 +#define AVIVO_MC_INDEX                                                0x0070
 +#define R520_MC_STATUS 0x00
 +#define R520_MC_STATUS_IDLE (1<<1)
 +#define RV515_MC_STATUS 0x08
 +#define RV515_MC_STATUS_IDLE (1<<4)
 +#define AVIVO_MC_DATA                                         0x0074
 +
 +#define RV515_MC_FB_LOCATION   0x1
 +#define RV515_MC_AGP_LOCATION  0x2
 +#define RV515_MC_AGP_BASE      0x3
 +#define RV515_MC_AGP_BASE_2    0x4
 +#define RV515_MC_CNTL          0x5
 +#     define RV515_MEM_NUM_CHANNELS_MASK  0x3
 +#define R520_MC_FB_LOCATION    0x4
 +#define R520_MC_AGP_LOCATION   0x5
 +#define R520_MC_AGP_BASE       0x6
 +#define R520_MC_AGP_BASE_2     0x7
 +#define R520_MC_CNTL0          0x8
 +#     define R520_MEM_NUM_CHANNELS_MASK  (0x3 << 24)
 +#     define R520_MEM_NUM_CHANNELS_SHIFT  24
 +#     define R520_MC_CHANNEL_SIZE  (1 << 23)
 +
 +#define R600_RAMCFG                                  0x2408
 +#       define R600_CHANSIZE                           (1 << 7)
 +#       define R600_CHANSIZE_OVERRIDE                  (1 << 10)
 +
 +#define AVIVO_HDP_FB_LOCATION 0x134
 +
 +#define AVIVO_VGA_RENDER_CONTROL                              0x0300
 +#       define AVIVO_VGA_VSTATUS_CNTL_MASK                      (3 << 16)
 +#define AVIVO_D1VGA_CONTROL                                   0x0330
 +#       define AVIVO_DVGA_CONTROL_MODE_ENABLE (1<<0)
 +#       define AVIVO_DVGA_CONTROL_TIMING_SELECT (1<<8)
 +#       define AVIVO_DVGA_CONTROL_SYNC_POLARITY_SELECT (1<<9)
 +#       define AVIVO_DVGA_CONTROL_OVERSCAN_TIMING_SELECT (1<<10)
 +#       define AVIVO_DVGA_CONTROL_OVERSCAN_COLOR_EN (1<<16)
 +#       define AVIVO_DVGA_CONTROL_ROTATE (1<<24)
 +#define AVIVO_D2VGA_CONTROL                                   0x0338
 +
 +#define AVIVO_EXT1_PPLL_REF_DIV_SRC                             0x400
 +#define AVIVO_EXT1_PPLL_REF_DIV                                 0x404
 +#define AVIVO_EXT1_PPLL_UPDATE_LOCK                             0x408
 +#define AVIVO_EXT1_PPLL_UPDATE_CNTL                             0x40c
 +
 +#define AVIVO_EXT2_PPLL_REF_DIV_SRC                             0x410
 +#define AVIVO_EXT2_PPLL_REF_DIV                                 0x414
 +#define AVIVO_EXT2_PPLL_UPDATE_LOCK                             0x418
 +#define AVIVO_EXT2_PPLL_UPDATE_CNTL                             0x41c
 +
 +#define AVIVO_EXT1_PPLL_FB_DIV                                   0x430
 +#define AVIVO_EXT2_PPLL_FB_DIV                                   0x434
 +
 +#define AVIVO_EXT1_PPLL_POST_DIV_SRC                                 0x438
 +#define AVIVO_EXT1_PPLL_POST_DIV                                     0x43c
 +
 +#define AVIVO_EXT2_PPLL_POST_DIV_SRC                                 0x440
 +#define AVIVO_EXT2_PPLL_POST_DIV                                     0x444
 +
 +#define AVIVO_EXT1_PPLL_CNTL                                    0x448
 +#define AVIVO_EXT2_PPLL_CNTL                                    0x44c
 +
 +#define AVIVO_P1PLL_CNTL                                        0x450
 +#define AVIVO_P2PLL_CNTL                                        0x454
 +#define AVIVO_P1PLL_INT_SS_CNTL                                 0x458
 +#define AVIVO_P2PLL_INT_SS_CNTL                                 0x45c
 +#define AVIVO_P1PLL_TMDSA_CNTL                                  0x460
 +#define AVIVO_P2PLL_LVTMA_CNTL                                  0x464
 +
 +#define AVIVO_PCLK_CRTC1_CNTL                                   0x480
 +#define AVIVO_PCLK_CRTC2_CNTL                                   0x484
 +
 +#define AVIVO_D1CRTC_H_TOTAL                                  0x6000
 +#define AVIVO_D1CRTC_H_BLANK_START_END                          0x6004
 +#define AVIVO_D1CRTC_H_SYNC_A                                   0x6008
 +#define AVIVO_D1CRTC_H_SYNC_A_CNTL                              0x600c
 +#define AVIVO_D1CRTC_H_SYNC_B                                   0x6010
 +#define AVIVO_D1CRTC_H_SYNC_B_CNTL                              0x6014
 +
 +#define AVIVO_D1CRTC_V_TOTAL                                  0x6020
 +#define AVIVO_D1CRTC_V_BLANK_START_END                          0x6024
 +#define AVIVO_D1CRTC_V_SYNC_A                                   0x6028
 +#define AVIVO_D1CRTC_V_SYNC_A_CNTL                              0x602c
 +#define AVIVO_D1CRTC_V_SYNC_B                                   0x6030
 +#define AVIVO_D1CRTC_V_SYNC_B_CNTL                              0x6034
 +
 +#define AVIVO_D1CRTC_CONTROL                                    0x6080
 +#       define AVIVO_CRTC_EN                            (1<<0)
 +#define AVIVO_D1CRTC_BLANK_CONTROL                              0x6084
 +#define AVIVO_D1CRTC_INTERLACE_CONTROL                          0x6088
 +#define AVIVO_D1CRTC_INTERLACE_STATUS                           0x608c
 +#define AVIVO_D1CRTC_STEREO_CONTROL                             0x60c4
 +
 +/* master controls */
 +#define AVIVO_DC_CRTC_MASTER_EN                                 0x60f8
 +#define AVIVO_DC_CRTC_TV_CONTROL                                0x60fc
 +
 +#define AVIVO_D1GRPH_ENABLE                                     0x6100
 +#define AVIVO_D1GRPH_CONTROL                                    0x6104
 +#       define AVIVO_D1GRPH_CONTROL_DEPTH_8BPP          (0<<0)
 +#       define AVIVO_D1GRPH_CONTROL_DEPTH_16BPP         (1<<0)
 +#       define AVIVO_D1GRPH_CONTROL_DEPTH_32BPP         (2<<0)
 +#       define AVIVO_D1GRPH_CONTROL_DEPTH_64BPP         (3<<0)
 +
 +#       define AVIVO_D1GRPH_CONTROL_8BPP_INDEXED        (0<<8)
 +
 +#       define AVIVO_D1GRPH_CONTROL_16BPP_ARGB1555      (0<<8)
 +#       define AVIVO_D1GRPH_CONTROL_16BPP_RGB565        (1<<8)
 +#       define AVIVO_D1GRPH_CONTROL_16BPP_ARGB4444      (2<<8)
 +#       define AVIVO_D1GRPH_CONTROL_16BPP_AI88          (3<<8)
 +#       define AVIVO_D1GRPH_CONTROL_16BPP_MONO16        (4<<8)
 +
 +#       define AVIVO_D1GRPH_CONTROL_32BPP_ARGB8888      (0<<8)
 +#       define AVIVO_D1GRPH_CONTROL_32BPP_ARGB2101010   (1<<8)
 +#       define AVIVO_D1GRPH_CONTROL_32BPP_DIGITAL       (2<<8)
 +#       define AVIVO_D1GRPH_CONTROL_32BPP_8B_ARGB2101010 (3<<8)
 +
 +
 +#       define AVIVO_D1GRPH_CONTROL_64BPP_ARGB16161616  (0<<8)
 +
 +#       define AVIVO_D1GRPH_SWAP_RB                     (1<<16)
 +#       define AVIVO_D1GRPH_TILED                       (1<<20)
 +#       define AVIVO_D1GRPH_MACRO_ADDRESS_MODE          (1<<21)
 +
 +#define AVIVO_D1GRPH_LUT_SEL                                    0x6108
 +#define AVIVO_D1GRPH_PRIMARY_SURFACE_ADDRESS                    0x6110
 +#define AVIVO_D1GRPH_SECONDARY_SURFACE_ADDRESS                  0x6118
 +#define AVIVO_D1GRPH_PITCH                                      0x6120
 +#define AVIVO_D1GRPH_SURFACE_OFFSET_X                           0x6124
 +#define AVIVO_D1GRPH_SURFACE_OFFSET_Y                           0x6128
 +#define AVIVO_D1GRPH_X_START                                    0x612c
 +#define AVIVO_D1GRPH_Y_START                                    0x6130
 +#define AVIVO_D1GRPH_X_END                                      0x6134
 +#define AVIVO_D1GRPH_Y_END                                      0x6138
 +#define AVIVO_D1GRPH_UPDATE                                     0x6144
 +#       define AVIVO_D1GRPH_UPDATE_LOCK                 (1<<16)
 +#define AVIVO_D1GRPH_FLIP_CONTROL                               0x6148
 +
 +#define AVIVO_D1CUR_CONTROL                     0x6400
 +#       define AVIVO_D1CURSOR_EN           (1<<0)
 +#       define AVIVO_D1CURSOR_MODE_SHIFT  8
 +#       define AVIVO_D1CURSOR_MODE_MASK   (0x3<<8)
 +#       define AVIVO_D1CURSOR_MODE_24BPP  (0x2)
 +#define AVIVO_D1CUR_SURFACE_ADDRESS             0x6408
 +#define AVIVO_D1CUR_SIZE                        0x6410
 +#define AVIVO_D1CUR_POSITION                    0x6414
 +#define AVIVO_D1CUR_HOT_SPOT                    0x6418
 +#define AVIVO_D1CUR_UPDATE                      0x6424
 +#       define AVIVO_D1CURSOR_UPDATE_LOCK (1 << 16)
 +
 +#define AVIVO_DC_LUT_RW_SELECT                  0x6480
 +#define AVIVO_DC_LUT_RW_MODE                    0x6484
 +#define AVIVO_DC_LUT_RW_INDEX                   0x6488
 +#define AVIVO_DC_LUT_SEQ_COLOR                  0x648c
 +#define AVIVO_DC_LUT_PWL_DATA                   0x6490
 +#define AVIVO_DC_LUT_30_COLOR                   0x6494
 +#define AVIVO_DC_LUT_READ_PIPE_SELECT           0x6498
 +#define AVIVO_DC_LUT_WRITE_EN_MASK              0x649c
 +#define AVIVO_DC_LUT_AUTOFILL                   0x64a0
 +
 +#define AVIVO_DC_LUTA_CONTROL                   0x64c0
 +#define AVIVO_DC_LUTA_BLACK_OFFSET_BLUE         0x64c4
 +#define AVIVO_DC_LUTA_BLACK_OFFSET_GREEN        0x64c8
 +#define AVIVO_DC_LUTA_BLACK_OFFSET_RED          0x64cc
 +#define AVIVO_DC_LUTA_WHITE_OFFSET_BLUE         0x64d0
 +#define AVIVO_DC_LUTA_WHITE_OFFSET_GREEN        0x64d4
 +#define AVIVO_DC_LUTA_WHITE_OFFSET_RED          0x64d8
 +
 +
 +#define AVIVO_D1MODE_DESKTOP_HEIGHT             0x652C
 +#define AVIVO_D1MODE_VIEWPORT_START             0x6580
 +#define AVIVO_D1MODE_VIEWPORT_SIZE              0x6584
 +#define AVIVO_D1MODE_EXT_OVERSCAN_LEFT_RIGHT    0x6588
 +#define AVIVO_D1MODE_EXT_OVERSCAN_TOP_BOTTOM    0x658c
 +
 +#define AVIVO_D1SCL_SCALER_ENABLE               0x6590
 +#define AVIVO_D1SCL_SCALER_TAP_CONTROL                0x6594
 +#define AVIVO_D1SCL_UPDATE                      0x65cc
 +#       define AVIVO_D1SCL_UPDATE_LOCK         (1<<16)
 +
 +/* second crtc */
 +#define AVIVO_D2CRTC_H_TOTAL                                  0x6800
 +#define AVIVO_D2CRTC_H_BLANK_START_END                          0x6804
 +#define AVIVO_D2CRTC_H_SYNC_A                                   0x6808
 +#define AVIVO_D2CRTC_H_SYNC_A_CNTL                              0x680c
 +#define AVIVO_D2CRTC_H_SYNC_B                                   0x6810
 +#define AVIVO_D2CRTC_H_SYNC_B_CNTL                              0x6814
 +
 +#define AVIVO_D2CRTC_V_TOTAL                                  0x6820
 +#define AVIVO_D2CRTC_V_BLANK_START_END                          0x6824
 +#define AVIVO_D2CRTC_V_SYNC_A                                   0x6828
 +#define AVIVO_D2CRTC_V_SYNC_A_CNTL                              0x682c
 +#define AVIVO_D2CRTC_V_SYNC_B                                   0x6830
 +#define AVIVO_D2CRTC_V_SYNC_B_CNTL                              0x6834
 +
 +#define AVIVO_D2CRTC_CONTROL                                    0x6880
 +#define AVIVO_D2CRTC_BLANK_CONTROL                              0x6884
 +#define AVIVO_D2CRTC_INTERLACE_CONTROL                          0x6888
 +#define AVIVO_D2CRTC_INTERLACE_STATUS                           0x688c
 +#define AVIVO_D2CRTC_STEREO_CONTROL                             0x68c4
 +
 +#define AVIVO_D2GRPH_ENABLE                                     0x6900
 +#define AVIVO_D2GRPH_CONTROL                                    0x6904
 +#define AVIVO_D2GRPH_LUT_SEL                                    0x6908
 +#define AVIVO_D2GRPH_PRIMARY_SURFACE_ADDRESS                    0x6910
 +#define AVIVO_D2GRPH_SECONDARY_SURFACE_ADDRESS                  0x6918
 +#define AVIVO_D2GRPH_PITCH                                      0x6920
 +#define AVIVO_D2GRPH_SURFACE_OFFSET_X                           0x6924
 +#define AVIVO_D2GRPH_SURFACE_OFFSET_Y                           0x6928
 +#define AVIVO_D2GRPH_X_START                                    0x692c
 +#define AVIVO_D2GRPH_Y_START                                    0x6930
 +#define AVIVO_D2GRPH_X_END                                      0x6934
 +#define AVIVO_D2GRPH_Y_END                                      0x6938
 +#define AVIVO_D2GRPH_UPDATE                                     0x6944
 +#define AVIVO_D2GRPH_FLIP_CONTROL                               0x6948
 +
 +#define AVIVO_D2CUR_CONTROL                     0x6c00
 +#define AVIVO_D2CUR_SURFACE_ADDRESS             0x6c08
 +#define AVIVO_D2CUR_SIZE                        0x6c10
 +#define AVIVO_D2CUR_POSITION                    0x6c14
 +
 +#define AVIVO_D2MODE_VIEWPORT_START             0x6d80
 +#define AVIVO_D2MODE_VIEWPORT_SIZE              0x6d84
 +#define AVIVO_D2MODE_EXT_OVERSCAN_LEFT_RIGHT    0x6d88
 +#define AVIVO_D2MODE_EXT_OVERSCAN_TOP_BOTTOM    0x6d8c
 +
 +#define AVIVO_D2SCL_SCALER_ENABLE               0x6d90
 +#define AVIVO_D2SCL_SCALER_TAP_CONTROL                0x6d94
 +
 +#define AVIVO_DDIA_BIT_DEPTH_CONTROL                          0x7214
 +
 +#define AVIVO_DACA_ENABLE                                     0x7800
 +#     define AVIVO_DAC_ENABLE                         (1 << 0)
 +#define AVIVO_DACA_SOURCE_SELECT                              0x7804
 +#       define AVIVO_DAC_SOURCE_CRTC1                   (0 << 0)
 +#       define AVIVO_DAC_SOURCE_CRTC2                   (1 << 0)
 +#       define AVIVO_DAC_SOURCE_TV                      (2 << 0)
 +
 +#define AVIVO_DACA_FORCE_OUTPUT_CNTL                          0x783c
 +# define AVIVO_DACA_FORCE_OUTPUT_CNTL_FORCE_DATA_EN             (1 << 0)
 +# define AVIVO_DACA_FORCE_OUTPUT_CNTL_DATA_SEL_SHIFT            (8)
 +# define AVIVO_DACA_FORCE_OUTPUT_CNTL_DATA_SEL_BLUE             (1 << 0)
 +# define AVIVO_DACA_FORCE_OUTPUT_CNTL_DATA_SEL_GREEN            (1 << 1)
 +# define AVIVO_DACA_FORCE_OUTPUT_CNTL_DATA_SEL_RED              (1 << 2)
 +# define AVIVO_DACA_FORCE_OUTPUT_CNTL_DATA_ON_BLANKB_ONLY       (1 << 24)
 +#define AVIVO_DACA_POWERDOWN                                  0x7850
 +# define AVIVO_DACA_POWERDOWN_POWERDOWN                         (1 << 0)
 +# define AVIVO_DACA_POWERDOWN_BLUE                              (1 << 8)
 +# define AVIVO_DACA_POWERDOWN_GREEN                             (1 << 16)
 +# define AVIVO_DACA_POWERDOWN_RED                               (1 << 24)
 +
 +#define AVIVO_DACB_ENABLE                                     0x7a00
 +#define AVIVO_DACB_SOURCE_SELECT                              0x7a04
 +#define AVIVO_DACB_FORCE_OUTPUT_CNTL                          0x7a3c
 +# define AVIVO_DACB_FORCE_OUTPUT_CNTL_FORCE_DATA_EN             (1 << 0)
 +# define AVIVO_DACB_FORCE_OUTPUT_CNTL_DATA_SEL_SHIFT            (8)
 +# define AVIVO_DACB_FORCE_OUTPUT_CNTL_DATA_SEL_BLUE             (1 << 0)
 +# define AVIVO_DACB_FORCE_OUTPUT_CNTL_DATA_SEL_GREEN            (1 << 1)
 +# define AVIVO_DACB_FORCE_OUTPUT_CNTL_DATA_SEL_RED              (1 << 2)
 +# define AVIVO_DACB_FORCE_OUTPUT_CNTL_DATA_ON_BLANKB_ONLY       (1 << 24)
 +#define AVIVO_DACB_POWERDOWN                                  0x7a50
 +# define AVIVO_DACB_POWERDOWN_POWERDOWN                         (1 << 0)
 +# define AVIVO_DACB_POWERDOWN_BLUE                              (1 << 8)
 +# define AVIVO_DACB_POWERDOWN_GREEN                             (1 << 16)
 +# define AVIVO_DACB_POWERDOWN_RED 
 +
 +#define AVIVO_TMDSA_CNTL                    0x7880
 +#   define AVIVO_TMDSA_CNTL_ENABLE               (1 << 0)
 +#   define AVIVO_TMDSA_CNTL_HPD_MASK             (1 << 4)
 +#   define AVIVO_TMDSA_CNTL_HPD_SELECT           (1 << 8)
 +#   define AVIVO_TMDSA_CNTL_SYNC_PHASE           (1 << 12)
 +#   define AVIVO_TMDSA_CNTL_PIXEL_ENCODING       (1 << 16)
 +#   define AVIVO_TMDSA_CNTL_DUAL_LINK_ENABLE     (1 << 24)
 +#   define AVIVO_TMDSA_CNTL_SWAP                 (1 << 28)
 +#define AVIVO_TMDSA_SOURCE_SELECT                             0x7884
 +/* 78a8 appears to be some kind of (reasonably tolerant) clock?
 + * 78d0 definitely hits the transmitter, definitely clock. */
 +/* MYSTERY1 This appears to control dithering? */
 +#define AVIVO_TMDSA_BIT_DEPTH_CONTROL         0x7894
 +#   define AVIVO_TMDS_BIT_DEPTH_CONTROL_TRUNCATE_EN           (1 << 0)
 +#   define AVIVO_TMDS_BIT_DEPTH_CONTROL_TRUNCATE_DEPTH        (1 << 4)
 +#   define AVIVO_TMDS_BIT_DEPTH_CONTROL_SPATIAL_DITHER_EN     (1 << 8)
 +#   define AVIVO_TMDS_BIT_DEPTH_CONTROL_SPATIAL_DITHER_DEPTH  (1 << 12)
 +#   define AVIVO_TMDS_BIT_DEPTH_CONTROL_TEMPORAL_DITHER_EN    (1 << 16)
 +#   define AVIVO_TMDS_BIT_DEPTH_CONTROL_TEMPORAL_DITHER_DEPTH (1 << 20)
 +#   define AVIVO_TMDS_BIT_DEPTH_CONTROL_TEMPORAL_LEVEL        (1 << 24)
 +#   define AVIVO_TMDS_BIT_DEPTH_CONTROL_TEMPORAL_DITHER_RESET (1 << 26)
 +#define AVIVO_TMDSA_DCBALANCER_CONTROL                  0x78d0
 +#   define AVIVO_TMDSA_DCBALANCER_CONTROL_EN                  (1 << 0)
 +#   define AVIVO_TMDSA_DCBALANCER_CONTROL_TEST_EN             (1 << 8)
 +#   define AVIVO_TMDSA_DCBALANCER_CONTROL_TEST_IN_SHIFT       (16)
 +#   define AVIVO_TMDSA_DCBALANCER_CONTROL_FORCE               (1 << 24)
 +#define AVIVO_TMDSA_DATA_SYNCHRONIZATION                0x78d8
 +#   define AVIVO_TMDSA_DATA_SYNCHRONIZATION_DSYNSEL           (1 << 0)
 +#   define AVIVO_TMDSA_DATA_SYNCHRONIZATION_PFREQCHG          (1 << 8)
 +#define AVIVO_TMDSA_CLOCK_ENABLE            0x7900
 +#define AVIVO_TMDSA_TRANSMITTER_ENABLE              0x7904
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_TX0_ENABLE          (1 << 0)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_LNKC0EN             (1 << 1)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_LNKD00EN            (1 << 2)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_LNKD01EN            (1 << 3)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_LNKD02EN            (1 << 4)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_TX1_ENABLE          (1 << 8)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_LNKD10EN            (1 << 10)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_LNKD11EN            (1 << 11)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_LNKD12EN            (1 << 12)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_TX_ENABLE_HPD_MASK  (1 << 16)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_LNKCEN_HPD_MASK     (1 << 17)
 +#   define AVIVO_TMDSA_TRANSMITTER_ENABLE_LNKDEN_HPD_MASK     (1 << 18)
 +
 +#define AVIVO_TMDSA_TRANSMITTER_CONTROL                               0x7910
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_PLL_ENABLE       (1 << 0)
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_PLL_RESET        (1 << 1)
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_PLL_HPD_MASK_SHIFT       (2)
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_IDSCKSEL         (1 << 4)
 +#       define AVIVO_TMDSA_TRANSMITTER_CONTROL_BGSLEEP          (1 << 5)
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_PLL_PWRUP_SEQ_EN (1 << 6)
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_TMCLK            (1 << 8)
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_TMCLK_FROM_PADS  (1 << 13)
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_TDCLK            (1 << 14)
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_TDCLK_FROM_PADS  (1 << 15)
 +#       define AVIVO_TMDSA_TRANSMITTER_CONTROL_CLK_PATTERN_SHIFT (16)
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_BYPASS_PLL       (1 << 28)
 +#       define AVIVO_TMDSA_TRANSMITTER_CONTROL_USE_CLK_DATA     (1 << 29)
 +#     define AVIVO_TMDSA_TRANSMITTER_CONTROL_INPUT_TEST_CLK_SEL       (1 << 31)
 +
 +#define AVIVO_LVTMA_CNTL                                      0x7a80
 +#   define AVIVO_LVTMA_CNTL_ENABLE               (1 << 0)
 +#   define AVIVO_LVTMA_CNTL_HPD_MASK             (1 << 4)
 +#   define AVIVO_LVTMA_CNTL_HPD_SELECT           (1 << 8)
 +#   define AVIVO_LVTMA_CNTL_SYNC_PHASE           (1 << 12)
 +#   define AVIVO_LVTMA_CNTL_PIXEL_ENCODING       (1 << 16)
 +#   define AVIVO_LVTMA_CNTL_DUAL_LINK_ENABLE     (1 << 24)
 +#   define AVIVO_LVTMA_CNTL_SWAP                 (1 << 28)
 +#define AVIVO_LVTMA_SOURCE_SELECT                               0x7a84
 +#define AVIVO_LVTMA_COLOR_FORMAT                                0x7a88
 +#define AVIVO_LVTMA_BIT_DEPTH_CONTROL                           0x7a94
 +#   define AVIVO_LVTMA_BIT_DEPTH_CONTROL_TRUNCATE_EN           (1 << 0)
 +#   define AVIVO_LVTMA_BIT_DEPTH_CONTROL_TRUNCATE_DEPTH        (1 << 4)
 +#   define AVIVO_LVTMA_BIT_DEPTH_CONTROL_SPATIAL_DITHER_EN     (1 << 8)
 +#   define AVIVO_LVTMA_BIT_DEPTH_CONTROL_SPATIAL_DITHER_DEPTH  (1 << 12)
 +#   define AVIVO_LVTMA_BIT_DEPTH_CONTROL_TEMPORAL_DITHER_EN    (1 << 16)
 +#   define AVIVO_LVTMA_BIT_DEPTH_CONTROL_TEMPORAL_DITHER_DEPTH (1 << 20)
 +#   define AVIVO_LVTMA_BIT_DEPTH_CONTROL_TEMPORAL_LEVEL        (1 << 24)
 +#   define AVIVO_LVTMA_BIT_DEPTH_CONTROL_TEMPORAL_DITHER_RESET (1 << 26)
 +
 +
 +
 +#define AVIVO_LVTMA_DCBALANCER_CONTROL                  0x7ad0
 +#   define AVIVO_LVTMA_DCBALANCER_CONTROL_EN                  (1 << 0)
 +#   define AVIVO_LVTMA_DCBALANCER_CONTROL_TEST_EN             (1 << 8)
 +#   define AVIVO_LVTMA_DCBALANCER_CONTROL_TEST_IN_SHIFT       (16)
 +#   define AVIVO_LVTMA_DCBALANCER_CONTROL_FORCE               (1 << 24)
 +
 +#define AVIVO_LVTMA_DATA_SYNCHRONIZATION                0x78d8
 +#   define AVIVO_LVTMA_DATA_SYNCHRONIZATION_DSYNSEL           (1 << 0)
 +#   define AVIVO_LVTMA_DATA_SYNCHRONIZATION_PFREQCHG          (1 << 8)
 +#define R500_LVTMA_CLOCK_ENABLE                       0x7b00
 +#define R600_LVTMA_CLOCK_ENABLE                       0x7b04
 +
 +#define R500_LVTMA_TRANSMITTER_ENABLE              0x7b04
 +#define R600_LVTMA_TRANSMITTER_ENABLE              0x7b08
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKC0EN             (1 << 1)
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKD00EN            (1 << 2)
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKD01EN            (1 << 3)
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKD02EN            (1 << 4)
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKD03EN            (1 << 5)
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKC1EN             (1 << 9)
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKD10EN            (1 << 10)
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKD11EN            (1 << 11)
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKD12EN            (1 << 12)
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKCEN_HPD_MASK     (1 << 17)
 +#   define AVIVO_LVTMA_TRANSMITTER_ENABLE_LNKDEN_HPD_MASK     (1 << 18)
 +
 +#define R500_LVTMA_TRANSMITTER_CONTROL                                0x7b10
 +#define R600_LVTMA_TRANSMITTER_CONTROL                                0x7b14
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_PLL_ENABLE         (1 << 0)
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_PLL_RESET          (1 << 1)
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_PLL_HPD_MASK_SHIFT (2)
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_IDSCKSEL           (1 << 4)
 +#       define AVIVO_LVTMA_TRANSMITTER_CONTROL_BGSLEEP            (1 << 5)
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_PLL_PWRUP_SEQ_EN   (1 << 6)
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_TMCLK              (1 << 8)
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_TMCLK_FROM_PADS    (1 << 13)
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_TDCLK              (1 << 14)
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_TDCLK_FROM_PADS    (1 << 15)
 +#       define AVIVO_LVTMA_TRANSMITTER_CONTROL_CLK_PATTERN_SHIFT  (16)
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_BYPASS_PLL         (1 << 28)
 +#       define AVIVO_LVTMA_TRANSMITTER_CONTROL_USE_CLK_DATA       (1 << 29)
 +#     define AVIVO_LVTMA_TRANSMITTER_CONTROL_INPUT_TEST_CLK_SEL (1 << 31)
 +
 +#define R500_LVTMA_PWRSEQ_CNTL                                                0x7af0
 +#define R600_LVTMA_PWRSEQ_CNTL                                                0x7af4
 +#     define AVIVO_LVTMA_PWRSEQ_EN                                        (1 << 0)
 +#     define AVIVO_LVTMA_PWRSEQ_PLL_ENABLE_MASK                           (1 << 2)
 +#     define AVIVO_LVTMA_PWRSEQ_PLL_RESET_MASK                            (1 << 3)
 +#     define AVIVO_LVTMA_PWRSEQ_TARGET_STATE                              (1 << 4)
 +#     define AVIVO_LVTMA_SYNCEN                                           (1 << 8)
 +#     define AVIVO_LVTMA_SYNCEN_OVRD                                      (1 << 9)
 +#     define AVIVO_LVTMA_SYNCEN_POL                                       (1 << 10)
 +#     define AVIVO_LVTMA_DIGON                                            (1 << 16)
 +#     define AVIVO_LVTMA_DIGON_OVRD                                       (1 << 17)
 +#     define AVIVO_LVTMA_DIGON_POL                                        (1 << 18)
 +#     define AVIVO_LVTMA_BLON                                             (1 << 24)
 +#     define AVIVO_LVTMA_BLON_OVRD                                        (1 << 25)
 +#     define AVIVO_LVTMA_BLON_POL                                         (1 << 26)
 +
 +#define R500_LVTMA_PWRSEQ_STATE                        0x7af4
 +#define R600_LVTMA_PWRSEQ_STATE                        0x7af8
 +#       define AVIVO_LVTMA_PWRSEQ_STATE_TARGET_STATE_R          (1 << 0)
 +#       define AVIVO_LVTMA_PWRSEQ_STATE_DIGON                   (1 << 1)
 +#       define AVIVO_LVTMA_PWRSEQ_STATE_SYNCEN                  (1 << 2)
 +#       define AVIVO_LVTMA_PWRSEQ_STATE_BLON                    (1 << 3)
 +#       define AVIVO_LVTMA_PWRSEQ_STATE_DONE                    (1 << 4)
 +#       define AVIVO_LVTMA_PWRSEQ_STATE_STATUS_SHIFT            (8)
 +
 +#define AVIVO_LVDS_BACKLIGHT_CNTL                     0x7af8
 +#     define AVIVO_LVDS_BACKLIGHT_CNTL_EN                     (1 << 0)
 +#     define AVIVO_LVDS_BACKLIGHT_LEVEL_MASK          0x0000ff00
 +#     define AVIVO_LVDS_BACKLIGHT_LEVEL_SHIFT         8
 +
 +#define AVIVO_DVOA_BIT_DEPTH_CONTROL                  0x7988
 +
 +#define AVIVO_GPIO_0                        0x7e30
 +#define AVIVO_GPIO_1                        0x7e40
 +#define AVIVO_GPIO_2                        0x7e50
 +#define AVIVO_GPIO_3                        0x7e60
 +
 +#define AVIVO_DC_GPIO_HPD_Y                 0x7e9c
 +
 +#define AVIVO_I2C_STATUS                                      0x7d30
 +#     define AVIVO_I2C_STATUS_DONE                            (1 << 0)
 +#     define AVIVO_I2C_STATUS_NACK                            (1 << 1)
 +#     define AVIVO_I2C_STATUS_HALT                            (1 << 2)
 +#     define AVIVO_I2C_STATUS_GO                              (1 << 3)
 +#     define AVIVO_I2C_STATUS_MASK                            0x7
 +/* If radeon_mm_i2c is to be believed, this is HALT, NACK, and maybe
 + * DONE? */
 +#     define AVIVO_I2C_STATUS_CMD_RESET                       0x7
 +#     define AVIVO_I2C_STATUS_CMD_WAIT                        (1 << 3)
 +#define AVIVO_I2C_STOP                                                0x7d34
 +#define AVIVO_I2C_START_CNTL                          0x7d38
 +#     define AVIVO_I2C_START                                          (1 << 8)
 +#     define AVIVO_I2C_CONNECTOR0                                     (0 << 16)
 +#     define AVIVO_I2C_CONNECTOR1                                     (1 << 16)
 +#define R520_I2C_START (1<<0)
 +#define R520_I2C_STOP (1<<1)
 +#define R520_I2C_RX (1<<2)
 +#define R520_I2C_EN (1<<8)
 +#define R520_I2C_DDC1 (0<<16)
 +#define R520_I2C_DDC2 (1<<16)
 +#define R520_I2C_DDC3 (2<<16)
 +#define R520_I2C_DDC_MASK (3<<16)
 +#define AVIVO_I2C_CONTROL2                                    0x7d3c
 +#     define AVIVO_I2C_7D3C_SIZE_SHIFT                        8
 +#     define AVIVO_I2C_7D3C_SIZE_MASK                         (0xf << 8)
 +#define AVIVO_I2C_CONTROL3                                            0x7d40
 +/* Reading is done 4 bytes at a time: read the bottom 8 bits from
 + * 7d44, four times in a row.
 + * Writing is a little more complex.  First write DATA with
 + * 0xnnnnnnzz, then 0xnnnnnnyy, where nnnnnn is some non-deterministic
 + * magic number, zz is, I think, the slave address, and yy is the byte
 + * you want to write. */
 +#define AVIVO_I2C_DATA                                                0x7d44
 +#define R520_I2C_ADDR_COUNT_MASK (0x7)
 +#define R520_I2C_DATA_COUNT_SHIFT (8)
 +#define R520_I2C_DATA_COUNT_MASK (0xF00)
 +#define AVIVO_I2C_CNTL                                                0x7d50
 +#     define AVIVO_I2C_EN                                                     (1 << 0)
 +#     define AVIVO_I2C_RESET                                          (1 << 8)
 +
 +#define R600_GENERAL_PWRMGT                                        0x618
 +#     define R600_OPEN_DRAIN_PADS                                (1 << 11)
 +
 +#define R600_LOWER_GPIO_ENABLE                                     0x710
 +#define R600_CTXSW_VID_LOWER_GPIO_CNTL                             0x718
 +#define R600_HIGH_VID_LOWER_GPIO_CNTL                              0x71c
 +#define R600_MEDIUM_VID_LOWER_GPIO_CNTL                            0x720
 +#define R600_LOW_VID_LOWER_GPIO_CNTL                               0x724
 +
 +#define R600_MC_VM_FB_LOCATION                                     0x2180
 +#define R600_MC_VM_AGP_TOP                                         0x2184
 +#define R600_MC_VM_AGP_BOT                                         0x2188
 +#define R600_MC_VM_AGP_BASE                                        0x218c
 +#define R600_MC_VM_SYSTEM_APERTURE_LOW_ADDR                        0x2190
 +#define R600_MC_VM_SYSTEM_APERTURE_HIGH_ADDR                       0x2194
 +#define R600_MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR                    0x2198
 +
 +#define R700_MC_VM_FB_LOCATION                                     0x2024
 +
 +#define R600_HDP_NONSURFACE_BASE                                0x2c04
 +
 +#define R600_BUS_CNTL                                           0x5420
 +#define R600_CONFIG_CNTL                                        0x5424
 +#define R600_CONFIG_MEMSIZE                                     0x5428
 +#define R600_CONFIG_F0_BASE                                     0x542C
 +#define R600_CONFIG_APER_SIZE                                   0x5430
 +
 +#define R600_ROM_CNTL                              0x1600
 +#       define R600_SCK_OVERWRITE                  (1 << 1)
 +#       define R600_SCK_PRESCALE_CRYSTAL_CLK_SHIFT 28
 +#       define R600_SCK_PRESCALE_CRYSTAL_CLK_MASK  (0xf << 28)
 +
 +#define R600_BIOS_0_SCRATCH               0x1724
 +#define R600_BIOS_1_SCRATCH               0x1728
 +#define R600_BIOS_2_SCRATCH               0x172c
 +#define R600_BIOS_3_SCRATCH               0x1730
 +#define R600_BIOS_4_SCRATCH               0x1734
 +#define R600_BIOS_5_SCRATCH               0x1738
 +#define R600_BIOS_6_SCRATCH               0x173c
 +#define R600_BIOS_7_SCRATCH               0x1740
 +
 +#define R300_GB_TILE_CONFIG                           0x4018
 +#       define R300_ENABLE_TILING                       (1 << 0)
 +#       define R300_PIPE_COUNT_RV350                    (0 << 1)
 +#       define R300_PIPE_COUNT_R300                     (3 << 1)
 +#       define R300_PIPE_COUNT_R420_3P                  (6 << 1)
 +#       define R300_PIPE_COUNT_R420                     (7 << 1)
 +#       define R300_TILE_SIZE_8                         (0 << 4)
 +#       define R300_TILE_SIZE_16                        (1 << 4)
 +#       define R300_TILE_SIZE_32                        (2 << 4)
 +#       define R300_SUBPIXEL_1_12                       (0 << 16)
 +#       define R300_SUBPIXEL_1_16                       (1 << 16)
- #define R300_VAP_VTE_CNTL                             0x20B0
- #       define R300_VPORT_X_SCALE_ENA                   (1 << 0)
- #       define R300_VPORT_X_OFFSET_ENA                  (1 << 1)
- #       define R300_VPORT_Y_SCALE_ENA                   (1 << 2)
- #       define R300_VPORT_Y_OFFSET_ENA                  (1 << 3)
- #       define R300_VPORT_Z_SCALE_ENA                   (1 << 4)
- #       define R300_VPORT_Z_OFFSET_ENA                  (1 << 5)
- #       define R300_VTX_XY_FMT                          (1 << 8)
- #       define R300_VTX_Z_FMT                           (1 << 9)
- #       define R300_VTX_W0_FMT                          (1 << 10)
- #define R300_VAP_VTX_STATE_CNTL                               0x2180
 +#define R300_GB_ENABLE                                        0x4008
 +#define R300_GB_AA_CONFIG                             0x4020
 +#define R400_GB_PIPE_SELECT                             0x402c
 +#define R300_GB_MSPOS0                                        0x4010
 +#       define R300_MS_X0_SHIFT                         0
 +#       define R300_MS_Y0_SHIFT                         4
 +#       define R300_MS_X1_SHIFT                         8
 +#       define R300_MS_Y1_SHIFT                         12
 +#       define R300_MS_X2_SHIFT                         16
 +#       define R300_MS_Y2_SHIFT                         20
 +#       define R300_MSBD0_Y_SHIFT                       24
 +#       define R300_MSBD0_X_SHIFT                       28
 +#define R300_GB_MSPOS1                                        0x4014
 +#       define R300_MS_X3_SHIFT                         0
 +#       define R300_MS_Y3_SHIFT                         4
 +#       define R300_MS_X4_SHIFT                         8
 +#       define R300_MS_Y4_SHIFT                         12
 +#       define R300_MS_X5_SHIFT                         16
 +#       define R300_MS_Y5_SHIFT                         20
 +#       define R300_MSBD1_SHIFT                         24
 +
 +#define R300_GA_ENHANCE                                       0x4274
 +#       define R300_GA_DEADLOCK_CNTL                    (1 << 0)
 +#       define R300_GA_FASTSYNC_CNTL                    (1 << 1)
 +
 +#define R300_GA_POLY_MODE                             0x4288
 +#       define R300_FRONT_PTYPE_POINT                   (0 << 4)
 +#       define R300_FRONT_PTYPE_LINE                    (1 << 4)
 +#       define R300_FRONT_PTYPE_TRIANGE                 (2 << 4)
 +#       define R300_BACK_PTYPE_POINT                    (0 << 7)
 +#       define R300_BACK_PTYPE_LINE                     (1 << 7)
 +#       define R300_BACK_PTYPE_TRIANGE                  (2 << 7)
 +#define R300_GA_ROUND_MODE                            0x428c
 +#       define R300_GEOMETRY_ROUND_TRUNC                (0 << 0)
 +#       define R300_GEOMETRY_ROUND_NEAREST              (1 << 0)
 +#       define R300_COLOR_ROUND_TRUNC                   (0 << 2)
 +#       define R300_COLOR_ROUND_NEAREST                 (1 << 2)
 +#define R300_GA_COLOR_CONTROL                         0x4278
 +#       define R300_RGB0_SHADING_SOLID                  (0 << 0)
 +#       define R300_RGB0_SHADING_FLAT                   (1 << 0)
 +#       define R300_RGB0_SHADING_GOURAUD                (2 << 0)
 +#       define R300_ALPHA0_SHADING_SOLID                (0 << 2)
 +#       define R300_ALPHA0_SHADING_FLAT                 (1 << 2)
 +#       define R300_ALPHA0_SHADING_GOURAUD              (2 << 2)
 +#       define R300_RGB1_SHADING_SOLID                  (0 << 4)
 +#       define R300_RGB1_SHADING_FLAT                   (1 << 4)
 +#       define R300_RGB1_SHADING_GOURAUD                (2 << 4)
 +#       define R300_ALPHA1_SHADING_SOLID                (0 << 6)
 +#       define R300_ALPHA1_SHADING_FLAT                 (1 << 6)
 +#       define R300_ALPHA1_SHADING_GOURAUD              (2 << 6)
 +#       define R300_RGB2_SHADING_SOLID                  (0 << 8)
 +#       define R300_RGB2_SHADING_FLAT                   (1 << 8)
 +#       define R300_RGB2_SHADING_GOURAUD                (2 << 8)
 +#       define R300_ALPHA2_SHADING_SOLID                (0 << 10)
 +#       define R300_ALPHA2_SHADING_FLAT                 (1 << 10)
 +#       define R300_ALPHA2_SHADING_GOURAUD              (2 << 10)
 +#       define R300_RGB3_SHADING_SOLID                  (0 << 12)
 +#       define R300_RGB3_SHADING_FLAT                   (1 << 12)
 +#       define R300_RGB3_SHADING_GOURAUD                (2 << 12)
 +#       define R300_ALPHA3_SHADING_SOLID                (0 << 14)
 +#       define R300_ALPHA3_SHADING_FLAT                 (1 << 14)
 +#       define R300_ALPHA3_SHADING_GOURAUD              (2 << 14)
 +#define R300_GA_OFFSET                                        0x4290
 +
 +#define R500_SU_REG_DEST                                0x42c8
 +
 +#define R300_VAP_CNTL_STATUS                          0x2140
 +#       define R300_PVS_BYPASS                          (1 << 8)
 +#define R300_VAP_PVS_STATE_FLUSH_REG                  0x2284
 +#define R300_VAP_CNTL                                 0x2080
 +#       define R300_PVS_NUM_SLOTS_SHIFT                 0
 +#       define R300_PVS_NUM_CNTLRS_SHIFT                4
 +#       define R300_PVS_NUM_FPUS_SHIFT                  8
 +#       define R300_VF_MAX_VTX_NUM_SHIFT                18
 +#       define R300_GL_CLIP_SPACE_DEF                   (0 << 22)
 +#       define R300_DX_CLIP_SPACE_DEF                   (1 << 22)
 +#       define R500_TCL_STATE_OPTIMIZATION              (1 << 23)
- #define R300_TX_BORDER_COLOR_0                                0x45c0
 +#define R300_VAP_PSC_SGN_NORM_CNTL                    0x21DC
 +#define R300_VAP_PROG_STREAM_CNTL_0                   0x2150
 +#       define R300_DATA_TYPE_0_SHIFT                   0
 +#       define R300_DATA_TYPE_FLOAT_1                   0
 +#       define R300_DATA_TYPE_FLOAT_2                   1
 +#       define R300_DATA_TYPE_FLOAT_3                   2
 +#       define R300_DATA_TYPE_FLOAT_4                   3
 +#       define R300_DATA_TYPE_BYTE                      4
 +#       define R300_DATA_TYPE_D3DCOLOR                  5
 +#       define R300_DATA_TYPE_SHORT_2                   6
 +#       define R300_DATA_TYPE_SHORT_4                   7
 +#       define R300_DATA_TYPE_VECTOR_3_TTT              8
 +#       define R300_DATA_TYPE_VECTOR_3_EET              9
 +#       define R300_SKIP_DWORDS_0_SHIFT                 4
 +#       define R300_DST_VEC_LOC_0_SHIFT                 8
 +#       define R300_LAST_VEC_0                          (1 << 13)
 +#       define R300_SIGNED_0                            (1 << 14)
 +#       define R300_NORMALIZE_0                         (1 << 15)
 +#       define R300_DATA_TYPE_1_SHIFT                   16
 +#       define R300_SKIP_DWORDS_1_SHIFT                 20
 +#       define R300_DST_VEC_LOC_1_SHIFT                 24
 +#       define R300_LAST_VEC_1                          (1 << 29)
 +#       define R300_SIGNED_1                            (1 << 30)
 +#       define R300_NORMALIZE_1                         (1 << 31)
 +#define R300_VAP_PROG_STREAM_CNTL_1                   0x2154
 +#       define R300_DATA_TYPE_2_SHIFT                   0
 +#       define R300_SKIP_DWORDS_2_SHIFT                 4
 +#       define R300_DST_VEC_LOC_2_SHIFT                 8
 +#       define R300_LAST_VEC_2                          (1 << 13)
 +#       define R300_SIGNED_2                            (1 << 14)
 +#       define R300_NORMALIZE_2                         (1 << 15)
 +#       define R300_DATA_TYPE_3_SHIFT                   16
 +#       define R300_SKIP_DWORDS_3_SHIFT                 20
 +#       define R300_DST_VEC_LOC_3_SHIFT                 24
 +#       define R300_LAST_VEC_3                          (1 << 29)
 +#       define R300_SIGNED_3                            (1 << 30)
 +#       define R300_NORMALIZE_3                         (1 << 31)
 +#define R300_VAP_PROG_STREAM_CNTL_EXT_0                       0x21e0
 +#       define R300_SWIZZLE_SELECT_X_0_SHIFT            0
 +#       define R300_SWIZZLE_SELECT_Y_0_SHIFT            3
 +#       define R300_SWIZZLE_SELECT_Z_0_SHIFT            6
 +#       define R300_SWIZZLE_SELECT_W_0_SHIFT            9
 +#       define R300_SWIZZLE_SELECT_X                    0
 +#       define R300_SWIZZLE_SELECT_Y                    1
 +#       define R300_SWIZZLE_SELECT_Z                    2
 +#       define R300_SWIZZLE_SELECT_W                    3
 +#       define R300_SWIZZLE_SELECT_FP_ZERO              4
 +#       define R300_SWIZZLE_SELECT_FP_ONE               5
 +#       define R300_WRITE_ENA_0_SHIFT                   12
 +#       define R300_WRITE_ENA_X                         1
 +#       define R300_WRITE_ENA_Y                         2
 +#       define R300_WRITE_ENA_Z                         4
 +#       define R300_WRITE_ENA_W                         8
 +#       define R300_SWIZZLE_SELECT_X_1_SHIFT            16
 +#       define R300_SWIZZLE_SELECT_Y_1_SHIFT            19
 +#       define R300_SWIZZLE_SELECT_Z_1_SHIFT            22
 +#       define R300_SWIZZLE_SELECT_W_1_SHIFT            25
 +#       define R300_WRITE_ENA_1_SHIFT                   28
 +#define R300_VAP_PROG_STREAM_CNTL_EXT_1                       0x21e4
 +#       define R300_SWIZZLE_SELECT_X_2_SHIFT            0
 +#       define R300_SWIZZLE_SELECT_Y_2_SHIFT            3
 +#       define R300_SWIZZLE_SELECT_Z_2_SHIFT            6
 +#       define R300_SWIZZLE_SELECT_W_2_SHIFT            9
 +#       define R300_WRITE_ENA_2_SHIFT                   12
 +#       define R300_SWIZZLE_SELECT_X_3_SHIFT            16
 +#       define R300_SWIZZLE_SELECT_Y_3_SHIFT            19
 +#       define R300_SWIZZLE_SELECT_Z_3_SHIFT            22
 +#       define R300_SWIZZLE_SELECT_W_3_SHIFT            25
 +#       define R300_WRITE_ENA_3_SHIFT                   28
 +#define R300_VAP_PVS_CODE_CNTL_0                      0x22D0
 +#       define R300_PVS_FIRST_INST_SHIFT                0
 +#       define R300_PVS_XYZW_VALID_INST_SHIFT           10
 +#       define R300_PVS_LAST_INST_SHIFT                 20
 +#define R300_VAP_PVS_CODE_CNTL_1                      0x22D8
 +#       define R300_PVS_LAST_VTX_SRC_INST_SHIFT         0
 +#define R300_VAP_PVS_VECTOR_INDX_REG                  0x2200
 +#define R300_VAP_PVS_VECTOR_DATA_REG                  0x2204
 +/* PVS instructions */
 +/* Opcode and dst instruction */
 +#define R300_PVS_DST_OPCODE(x)                          (x << 0)
 +/* Vector ops */
 +#       define R300_VECTOR_NO_OP                        0
 +#       define R300_VE_DOT_PRODUCT                      1
 +#       define R300_VE_MULTIPLY                         2
 +#       define R300_VE_ADD                              3
 +#       define R300_VE_MULTIPLY_ADD                     4
 +#       define R300_VE_DISTANCE_VECTOR                  5
 +#       define R300_VE_FRACTION                         6
 +#       define R300_VE_MAXIMUM                          7
 +#       define R300_VE_MINIMUM                          8
 +#       define R300_VE_SET_GREATER_THAN_EQUAL           9
 +#       define R300_VE_SET_LESS_THAN                    10
 +#       define R300_VE_MULTIPLYX2_ADD                   11
 +#       define R300_VE_MULTIPLY_CLAMP                   12
 +#       define R300_VE_FLT2FIX_DX                       13
 +#       define R300_VE_FLT2FIX_DX_RND                   14
 +/* R500 additions */
 +#       define R500_VE_PRED_SET_EQ_PUSH                 15
 +#       define R500_VE_PRED_SET_GT_PUSH                 16
 +#       define R500_VE_PRED_SET_GTE_PUSH                17
 +#       define R500_VE_PRED_SET_NEQ_PUSH                18
 +#       define R500_VE_COND_WRITE_EQ                    19
 +#       define R500_VE_COND_WRITE_GT                    20
 +#       define R500_VE_COND_WRITE_GTE                   21
 +#       define R500_VE_COND_WRITE_NEQ                   22
 +#       define R500_VE_COND_MUX_EQ                      23
 +#       define R500_VE_COND_MUX_GT                      24
 +#       define R500_VE_COND_MUX_GTE                     25
 +#       define R500_VE_SET_GREATER_THAN                 26
 +#       define R500_VE_SET_EQUAL                        27
 +#       define R500_VE_SET_NOT_EQUAL                    28
 +/* Math ops */
 +#       define R300_MATH_NO_OP                          0
 +#       define R300_ME_EXP_BASE2_DX                     1
 +#       define R300_ME_LOG_BASE2_DX                     2
 +#       define R300_ME_EXP_BASEE_FF                     3
 +#       define R300_ME_LIGHT_COEFF_DX                   4
 +#       define R300_ME_POWER_FUNC_FF                    5
 +#       define R300_ME_RECIP_DX                         6
 +#       define R300_ME_RECIP_FF                         7
 +#       define R300_ME_RECIP_SQRT_DX                    8
 +#       define R300_ME_RECIP_SQRT_FF                    9
 +#       define R300_ME_MULTIPLY                         10
 +#       define R300_ME_EXP_BASE2_FULL_DX                11
 +#       define R300_ME_LOG_BASE2_FULL_DX                12
 +#       define R300_ME_POWER_FUNC_FF_CLAMP_B            13
 +#       define R300_ME_POWER_FUNC_FF_CLAMP_B1           14
 +#       define R300_ME_POWER_FUNC_FF_CLAMP_01           15
 +#       define R300_ME_SIN                              16
 +#       define R300_ME_COS                              17
 +/* R500 additions */
 +#       define R500_ME_LOG_BASE2_IEEE                   18
 +#       define R500_ME_RECIP_IEEE                       19
 +#       define R500_ME_RECIP_SQRT_IEEE                  20
 +#       define R500_ME_PRED_SET_EQ                      21
 +#       define R500_ME_PRED_SET_GT                      22
 +#       define R500_ME_PRED_SET_GTE                     23
 +#       define R500_ME_PRED_SET_NEQ                     24
 +#       define R500_ME_PRED_SET_CLR                     25
 +#       define R500_ME_PRED_SET_INV                     26
 +#       define R500_ME_PRED_SET_POP                     27
 +#       define R500_ME_PRED_SET_RESTORE                 28
 +/* macro */
 +#       define R300_PVS_MACRO_OP_2CLK_MADD              0
 +#       define R300_PVS_MACRO_OP_2CLK_M2X_ADD           1
 +#define R300_PVS_DST_MATH_INST                          (1 << 6)
 +#define R300_PVS_DST_MACRO_INST                         (1 << 7)
 +#define R300_PVS_DST_REG_TYPE(x)                        (x << 8)
 +#       define R300_PVS_DST_REG_TEMPORARY               0
 +#       define R300_PVS_DST_REG_A0                      1
 +#       define R300_PVS_DST_REG_OUT                     2
 +#       define R500_PVS_DST_REG_OUT_REPL_X              3
 +#       define R300_PVS_DST_REG_ALT_TEMPORARY           4
 +#       define R300_PVS_DST_REG_INPUT                   5
 +#define R300_PVS_DST_ADDR_MODE_1                        (1 << 12)
 +#define R300_PVS_DST_OFFSET(x)                          (x << 13)
 +#define R300_PVS_DST_WE_X                               (1 << 20)
 +#define R300_PVS_DST_WE_Y                               (1 << 21)
 +#define R300_PVS_DST_WE_Z                               (1 << 22)
 +#define R300_PVS_DST_WE_W                               (1 << 23)
 +#define R300_PVS_DST_VE_SAT                             (1 << 24)
 +#define R300_PVS_DST_ME_SAT                             (1 << 25)
 +#define R300_PVS_DST_PRED_ENABLE                        (1 << 26)
 +#define R300_PVS_DST_PRED_SENSE                         (1 << 27)
 +#define R300_PVS_DST_DUAL_MATH_OP                       (1 << 28)
 +#define R300_PVS_DST_ADDR_SEL(x)                        (x << 29)
 +#define R300_PVS_DST_ADDR_MODE_0                        (1 << 31)
 +/* src operand instruction */
 +#define R300_PVS_SRC_REG_TYPE(x)                        (x << 0)
 +#       define R300_PVS_SRC_REG_TEMPORARY               0
 +#       define R300_PVS_SRC_REG_INPUT                   1
 +#       define R300_PVS_SRC_REG_CONSTANT                2
 +#       define R300_PVS_SRC_REG_ALT_TEMPORARY           3
 +#define R300_SPARE_0                                    (1 << 2)
 +#define R300_PVS_SRC_ABS_XYZW                           (1 << 3)
 +#define R300_PVS_SRC_ADDR_MODE_0                        (1 << 4)
 +#define R300_PVS_SRC_OFFSET(x)                          (x << 5)
 +#define R300_PVS_SRC_SWIZZLE_X(x)                       (x << 13)
 +#define R300_PVS_SRC_SWIZZLE_Y(x)                       (x << 16)
 +#define R300_PVS_SRC_SWIZZLE_Z(x)                       (x << 19)
 +#define R300_PVS_SRC_SWIZZLE_W(x)                       (x << 22)
 +#       define R300_PVS_SRC_SELECT_X                    0
 +#       define R300_PVS_SRC_SELECT_Y                    1
 +#       define R300_PVS_SRC_SELECT_Z                    2
 +#       define R300_PVS_SRC_SELECT_W                    3
 +#       define R300_PVS_SRC_SELECT_FORCE_0              4
 +#       define R300_PVS_SRC_SELECT_FORCE_1              5
 +#define R300_PVS_SRC_NEG_X                              (1 << 25)
 +#define R300_PVS_SRC_NEG_Y                              (1 << 26)
 +#define R300_PVS_SRC_NEG_Z                              (1 << 27)
 +#define R300_PVS_SRC_NEG_W                              (1 << 28)
 +#define R300_PVS_SRC_ADDR_SEL(x)                        (x << 29)
 +#define R300_PVS_SRC_ADDR_MODE_1                        (1 << 31)
 +
 +#define R300_VAP_PVS_FLOW_CNTL_OPC                    0x22DC
 +#define R300_VAP_OUT_VTX_FMT_0                                0x2090
 +#       define R300_VTX_POS_PRESENT                     (1 << 0)
 +#       define R300_VTX_COLOR_0_PRESENT                 (1 << 1)
 +#       define R300_VTX_COLOR_1_PRESENT                 (1 << 2)
 +#       define R300_VTX_COLOR_2_PRESENT                 (1 << 3)
 +#       define R300_VTX_COLOR_3_PRESENT                 (1 << 4)
 +#       define R300_VTX_PT_SIZE_PRESENT                 (1 << 16)
 +#define R300_VAP_OUT_VTX_FMT_1                                0x2094
 +#       define R300_TEX_0_COMP_CNT_SHIFT                0
 +#       define R300_TEX_1_COMP_CNT_SHIFT                3
 +#       define R300_TEX_2_COMP_CNT_SHIFT                6
 +#       define R300_TEX_3_COMP_CNT_SHIFT                9
 +#       define R300_TEX_4_COMP_CNT_SHIFT                12
 +#       define R300_TEX_5_COMP_CNT_SHIFT                15
 +#       define R300_TEX_6_COMP_CNT_SHIFT                18
 +#       define R300_TEX_7_COMP_CNT_SHIFT                21
 +#define R300_VAP_VTX_SIZE                             0x20b4
 +#define R300_VAP_GB_VERT_CLIP_ADJ                     0x2220
 +#define R300_VAP_GB_VERT_DISC_ADJ                     0x2224
 +#define R300_VAP_GB_HORZ_CLIP_ADJ                     0x2228
 +#define R300_VAP_GB_HORZ_DISC_ADJ                     0x222c
 +#define R300_VAP_CLIP_CNTL                            0x221c
 +#       define R300_UCP_ENA_0                           (1 << 0)
 +#       define R300_UCP_ENA_1                           (1 << 1)
 +#       define R300_UCP_ENA_2                           (1 << 2)
 +#       define R300_UCP_ENA_3                           (1 << 3)
 +#       define R300_UCP_ENA_4                           (1 << 4)
 +#       define R300_UCP_ENA_5                           (1 << 5)
 +#       define R300_PS_UCP_MODE_SHIFT                   14
 +#       define R300_CLIP_DISABLE                        (1 << 16)
 +#       define R300_UCP_CULL_ONLY_ENA                   (1 << 17)
 +#       define R300_BOUNDARY_EDGE_FLAG_ENA              (1 << 18)
 +#define R300_VAP_PVS_STATE_FLUSH_REG                  0x2284
 +
 +#define R500_VAP_INDEX_OFFSET                         0x208c
 +
 +#define R300_SU_TEX_WRAP                              0x42a0
 +#define R300_SU_POLY_OFFSET_ENABLE                    0x42b4
 +#define R300_SU_CULL_MODE                             0x42b8
 +#       define R300_CULL_FRONT                          (1 << 0)
 +#       define R300_CULL_BACK                           (1 << 1)
 +#       define R300_FACE_POS                            (0 << 2)
 +#       define R300_FACE_NEG                            (1 << 2)
 +#define R300_SU_DEPTH_SCALE                           0x42c0
 +#define R300_SU_DEPTH_OFFSET                          0x42c4
 +
 +#define R300_RS_COUNT                                 0x4300
 +#     define R300_RS_COUNT_IT_COUNT_SHIFT             0
 +#     define R300_RS_COUNT_IC_COUNT_SHIFT             7
 +#     define R300_RS_COUNT_HIRES_EN                   (1 << 18)
 +
 +#define R300_RS_IP_0                                  0x4310
 +#define R300_RS_IP_1                                  0x4314
 +#     define R300_RS_TEX_PTR(x)                       (x << 0)
 +#     define R300_RS_COL_PTR(x)                       (x << 6)
 +#     define R300_RS_COL_FMT(x)                       (x << 9)
 +#     define R300_RS_COL_FMT_RGBA                     0
 +#     define R300_RS_COL_FMT_RGB0                     2
 +#     define R300_RS_COL_FMT_RGB1                     3
 +#     define R300_RS_COL_FMT_000A                     4
 +#     define R300_RS_COL_FMT_0000                     5
 +#     define R300_RS_COL_FMT_0001                     6
 +#     define R300_RS_COL_FMT_111A                     8
 +#     define R300_RS_COL_FMT_1110                     9
 +#     define R300_RS_COL_FMT_1111                     10
 +#     define R300_RS_SEL_S(x)                         (x << 13)
 +#     define R300_RS_SEL_T(x)                         (x << 16)
 +#     define R300_RS_SEL_R(x)                         (x << 19)
 +#     define R300_RS_SEL_Q(x)                         (x << 22)
 +#     define R300_RS_SEL_C0                           0
 +#     define R300_RS_SEL_C1                           1
 +#     define R300_RS_SEL_C2                           2
 +#     define R300_RS_SEL_C3                           3
 +#     define R300_RS_SEL_K0                           4
 +#     define R300_RS_SEL_K1                           5
 +#define R300_RS_INST_COUNT                            0x4304
 +#     define R300_INST_COUNT_RS(x)                    (x << 0)
 +#     define R300_RS_W_EN                             (1 << 4)
 +#     define R300_TX_OFFSET_RS(x)                     (x << 5)
 +#define R300_RS_INST_0                                        0x4330
 +#define R300_RS_INST_1                                        0x4334
 +#     define R300_INST_TEX_ID(x)                      (x << 0)
 +#       define R300_RS_INST_TEX_CN_WRITE              (1 << 3)
 +#     define R300_INST_TEX_ADDR(x)                    (x << 6)
 +
 +#define R300_TX_INVALTAGS                             0x4100
 +#define R300_TX_FILTER0_0                             0x4400
 +#       define R300_TX_CLAMP_S(x)                       (x << 0)
 +#       define R300_TX_CLAMP_T(x)                       (x << 3)
 +#       define R300_TX_CLAMP_R(x)                       (x << 6)
 +#       define R300_TX_CLAMP_WRAP                       0
 +#       define R300_TX_CLAMP_MIRROR                     1
 +#       define R300_TX_CLAMP_CLAMP_LAST                 2
 +#       define R300_TX_CLAMP_MIRROR_CLAMP_LAST          3
 +#       define R300_TX_CLAMP_CLAMP_BORDER               4
 +#       define R300_TX_CLAMP_MIRROR_CLAMP_BORDER        5
 +#       define R300_TX_CLAMP_CLAMP_GL                   6
 +#       define R300_TX_CLAMP_MIRROR_CLAMP_GL            7
 +#       define R300_TX_MAG_FILTER_NEAREST               (1 << 9)
 +#       define R300_TX_MIN_FILTER_NEAREST               (1 << 11)
 +#       define R300_TX_MAG_FILTER_LINEAR                (2 << 9)
 +#       define R300_TX_MIN_FILTER_LINEAR                (2 << 11)
 +#       define R300_TX_ID_SHIFT                         28
 +#define R300_TX_FILTER1_0                             0x4440
 +#define R300_TX_FORMAT0_0                             0x4480
 +#       define R300_TXWIDTH_SHIFT                       0
 +#       define R300_TXHEIGHT_SHIFT                      11
 +#       define R300_NUM_LEVELS_SHIFT                    26
 +#       define R300_NUM_LEVELS_MASK                     0x
 +#       define R300_TXPROJECTED                         (1 << 30)
 +#       define R300_TXPITCH_EN                          (1 << 31)
 +#define R300_TX_FORMAT1_0                             0x44c0
 +#     define R300_TX_FORMAT_X8                    0x0
 +#     define R300_TX_FORMAT_X16                   0x1
 +#     define R300_TX_FORMAT_Y4X4                  0x2
 +#     define R300_TX_FORMAT_Y8X8                  0x3
 +#     define R300_TX_FORMAT_Y16X16                0x4
 +#     define R300_TX_FORMAT_Z3Y3X2                0x5
 +#     define R300_TX_FORMAT_Z5Y6X5                0x6
 +#     define R300_TX_FORMAT_Z6Y5X5                0x7
 +#     define R300_TX_FORMAT_Z11Y11X10             0x8
 +#     define R300_TX_FORMAT_Z10Y11X11             0x9
 +#     define R300_TX_FORMAT_W4Z4Y4X4              0xA
 +#     define R300_TX_FORMAT_W1Z5Y5X5              0xB
 +#     define R300_TX_FORMAT_W8Z8Y8X8              0xC
 +#     define R300_TX_FORMAT_W2Z10Y10X10           0xD
 +#     define R300_TX_FORMAT_W16Z16Y16X16          0xE
 +#     define R300_TX_FORMAT_DXT1                  0xF
 +#     define R300_TX_FORMAT_DXT3                  0x10
 +#     define R300_TX_FORMAT_DXT5                  0x11
 +#     define R300_TX_FORMAT_D3DMFT_CxV8U8         0x12     /* no swizzle */
 +#     define R300_TX_FORMAT_A8R8G8B8              0x13     /* no swizzle */
 +#     define R300_TX_FORMAT_B8G8_B8G8             0x14     /* no swizzle */
 +#     define R300_TX_FORMAT_G8R8_G8B8             0x15     /* no swizzle */
 +#     define R300_TX_FORMAT_VYUY422               0x14     /* no swizzle */
 +#     define R300_TX_FORMAT_YVYU422               0x15     /* no swizzle */
 +#     define R300_TX_FORMAT_X24_Y8                0x1e
 +#     define R300_TX_FORMAT_X32                   0x1e
 +      /* Floating point formats */
 +      /* Note - hardware supports both 16 and 32 bit floating point */
 +#     define R300_TX_FORMAT_FL_I16                0x18
 +#     define R300_TX_FORMAT_FL_I16A16             0x19
 +#     define R300_TX_FORMAT_FL_R16G16B16A16       0x1A
 +#     define R300_TX_FORMAT_FL_I32                0x1B
 +#     define R300_TX_FORMAT_FL_I32A32             0x1C
 +#     define R300_TX_FORMAT_FL_R32G32B32A32       0x1D
 +      /* alpha modes, convenience mostly */
 +      /* if you have alpha, pick constant appropriate to the
 +         number of channels (1 for I8, 2 for I8A8, 4 for R8G8B8A8, etc */
 +#     define R300_TX_FORMAT_ALPHA_1CH             0x000
 +#     define R300_TX_FORMAT_ALPHA_2CH             0x200
 +#     define R300_TX_FORMAT_ALPHA_4CH             0x600
 +#     define R300_TX_FORMAT_ALPHA_NONE            0xA00
 +      /* Swizzling */
 +      /* constants */
 +#     define R300_TX_FORMAT_X         0
 +#     define R300_TX_FORMAT_Y         1
 +#     define R300_TX_FORMAT_Z         2
 +#     define R300_TX_FORMAT_W         3
 +#     define R300_TX_FORMAT_ZERO      4
 +#     define R300_TX_FORMAT_ONE       5
 +      /* 2.0*Z, everything above 1.0 is set to 0.0 */
 +#     define R300_TX_FORMAT_CUT_Z     6
 +      /* 2.0*W, everything above 1.0 is set to 0.0 */
 +#     define R300_TX_FORMAT_CUT_W     7
 +
 +#     define R300_TX_FORMAT_B_SHIFT   18
 +#     define R300_TX_FORMAT_G_SHIFT   15
 +#     define R300_TX_FORMAT_R_SHIFT   12
 +#     define R300_TX_FORMAT_A_SHIFT   9
 +
 +      /* Convenience macro to take care of layout and swizzling */
 +#     define R300_EASY_TX_FORMAT(B, G, R, A, FMT)     (               \
 +              ((R300_TX_FORMAT_##B)<<R300_TX_FORMAT_B_SHIFT)          \
 +              | ((R300_TX_FORMAT_##G)<<R300_TX_FORMAT_G_SHIFT)        \
 +              | ((R300_TX_FORMAT_##R)<<R300_TX_FORMAT_R_SHIFT)        \
 +              | ((R300_TX_FORMAT_##A)<<R300_TX_FORMAT_A_SHIFT)        \
 +              | (R300_TX_FORMAT_##FMT)                                \
 +              )
 +
 +#       define R300_TX_FORMAT_YUV_TO_RGB_CLAMP         (1 << 22)
 +#       define R300_TX_FORMAT_YUV_TO_RGB_NO_CLAMP      (2 << 22)
 +#       define R300_TX_FORMAT_SWAP_YUV                 (1 << 24)
 +
 +#define R300_TX_FORMAT2_0                             0x4500
 +#       define R500_TXWIDTH_11                          (1 << 15)
 +#       define R500_TXHEIGHT_11                         (1 << 16)
 +
 +#define R300_TX_OFFSET_0                              0x4540
 +#       define R300_ENDIAN_SWAP_16_BIT                  (1 << 0)
 +#       define R300_ENDIAN_SWAP_32_BIT                  (2 << 0)
 +#       define R300_ENDIAN_SWAP_HALF_DWORD              (3 << 0)
 +#       define R300_MACRO_TILE                          (1 << 2)
 +
- #define R300_RB3D_COLOROFFSET0                                0x4e28
- #define R300_RB3D_COLORPITCH0                         0x4e38
- #       define R300_COLORTILE                           (1 << 16)
- #       define R300_COLORENDIAN_WORD                    (1 << 19)
- #       define R300_COLORENDIAN_DWORD                   (2 << 19)
- #       define R300_COLORENDIAN_HALF_DWORD              (3 << 19)
- #       define R300_COLORFORMAT_ARGB1555                (3 << 21)
- #       define R300_COLORFORMAT_RGB565                  (4 << 21)
- #       define R300_COLORFORMAT_ARGB8888                (6 << 21)
- #       define R300_COLORFORMAT_ARGB32323232            (7 << 21)
- #       define R300_COLORFORMAT_I8                      (9 << 21)
- #       define R300_COLORFORMAT_ARGB16161616            (10 << 21)
- #       define R300_COLORFORMAT_VYUY                    (11 << 21)
- #       define R300_COLORFORMAT_YVYU                    (12 << 21)
- #       define R300_COLORFORMAT_UV88                    (13 << 21)
- #       define R300_COLORFORMAT_ARGB4444                (15 << 21)
- #define R300_RB3D_AARESOLVE_CTL                               0x4e88
 +#define R300_TX_ENABLE                                        0x4104
 +#       define R300_TEX_0_ENABLE                        (1 << 0)
 +#       define R300_TEX_1_ENABLE                        (1 << 1)
 +
 +#define R300_US_W_FMT                                 0x46b4
 +#define R300_US_OUT_FMT_1                             0x46a8
 +#define R300_US_OUT_FMT_2                             0x46ac
 +#define R300_US_OUT_FMT_3                             0x46b0
 +#define R300_US_OUT_FMT_0                             0x46a4
 +#       define R300_OUT_FMT_C4_8                        (0 << 0)
 +#       define R300_OUT_FMT_C4_10                       (1 << 0)
 +#       define R300_OUT_FMT_C4_10_GAMMA                 (2 << 0)
 +#       define R300_OUT_FMT_C_16                        (3 << 0)
 +#       define R300_OUT_FMT_C2_16                       (4 << 0)
 +#       define R300_OUT_FMT_C4_16                       (5 << 0)
 +#       define R300_OUT_FMT_C_16_MPEG                   (6 << 0)
 +#       define R300_OUT_FMT_C2_16_MPEG                  (7 << 0)
 +#       define R300_OUT_FMT_C2_4                        (8 << 0)
 +#       define R300_OUT_FMT_C_3_3_2                     (9 << 0)
 +#       define R300_OUT_FMT_C_5_6_5                     (10 << 0)
 +#       define R300_OUT_FMT_C_11_11_10                  (11 << 0)
 +#       define R300_OUT_FMT_C_10_11_11                  (12 << 0)
 +#       define R300_OUT_FMT_C_2_10_10_10                (13 << 0)
 +#       define R300_OUT_FMT_UNUSED                      (15 << 0)
 +#       define R300_OUT_FMT_C_16_FP                     (16 << 0)
 +#       define R300_OUT_FMT_C2_16_FP                    (17 << 0)
 +#       define R300_OUT_FMT_C4_16_FP                    (18 << 0)
 +#       define R300_OUT_FMT_C_32_FP                     (19 << 0)
 +#       define R300_OUT_FMT_C2_32_FP                    (20 << 0)
 +#       define R300_OUT_FMT_C4_32_FP                    (21 << 0)
 +#       define R300_OUT_FMT_C0_SEL_ALPHA                (0 << 8)
 +#       define R300_OUT_FMT_C0_SEL_RED                  (1 << 8)
 +#       define R300_OUT_FMT_C0_SEL_GREEN                (2 << 8)
 +#       define R300_OUT_FMT_C0_SEL_BLUE                 (3 << 8)
 +#       define R300_OUT_FMT_C1_SEL_ALPHA                (0 << 10)
 +#       define R300_OUT_FMT_C1_SEL_RED                  (1 << 10)
 +#       define R300_OUT_FMT_C1_SEL_GREEN                (2 << 10)
 +#       define R300_OUT_FMT_C1_SEL_BLUE                 (3 << 10)
 +#       define R300_OUT_FMT_C2_SEL_ALPHA                (0 << 12)
 +#       define R300_OUT_FMT_C2_SEL_RED                  (1 << 12)
 +#       define R300_OUT_FMT_C2_SEL_GREEN                (2 << 12)
 +#       define R300_OUT_FMT_C2_SEL_BLUE                 (3 << 12)
 +#       define R300_OUT_FMT_C3_SEL_ALPHA                (0 << 14)
 +#       define R300_OUT_FMT_C3_SEL_RED                  (1 << 14)
 +#       define R300_OUT_FMT_C3_SEL_GREEN                (2 << 14)
 +#       define R300_OUT_FMT_C3_SEL_BLUE                 (3 << 14)
 +#define R300_US_CONFIG                                        0x4600
 +#       define R300_NLEVEL_SHIFT                        0
 +#       define R300_FIRST_TEX                           (1 << 3)
 +#       define R500_ZERO_TIMES_ANYTHING_EQUALS_ZERO     (1 << 1)
 +#define R300_US_PIXSIZE                                       0x4604
 +#define R300_US_CODE_OFFSET                           0x4608
 +#       define R300_ALU_CODE_OFFSET(x)                  (x << 0)
 +#       define R300_ALU_CODE_SIZE(x)                    (x << 6)
 +#       define R300_TEX_CODE_OFFSET(x)                  (x << 13)
 +#       define R300_TEX_CODE_SIZE(x)                    (x << 18)
 +#define R300_US_CODE_ADDR_0                           0x4610
 +#       define R300_ALU_START(x)                        (x << 0)
 +#       define R300_ALU_SIZE(x)                         (x << 6)
 +#       define R300_TEX_START(x)                        (x << 12)
 +#       define R300_TEX_SIZE(x)                         (x << 17)
 +#       define R300_RGBA_OUT                            (1 << 22)
 +#       define R300_W_OUT                               (1 << 23)
 +#define R300_US_CODE_ADDR_1                           0x4614
 +#define R300_US_CODE_ADDR_2                           0x4618
 +#define R300_US_CODE_ADDR_3                           0x461c
 +#define R300_US_TEX_INST_0                            0x4620
 +#define R300_US_TEX_INST_1                            0x4624
 +#define R300_US_TEX_INST_2                            0x4628
 +#       define R300_TEX_SRC_ADDR(x)                     (x << 0)
 +#       define R300_TEX_DST_ADDR(x)                     (x << 6)
 +#       define R300_TEX_ID(x)                           (x << 11)
 +#       define R300_TEX_INST(x)                         (x << 15)
 +#       define R300_TEX_INST_NOP                        0
 +#       define R300_TEX_INST_LD                         1
 +#       define R300_TEX_INST_TEXKILL                    2
 +#       define R300_TEX_INST_PROJ                       3
 +#       define R300_TEX_INST_LODBIAS                    4
 +#define R300_US_ALU_RGB_ADDR_0                                0x46c0
 +#define R300_US_ALU_RGB_ADDR_1                                0x46c4
 +#define R300_US_ALU_RGB_ADDR_2                                0x46c8
 +/* for ADDR0-2, values 0-31 specify a location in the pixel stack,
 +   values 32-63 specify a constant */
 +#       define R300_ALU_RGB_ADDR0(x)                    (x << 0)
 +#       define R300_ALU_RGB_ADDR1(x)                    (x << 6)
 +#       define R300_ALU_RGB_ADDR2(x)                    (x << 12)
 +/* ADDRD - where on the pixel stack the result of this instruction
 +   will be written */
 +#       define R300_ALU_RGB_ADDRD(x)                    (x << 18)
 +#       define R300_ALU_RGB_WMASK(x)                    (x << 23)
 +#       define R300_ALU_RGB_OMASK(x)                    (x << 26)
 +#       define R300_ALU_RGB_MASK_NONE                   0
 +#       define R300_ALU_RGB_MASK_R                      1
 +#       define R300_ALU_RGB_MASK_G                      2
 +#       define R300_ALU_RGB_MASK_B                      4
 +#       define R300_ALU_RGB_TARGET_A                    (0 << 29)
 +#       define R300_ALU_RGB_TARGET_B                    (1 << 29)
 +#       define R300_ALU_RGB_TARGET_C                    (2 << 29)
 +#       define R300_ALU_RGB_TARGET_D                    (3 << 29)
 +#define R300_US_ALU_RGB_INST_0                                0x48c0
 +#define R300_US_ALU_RGB_INST_1                                0x48c4
 +#define R300_US_ALU_RGB_INST_2                                0x48c8
 +#       define R300_ALU_RGB_SEL_A(x)                    (x << 0)
 +#       define R300_ALU_RGB_SRC0_RGB                    0
 +#       define R300_ALU_RGB_SRC0_RRR                    1
 +#       define R300_ALU_RGB_SRC0_GGG                    2
 +#       define R300_ALU_RGB_SRC0_BBB                    3
 +#       define R300_ALU_RGB_SRC1_RGB                    4
 +#       define R300_ALU_RGB_SRC1_RRR                    5
 +#       define R300_ALU_RGB_SRC1_GGG                    6
 +#       define R300_ALU_RGB_SRC1_BBB                    7
 +#       define R300_ALU_RGB_SRC2_RGB                    8
 +#       define R300_ALU_RGB_SRC2_RRR                    9
 +#       define R300_ALU_RGB_SRC2_GGG                    10
 +#       define R300_ALU_RGB_SRC2_BBB                    11
 +#       define R300_ALU_RGB_SRC0_AAA                    12
 +#       define R300_ALU_RGB_SRC1_AAA                    13
 +#       define R300_ALU_RGB_SRC2_AAA                    14
 +#       define R300_ALU_RGB_SRCP_RGB                    15
 +#       define R300_ALU_RGB_SRCP_RRR                    16
 +#       define R300_ALU_RGB_SRCP_GGG                    17
 +#       define R300_ALU_RGB_SRCP_BBB                    18
 +#       define R300_ALU_RGB_SRCP_AAA                    19
 +#       define R300_ALU_RGB_0_0                         20
 +#       define R300_ALU_RGB_1_0                         21
 +#       define R300_ALU_RGB_0_5                         22
 +#       define R300_ALU_RGB_SRC0_GBR                    23
 +#       define R300_ALU_RGB_SRC1_GBR                    24
 +#       define R300_ALU_RGB_SRC2_GBR                    25
 +#       define R300_ALU_RGB_SRC0_BRG                    26
 +#       define R300_ALU_RGB_SRC1_BRG                    27
 +#       define R300_ALU_RGB_SRC2_BRG                    28
 +#       define R300_ALU_RGB_SRC0_ABG                    29
 +#       define R300_ALU_RGB_SRC1_ABG                    30
 +#       define R300_ALU_RGB_SRC2_ABG                    31
 +#       define R300_ALU_RGB_MOD_A(x)                    (x << 5)
 +#       define R300_ALU_RGB_MOD_NOP                     0
 +#       define R300_ALU_RGB_MOD_NEG                     1
 +#       define R300_ALU_RGB_MOD_ABS                     2
 +#       define R300_ALU_RGB_MOD_NAB                     3
 +#       define R300_ALU_RGB_SEL_B(x)                    (x << 7)
 +#       define R300_ALU_RGB_MOD_B(x)                    (x << 12)
 +#       define R300_ALU_RGB_SEL_C(x)                    (x << 14)
 +#       define R300_ALU_RGB_MOD_C(x)                    (x << 19)
 +#       define R300_ALU_RGB_SRCP_OP(x)                  (x << 21)
 +#       define R300_ALU_RGB_SRCP_OP_1_MINUS_2RGB0     0
 +#       define R300_ALU_RGB_SRCP_OP_RGB1_MINUS_RGB0   1
 +#       define R300_ALU_RGB_SRCP_OP_RGB1_PLUS_RGB0    2
 +#       define R300_ALU_RGB_SRCP_OP_1_MINUS_RGB0      3
 +#       define R300_ALU_RGB_OP(x)                       (x << 23)
 +#       define R300_ALU_RGB_OP_MAD                      0
 +#       define R300_ALU_RGB_OP_DP3                      1
 +#       define R300_ALU_RGB_OP_DP4                      2
 +#       define R300_ALU_RGB_OP_D2A                      3
 +#       define R300_ALU_RGB_OP_MIN                      4
 +#       define R300_ALU_RGB_OP_MAX                      5
 +#       define R300_ALU_RGB_OP_CND                      7
 +#       define R300_ALU_RGB_OP_CMP                      8
 +#       define R300_ALU_RGB_OP_FRC                      9
 +#       define R300_ALU_RGB_OP_SOP                      10
 +#       define R300_ALU_RGB_OMOD(x)                     (x << 27)
 +#       define R300_ALU_RGB_OMOD_NONE                   0
 +#       define R300_ALU_RGB_OMOD_MUL_2                  1
 +#       define R300_ALU_RGB_OMOD_MUL_4                  2
 +#       define R300_ALU_RGB_OMOD_MUL_8                  3
 +#       define R300_ALU_RGB_OMOD_DIV_2                  4
 +#       define R300_ALU_RGB_OMOD_DIV_4                  5
 +#       define R300_ALU_RGB_OMOD_DIV_8                  6
 +#       define R300_ALU_RGB_CLAMP                       (1 << 30)
 +#       define R300_ALU_RGB_INSERT_NOP                  (1 << 31)
 +#define R300_US_ALU_ALPHA_ADDR_0                      0x47c0
 +#define R300_US_ALU_ALPHA_ADDR_1                      0x47c4
 +#define R300_US_ALU_ALPHA_ADDR_2                      0x47c8
 +/* for ADDR0-2, values 0-31 specify a location in the pixel stack,
 +   values 32-63 specify a constant */
 +#       define R300_ALU_ALPHA_ADDR0(x)                  (x << 0)
 +#       define R300_ALU_ALPHA_ADDR1(x)                  (x << 6)
 +#       define R300_ALU_ALPHA_ADDR2(x)                  (x << 12)
 +/* ADDRD - where on the pixel stack the result of this instruction
 +   will be written */
 +#       define R300_ALU_ALPHA_ADDRD(x)                  (x << 18)
 +#       define R300_ALU_ALPHA_WMASK(x)                  (x << 23)
 +#       define R300_ALU_ALPHA_OMASK(x)                  (x << 24)
 +#       define R300_ALU_ALPHA_OMASK_W(x)                (x << 27)
 +#       define R300_ALU_ALPHA_MASK_NONE                 0
 +#       define R300_ALU_ALPHA_MASK_A                    1
 +#       define R300_ALU_ALPHA_TARGET_A                  (0 << 25)
 +#       define R300_ALU_ALPHA_TARGET_B                  (1 << 25)
 +#       define R300_ALU_ALPHA_TARGET_C                  (2 << 25)
 +#       define R300_ALU_ALPHA_TARGET_D                  (3 << 25)
 +#define R300_US_ALU_ALPHA_INST_0                      0x49c0
 +#define R300_US_ALU_ALPHA_INST_1                      0x49c4
 +#define R300_US_ALU_ALPHA_INST_2                      0x49c8
 +#       define R300_ALU_ALPHA_SEL_A(x)                  (x << 0)
 +#       define R300_ALU_ALPHA_SRC0_R                    0
 +#       define R300_ALU_ALPHA_SRC0_G                    1
 +#       define R300_ALU_ALPHA_SRC0_B                    2
 +#       define R300_ALU_ALPHA_SRC1_R                    3
 +#       define R300_ALU_ALPHA_SRC1_G                    4
 +#       define R300_ALU_ALPHA_SRC1_B                    5
 +#       define R300_ALU_ALPHA_SRC2_R                    6
 +#       define R300_ALU_ALPHA_SRC2_G                    7
 +#       define R300_ALU_ALPHA_SRC2_B                    8
 +#       define R300_ALU_ALPHA_SRC0_A                    9
 +#       define R300_ALU_ALPHA_SRC1_A                    10
 +#       define R300_ALU_ALPHA_SRC2_A                    11
 +#       define R300_ALU_ALPHA_SRCP_R                    12
 +#       define R300_ALU_ALPHA_SRCP_G                    13
 +#       define R300_ALU_ALPHA_SRCP_B                    14
 +#       define R300_ALU_ALPHA_SRCP_A                    15
 +#       define R300_ALU_ALPHA_0_0                       16
 +#       define R300_ALU_ALPHA_1_0                       17
 +#       define R300_ALU_ALPHA_0_5                       18
 +#       define R300_ALU_ALPHA_MOD_A(x)                  (x << 5)
 +#       define R300_ALU_ALPHA_MOD_NOP                   0
 +#       define R300_ALU_ALPHA_MOD_NEG                   1
 +#       define R300_ALU_ALPHA_MOD_ABS                   2
 +#       define R300_ALU_ALPHA_MOD_NAB                   3
 +#       define R300_ALU_ALPHA_SEL_B(x)                  (x << 7)
 +#       define R300_ALU_ALPHA_MOD_B(x)                  (x << 12)
 +#       define R300_ALU_ALPHA_SEL_C(x)                  (x << 14)
 +#       define R300_ALU_ALPHA_MOD_C(x)                  (x << 19)
 +#       define R300_ALU_ALPHA_SRCP_OP(x)                (x << 21)
 +#       define R300_ALU_ALPHA_SRCP_OP_1_MINUS_2RGB0   0
 +#       define R300_ALU_ALPHA_SRCP_OP_RGB1_MINUS_RGB0 1
 +#       define R300_ALU_ALPHA_SRCP_OP_RGB1_PLUS_RGB0  2
 +#       define R300_ALU_ALPHA_SRCP_OP_1_MINUS_RGB0    3
 +#       define R300_ALU_ALPHA_OP(x)                     (x << 23)
 +#       define R300_ALU_ALPHA_OP_MAD                    0
 +#       define R300_ALU_ALPHA_OP_DP                     1
 +#       define R300_ALU_ALPHA_OP_MIN                    2
 +#       define R300_ALU_ALPHA_OP_MAX                    3
 +#       define R300_ALU_ALPHA_OP_CND                    5
 +#       define R300_ALU_ALPHA_OP_CMP                    6
 +#       define R300_ALU_ALPHA_OP_FRC                    7
 +#       define R300_ALU_ALPHA_OP_EX2                    8
 +#       define R300_ALU_ALPHA_OP_LN2                    9
 +#       define R300_ALU_ALPHA_OP_RCP                    10
 +#       define R300_ALU_ALPHA_OP_RSQ                    11
 +#       define R300_ALU_ALPHA_OMOD(x)                   (x << 27)
 +#       define R300_ALU_ALPHA_OMOD_NONE                 0
 +#       define R300_ALU_ALPHA_OMOD_MUL_2                1
 +#       define R300_ALU_ALPHA_OMOD_MUL_4                2
 +#       define R300_ALU_ALPHA_OMOD_MUL_8                3
 +#       define R300_ALU_ALPHA_OMOD_DIV_2                4
 +#       define R300_ALU_ALPHA_OMOD_DIV_4                5
 +#       define R300_ALU_ALPHA_OMOD_DIV_8                6
 +#       define R300_ALU_ALPHA_CLAMP                     (1 << 30)
 +
 +#define R300_FG_DEPTH_SRC                             0x4bd8
 +#define R300_FG_FOG_BLEND                             0x4bc0
 +#define R300_FG_ALPHA_FUNC                            0x4bd4
 +
 +#define R300_DST_PIPE_CONFIG                          0x170c
 +#       define R300_PIPE_AUTO_CONFIG                    (1 << 31)
 +#define R300_RB2D_DSTCACHE_MODE                               0x3428
 +#define R300_RB2D_DSTCACHE_MODE                               0x3428
 +#       define R300_DC_AUTOFLUSH_ENABLE                 (1 << 8)
 +#       define R300_DC_DC_DISABLE_IGNORE_PE             (1 << 17)
 +#define R300_RB2D_DSTCACHE_CTLSTAT                    0x342c /* use DSTCACHE_CTLSTAT instead */
 +#define R300_DSTCACHE_CTLSTAT                         0x1714
 +#       define R300_DC_FLUSH_2D                         (1 << 0)
 +#       define R300_DC_FREE_2D                          (1 << 2)
 +#       define R300_RB2D_DC_FLUSH_ALL                   (R300_DC_FLUSH_2D | R300_DC_FREE_2D)
 +#       define R300_RB2D_DC_BUSY                        (1 << 31)
 +#define R300_RB3D_DSTCACHE_CTLSTAT                    0x4e4c
 +#       define R300_DC_FLUSH_3D                         (2 << 0)
 +#       define R300_DC_FREE_3D                          (2 << 2)
 +#       define R300_RB3D_DC_FLUSH_ALL                   (R300_DC_FLUSH_3D | R300_DC_FREE_3D)
 +#       define R300_DC_FINISH_3D                        (1 << 4)
 +#define R300_RB3D_ZCACHE_CTLSTAT                      0x4f18
 +#       define R300_ZC_FLUSH                            (1 << 0)
 +#       define R300_ZC_FREE                             (1 << 1)
 +#       define R300_ZC_FLUSH_ALL                        0x3
 +#define R300_RB3D_ZSTENCILCNTL                                0x4f04
 +#define R300_RB3D_ZCACHE_CTLSTAT                      0x4f18
 +#define R300_RB3D_BW_CNTL                             0x4f1c
 +#define R300_RB3D_ZCNTL                                       0x4f00
 +#define R300_RB3D_ZTOP                                        0x4f14
 +#define R300_RB3D_ROPCNTL                             0x4e18
 +#define R300_RB3D_BLENDCNTL                           0x4e04
 +#       define R300_ALPHA_BLEND_ENABLE                  (1 << 0)
 +#       define R300_SEPARATE_ALPHA_ENABLE               (1 << 1)
 +#       define R300_READ_ENABLE                         (1 << 2)
 +#define R300_RB3D_ABLENDCNTL                          0x4e08
 +#define R300_RB3D_DSTCACHE_CTLSTAT                    0x4e4c
++
 +#define R300_RB3D_COLOR_CHANNEL_MASK                  0x4e0c
 +#       define R300_BLUE_MASK_EN                        (1 << 0)
 +#       define R300_GREEN_MASK_EN                       (1 << 1)
 +#       define R300_RED_MASK_EN                         (1 << 2)
 +#       define R300_ALPHA_MASK_EN                       (1 << 3)
 +#define R300_RB3D_COLOR_CLEAR_VALUE                     0x4e14
 +#define R300_RB3D_DSTCACHE_CTLSTAT                    0x4e4c
 +#define R300_RB3D_CCTL                                        0x4e00
 +#define R300_RB3D_DITHER_CTL                          0x4e50
 +
 +#define R300_SC_EDGERULE                              0x43a8
 +#define R300_SC_SCISSOR0                              0x43e0
 +#define R300_SC_SCISSOR1                              0x43e4
 +#       define R300_SCISSOR_X_SHIFT                     0
 +#       define R300_SCISSOR_Y_SHIFT                     13
 +#define R300_SC_CLIP_0_A                              0x43b0
 +#define R300_SC_CLIP_0_B                              0x43b4
 +#       define R300_CLIP_X_SHIFT                        0
 +#       define R300_CLIP_Y_SHIFT                        13
 +#define R300_SC_CLIP_RULE                             0x43d0
 +#define R300_SC_SCREENDOOR                            0x43e8
 +
 +/* R500 US has to be loaded through an index/data pair */
 +#define R500_GA_US_VECTOR_INDEX                               0x4250
 +#   define R500_US_VECTOR_INDEX(x)                    (x << 0)
 +#   define R500_US_VECTOR_TYPE_INST                   (0 << 16)
 +#   define R500_US_VECTOR_TYPE_CONST                  (1 << 16)
 +#   define R500_US_VECTOR_CLAMP                               (1 << 17)
 +#define R500_GA_US_VECTOR_DATA                                0x4254
 +
 +/*
 + * The R500 unified shader (US) registers come in banks of 512 each, one
 + * for each instruction slot in the shader.  You can't touch them directly.
 + * R500_US_VECTOR_INDEX() sets the base instruction to modify; successive
 + * writes to R500_GA_US_VECTOR_DATA autoincrement the index after the
 + * instruction is fully specified.
 + */
 +#define R500_US_ALU_ALPHA_INST_0                      0xa800
 +#   define R500_ALPHA_OP_MAD                          0
 +#   define R500_ALPHA_OP_DP                           1
 +#   define R500_ALPHA_OP_MIN                          2
 +#   define R500_ALPHA_OP_MAX                          3
 +/* #define R500_ALPHA_OP_RESERVED                     4 */
 +#   define R500_ALPHA_OP_CND                          5
 +#   define R500_ALPHA_OP_CMP                          6
 +#   define R500_ALPHA_OP_FRC                          7
 +#   define R500_ALPHA_OP_EX2                          8
 +#   define R500_ALPHA_OP_LN2                          9
 +#   define R500_ALPHA_OP_RCP                          10
 +#   define R500_ALPHA_OP_RSQ                          11
 +#   define R500_ALPHA_OP_SIN                          12
 +#   define R500_ALPHA_OP_COS                          13
 +#   define R500_ALPHA_OP_MDH                          14
 +#   define R500_ALPHA_OP_MDV                          15
 +#   define R500_ALPHA_ADDRD(x)                                (x << 4)
 +#   define R500_ALPHA_ADDRD_REL                               (1 << 11)
 +#   define R500_ALPHA_SEL_A_SRC0                      (0 << 12)
 +#   define R500_ALPHA_SEL_A_SRC1                      (1 << 12)
 +#   define R500_ALPHA_SEL_A_SRC2                      (2 << 12)
 +#   define R500_ALPHA_SEL_A_SRCP                      (3 << 12)
 +#   define R500_ALPHA_SWIZ_A_R                                (0 << 14)
 +#   define R500_ALPHA_SWIZ_A_G                                (1 << 14)
 +#   define R500_ALPHA_SWIZ_A_B                                (2 << 14)
 +#   define R500_ALPHA_SWIZ_A_A                                (3 << 14)
 +#   define R500_ALPHA_SWIZ_A_0                                (4 << 14)
 +#   define R500_ALPHA_SWIZ_A_HALF                     (5 << 14)
 +#   define R500_ALPHA_SWIZ_A_1                                (6 << 14)
 +/* #define R500_ALPHA_SWIZ_A_UNUSED                   (7 << 14) */
 +#   define R500_ALPHA_MOD_A_NOP                               (0 << 17)
 +#   define R500_ALPHA_MOD_A_NEG                               (1 << 17)
 +#   define R500_ALPHA_MOD_A_ABS                               (2 << 17)
 +#   define R500_ALPHA_MOD_A_NAB                               (3 << 17)
 +#   define R500_ALPHA_SEL_B_SRC0                      (0 << 19)
 +#   define R500_ALPHA_SEL_B_SRC1                      (1 << 19)
 +#   define R500_ALPHA_SEL_B_SRC2                      (2 << 19)
 +#   define R500_ALPHA_SEL_B_SRCP                      (3 << 19)
 +#   define R500_ALPHA_SWIZ_B_R                                (0 << 21)
 +#   define R500_ALPHA_SWIZ_B_G                                (1 << 21)
 +#   define R500_ALPHA_SWIZ_B_B                                (2 << 21)
 +#   define R500_ALPHA_SWIZ_B_A                                (3 << 21)
 +#   define R500_ALPHA_SWIZ_B_0                                (4 << 21)
 +#   define R500_ALPHA_SWIZ_B_HALF                     (5 << 21)
 +#   define R500_ALPHA_SWIZ_B_1                                (6 << 21)
 +/* #define R500_ALPHA_SWIZ_B_UNUSED                   (7 << 21) */
 +#   define R500_ALPHA_MOD_B_NOP                               (0 << 24)
 +#   define R500_ALPHA_MOD_B_NEG                               (1 << 24)
 +#   define R500_ALPHA_MOD_B_ABS                               (2 << 24)
 +#   define R500_ALPHA_MOD_B_NAB                               (3 << 24)
 +#   define R500_ALPHA_OMOD_IDENTITY                   (0 << 26)
 +#   define R500_ALPHA_OMOD_MUL_2                      (1 << 26)
 +#   define R500_ALPHA_OMOD_MUL_4                      (2 << 26)
 +#   define R500_ALPHA_OMOD_MUL_8                      (3 << 26)
 +#   define R500_ALPHA_OMOD_DIV_2                      (4 << 26)
 +#   define R500_ALPHA_OMOD_DIV_4                      (5 << 26)
 +#   define R500_ALPHA_OMOD_DIV_8                      (6 << 26)
 +#   define R500_ALPHA_OMOD_DISABLE                    (7 << 26)
 +#   define R500_ALPHA_TARGET(x)                               (x << 29)
 +#   define R500_ALPHA_W_OMASK                         (1 << 31)
 +#define R500_US_ALU_ALPHA_ADDR_0                      0x9800
 +#   define R500_ALPHA_ADDR0(x)                                (x << 0)
 +#   define R500_ALPHA_ADDR0_CONST                     (1 << 8)
 +#   define R500_ALPHA_ADDR0_REL                               (1 << 9)
 +#   define R500_ALPHA_ADDR1(x)                                (x << 10)
 +#   define R500_ALPHA_ADDR1_CONST                     (1 << 18)
 +#   define R500_ALPHA_ADDR1_REL                               (1 << 19)
 +#   define R500_ALPHA_ADDR2(x)                                (x << 20)
 +#   define R500_ALPHA_ADDR2_CONST                     (1 << 28)
 +#   define R500_ALPHA_ADDR2_REL                               (1 << 29)
 +#   define R500_ALPHA_SRCP_OP_1_MINUS_2A0             (0 << 30)
 +#   define R500_ALPHA_SRCP_OP_A1_MINUS_A0             (1 << 30)
 +#   define R500_ALPHA_SRCP_OP_A1_PLUS_A0              (2 << 30)
 +#   define R500_ALPHA_SRCP_OP_1_MINUS_A0              (3 << 30)
 +#define R500_US_ALU_RGBA_INST_0                               0xb000
 +#   define R500_ALU_RGBA_OP_MAD                               (0 << 0)
 +#   define R500_ALU_RGBA_OP_DP3                               (1 << 0)
 +#   define R500_ALU_RGBA_OP_DP4                               (2 << 0)
 +#   define R500_ALU_RGBA_OP_D2A                               (3 << 0)
 +#   define R500_ALU_RGBA_OP_MIN                               (4 << 0)
 +#   define R500_ALU_RGBA_OP_MAX                               (5 << 0)
 +/* #define R500_ALU_RGBA_OP_RESERVED                  (6 << 0) */
 +#   define R500_ALU_RGBA_OP_CND                               (7 << 0)
 +#   define R500_ALU_RGBA_OP_CMP                               (8 << 0)
 +#   define R500_ALU_RGBA_OP_FRC                               (9 << 0)
 +#   define R500_ALU_RGBA_OP_SOP                               (10 << 0)
 +#   define R500_ALU_RGBA_OP_MDH                               (11 << 0)
 +#   define R500_ALU_RGBA_OP_MDV                               (12 << 0)
 +#   define R500_ALU_RGBA_ADDRD(x)                     (x << 4)
 +#   define R500_ALU_RGBA_ADDRD_REL                    (1 << 11)
 +#   define R500_ALU_RGBA_SEL_C_SRC0                   (0 << 12)
 +#   define R500_ALU_RGBA_SEL_C_SRC1                   (1 << 12)
 +#   define R500_ALU_RGBA_SEL_C_SRC2                   (2 << 12)
 +#   define R500_ALU_RGBA_SEL_C_SRCP                   (3 << 12)
 +#   define R500_ALU_RGBA_R_SWIZ_R                     (0 << 14)
 +#   define R500_ALU_RGBA_R_SWIZ_G                     (1 << 14)
 +#   define R500_ALU_RGBA_R_SWIZ_B                     (2 << 14)
 +#   define R500_ALU_RGBA_R_SWIZ_A                     (3 << 14)
 +#   define R500_ALU_RGBA_R_SWIZ_0                     (4 << 14)
 +#   define R500_ALU_RGBA_R_SWIZ_HALF                  (5 << 14)
 +#   define R500_ALU_RGBA_R_SWIZ_1                     (6 << 14)
 +/* #define R500_ALU_RGBA_R_SWIZ_UNUSED                        (7 << 14) */
 +#   define R500_ALU_RGBA_G_SWIZ_R                     (0 << 17)
 +#   define R500_ALU_RGBA_G_SWIZ_G                     (1 << 17)
 +#   define R500_ALU_RGBA_G_SWIZ_B                     (2 << 17)
 +#   define R500_ALU_RGBA_G_SWIZ_A                     (3 << 17)
 +#   define R500_ALU_RGBA_G_SWIZ_0                     (4 << 17)
 +#   define R500_ALU_RGBA_G_SWIZ_HALF                  (5 << 17)
 +#   define R500_ALU_RGBA_G_SWIZ_1                     (6 << 17)
 +/* #define R500_ALU_RGBA_G_SWIZ_UNUSED                        (7 << 17) */
 +#   define R500_ALU_RGBA_B_SWIZ_R                     (0 << 20)
 +#   define R500_ALU_RGBA_B_SWIZ_G                     (1 << 20)
 +#   define R500_ALU_RGBA_B_SWIZ_B                     (2 << 20)
 +#   define R500_ALU_RGBA_B_SWIZ_A                     (3 << 20)
 +#   define R500_ALU_RGBA_B_SWIZ_0                     (4 << 20)
 +#   define R500_ALU_RGBA_B_SWIZ_HALF                  (5 << 20)
 +#   define R500_ALU_RGBA_B_SWIZ_1                     (6 << 20)
 +/* #define R500_ALU_RGBA_B_SWIZ_UNUSED                        (7 << 20) */
 +#   define R500_ALU_RGBA_MOD_C_NOP                    (0 << 23)
 +#   define R500_ALU_RGBA_MOD_C_NEG                    (1 << 23)
 +#   define R500_ALU_RGBA_MOD_C_ABS                    (2 << 23)
 +#   define R500_ALU_RGBA_MOD_C_NAB                    (3 << 23)
 +#   define R500_ALU_RGBA_ALPHA_SEL_C_SRC0             (0 << 25)
 +#   define R500_ALU_RGBA_ALPHA_SEL_C_SRC1             (1 << 25)
 +#   define R500_ALU_RGBA_ALPHA_SEL_C_SRC2             (2 << 25)
 +#   define R500_ALU_RGBA_ALPHA_SEL_C_SRCP             (3 << 25)
 +#   define R500_ALU_RGBA_A_SWIZ_R                     (0 << 27)
 +#   define R500_ALU_RGBA_A_SWIZ_G                     (1 << 27)
 +#   define R500_ALU_RGBA_A_SWIZ_B                     (2 << 27)
 +#   define R500_ALU_RGBA_A_SWIZ_A                     (3 << 27)
 +#   define R500_ALU_RGBA_A_SWIZ_0                     (4 << 27)
 +#   define R500_ALU_RGBA_A_SWIZ_HALF                  (5 << 27)
 +#   define R500_ALU_RGBA_A_SWIZ_1                     (6 << 27)
 +/* #define R500_ALU_RGBA_A_SWIZ_UNUSED                        (7 << 27) */
 +#   define R500_ALU_RGBA_ALPHA_MOD_C_NOP              (0 << 30)
 +#   define R500_ALU_RGBA_ALPHA_MOD_C_NEG              (1 << 30)
 +#   define R500_ALU_RGBA_ALPHA_MOD_C_ABS              (2 << 30)
 +#   define R500_ALU_RGBA_ALPHA_MOD_C_NAB              (3 << 30)
 +#define R500_US_ALU_RGB_INST_0                                0xa000
 +#   define R500_ALU_RGB_SEL_A_SRC0                    (0 << 0)
 +#   define R500_ALU_RGB_SEL_A_SRC1                    (1 << 0)
 +#   define R500_ALU_RGB_SEL_A_SRC2                    (2 << 0)
 +#   define R500_ALU_RGB_SEL_A_SRCP                    (3 << 0)
 +#   define R500_ALU_RGB_R_SWIZ_A_R                    (0 << 2)
 +#   define R500_ALU_RGB_R_SWIZ_A_G                    (1 << 2)
 +#   define R500_ALU_RGB_R_SWIZ_A_B                    (2 << 2)
 +#   define R500_ALU_RGB_R_SWIZ_A_A                    (3 << 2)
 +#   define R500_ALU_RGB_R_SWIZ_A_0                    (4 << 2)
 +#   define R500_ALU_RGB_R_SWIZ_A_HALF                 (5 << 2)
 +#   define R500_ALU_RGB_R_SWIZ_A_1                    (6 << 2)
 +/* #define R500_ALU_RGB_R_SWIZ_A_UNUSED                       (7 << 2) */
 +#   define R500_ALU_RGB_G_SWIZ_A_R                    (0 << 5)
 +#   define R500_ALU_RGB_G_SWIZ_A_G                    (1 << 5)
 +#   define R500_ALU_RGB_G_SWIZ_A_B                    (2 << 5)
 +#   define R500_ALU_RGB_G_SWIZ_A_A                    (3 << 5)
 +#   define R500_ALU_RGB_G_SWIZ_A_0                    (4 << 5)
 +#   define R500_ALU_RGB_G_SWIZ_A_HALF                 (5 << 5)
 +#   define R500_ALU_RGB_G_SWIZ_A_1                    (6 << 5)
 +/* #define R500_ALU_RGB_G_SWIZ_A_UNUSED                       (7 << 5) */
 +#   define R500_ALU_RGB_B_SWIZ_A_R                    (0 << 8)
 +#   define R500_ALU_RGB_B_SWIZ_A_G                    (1 << 8)
 +#   define R500_ALU_RGB_B_SWIZ_A_B                    (2 << 8)
 +#   define R500_ALU_RGB_B_SWIZ_A_A                    (3 << 8)
 +#   define R500_ALU_RGB_B_SWIZ_A_0                    (4 << 8)
 +#   define R500_ALU_RGB_B_SWIZ_A_HALF                 (5 << 8)
 +#   define R500_ALU_RGB_B_SWIZ_A_1                    (6 << 8)
 +/* #define R500_ALU_RGB_B_SWIZ_A_UNUSED                       (7 << 8) */
 +#   define R500_ALU_RGB_MOD_A_NOP                     (0 << 11)
 +#   define R500_ALU_RGB_MOD_A_NEG                     (1 << 11)
 +#   define R500_ALU_RGB_MOD_A_ABS                     (2 << 11)
 +#   define R500_ALU_RGB_MOD_A_NAB                     (3 << 11)
 +#   define R500_ALU_RGB_SEL_B_SRC0                    (0 << 13)
 +#   define R500_ALU_RGB_SEL_B_SRC1                    (1 << 13)
 +#   define R500_ALU_RGB_SEL_B_SRC2                    (2 << 13)
 +#   define R500_ALU_RGB_SEL_B_SRCP                    (3 << 13)
 +#   define R500_ALU_RGB_R_SWIZ_B_R                    (0 << 15)
 +#   define R500_ALU_RGB_R_SWIZ_B_G                    (1 << 15)
 +#   define R500_ALU_RGB_R_SWIZ_B_B                    (2 << 15)
 +#   define R500_ALU_RGB_R_SWIZ_B_A                    (3 << 15)
 +#   define R500_ALU_RGB_R_SWIZ_B_0                    (4 << 15)
 +#   define R500_ALU_RGB_R_SWIZ_B_HALF                 (5 << 15)
 +#   define R500_ALU_RGB_R_SWIZ_B_1                    (6 << 15)
 +/* #define R500_ALU_RGB_R_SWIZ_B_UNUSED                       (7 << 15) */
 +#   define R500_ALU_RGB_G_SWIZ_B_R                    (0 << 18)
 +#   define R500_ALU_RGB_G_SWIZ_B_G                    (1 << 18)
 +#   define R500_ALU_RGB_G_SWIZ_B_B                    (2 << 18)
 +#   define R500_ALU_RGB_G_SWIZ_B_A                    (3 << 18)
 +#   define R500_ALU_RGB_G_SWIZ_B_0                    (4 << 18)
 +#   define R500_ALU_RGB_G_SWIZ_B_HALF                 (5 << 18)
 +#   define R500_ALU_RGB_G_SWIZ_B_1                    (6 << 18)
 +/* #define R500_ALU_RGB_G_SWIZ_B_UNUSED                       (7 << 18) */
 +#   define R500_ALU_RGB_B_SWIZ_B_R                    (0 << 21)
 +#   define R500_ALU_RGB_B_SWIZ_B_G                    (1 << 21)
 +#   define R500_ALU_RGB_B_SWIZ_B_B                    (2 << 21)
 +#   define R500_ALU_RGB_B_SWIZ_B_A                    (3 << 21)
 +#   define R500_ALU_RGB_B_SWIZ_B_0                    (4 << 21)
 +#   define R500_ALU_RGB_B_SWIZ_B_HALF                 (5 << 21)
 +#   define R500_ALU_RGB_B_SWIZ_B_1                    (6 << 21)
 +/* #define R500_ALU_RGB_B_SWIZ_B_UNUSED                       (7 << 21) */
 +#   define R500_ALU_RGB_MOD_B_NOP                     (0 << 24)
 +#   define R500_ALU_RGB_MOD_B_NEG                     (1 << 24)
 +#   define R500_ALU_RGB_MOD_B_ABS                     (2 << 24)
 +#   define R500_ALU_RGB_MOD_B_NAB                     (3 << 24)
 +#   define R500_ALU_RGB_OMOD_IDENTITY                 (0 << 26)
 +#   define R500_ALU_RGB_OMOD_MUL_2                    (1 << 26)
 +#   define R500_ALU_RGB_OMOD_MUL_4                    (2 << 26)
 +#   define R500_ALU_RGB_OMOD_MUL_8                    (3 << 26)
 +#   define R500_ALU_RGB_OMOD_DIV_2                    (4 << 26)
 +#   define R500_ALU_RGB_OMOD_DIV_4                    (5 << 26)
 +#   define R500_ALU_RGB_OMOD_DIV_8                    (6 << 26)
 +#   define R500_ALU_RGB_OMOD_DISABLE                  (7 << 26)
 +#   define R500_ALU_RGB_TARGET(x)                     (x << 29)
 +#   define R500_ALU_RGB_WMASK                         (1 << 31)
 +#define R500_US_ALU_RGB_ADDR_0                                0x9000
 +#   define R500_RGB_ADDR0(x)                          (x << 0)
 +#   define R500_RGB_ADDR0_CONST                               (1 << 8)
 +#   define R500_RGB_ADDR0_REL                         (1 << 9)
 +#   define R500_RGB_ADDR1(x)                          (x << 10)
 +#   define R500_RGB_ADDR1_CONST                               (1 << 18)
 +#   define R500_RGB_ADDR1_REL                         (1 << 19)
 +#   define R500_RGB_ADDR2(x)                          (x << 20)
 +#   define R500_RGB_ADDR2_CONST                               (1 << 28)
 +#   define R500_RGB_ADDR2_REL                         (1 << 29)
 +#   define R500_RGB_SRCP_OP_1_MINUS_2RGB0             (0 << 30)
 +#   define R500_RGB_SRCP_OP_RGB1_MINUS_RGB0           (1 << 30)
 +#   define R500_RGB_SRCP_OP_RGB1_PLUS_RGB0            (2 << 30)
 +#   define R500_RGB_SRCP_OP_1_MINUS_RGB0              (3 << 30)
 +#define R500_US_CMN_INST_0                            0xb800
 +#   define R500_INST_TYPE_ALU                         (0 << 0)
 +#   define R500_INST_TYPE_OUT                         (1 << 0)
 +#   define R500_INST_TYPE_FC                          (2 << 0)
 +#   define R500_INST_TYPE_TEX                         (3 << 0)
 +#   define R500_INST_TEX_SEM_WAIT                     (1 << 2)
 +#   define R500_INST_RGB_PRED_SEL_NONE                        (0 << 3)
 +#   define R500_INST_RGB_PRED_SEL_RGBA                        (1 << 3)
 +#   define R500_INST_RGB_PRED_SEL_RRRR                        (2 << 3)
 +#   define R500_INST_RGB_PRED_SEL_GGGG                        (3 << 3)
 +#   define R500_INST_RGB_PRED_SEL_BBBB                        (4 << 3)
 +#   define R500_INST_RGB_PRED_SEL_AAAA                        (5 << 3)
 +#   define R500_INST_RGB_PRED_INV                     (1 << 6)
 +#   define R500_INST_WRITE_INACTIVE                   (1 << 7)
 +#   define R500_INST_LAST                             (1 << 8)
 +#   define R500_INST_NOP                              (1 << 9)
 +#   define R500_INST_ALU_WAIT                         (1 << 10)
 +#   define R500_INST_RGB_WMASK_R                      (1 << 11)
 +#   define R500_INST_RGB_WMASK_G                      (1 << 12)
 +#   define R500_INST_RGB_WMASK_B                      (1 << 13)
 +#   define R500_INST_ALPHA_WMASK                      (1 << 14)
 +#   define R500_INST_RGB_OMASK_R                      (1 << 15)
 +#   define R500_INST_RGB_OMASK_G                      (1 << 16)
 +#   define R500_INST_RGB_OMASK_B                      (1 << 17)
 +#   define R500_INST_ALPHA_OMASK                      (1 << 18)
 +#   define R500_INST_RGB_CLAMP                                (1 << 19)
 +#   define R500_INST_ALPHA_CLAMP                      (1 << 20)
 +#   define R500_INST_ALU_RESULT_SEL                   (1 << 21)
 +#   define R500_INST_ALPHA_PRED_INV                   (1 << 22)
 +#   define R500_INST_ALU_RESULT_OP_EQ                 (0 << 23)
 +#   define R500_INST_ALU_RESULT_OP_LT                 (1 << 23)
 +#   define R500_INST_ALU_RESULT_OP_GE                 (2 << 23)
 +#   define R500_INST_ALU_RESULT_OP_NE                 (3 << 23)
 +#   define R500_INST_ALPHA_PRED_SEL_NONE              (0 << 25)
 +#   define R500_INST_ALPHA_PRED_SEL_RGBA              (1 << 25)
 +#   define R500_INST_ALPHA_PRED_SEL_RRRR              (2 << 25)
 +#   define R500_INST_ALPHA_PRED_SEL_GGGG              (3 << 25)
 +#   define R500_INST_ALPHA_PRED_SEL_BBBB              (4 << 25)
 +#   define R500_INST_ALPHA_PRED_SEL_AAAA              (5 << 25)
 +/* XXX next four are kind of guessed */
 +#   define R500_INST_STAT_WE_R                                (1 << 28)
 +#   define R500_INST_STAT_WE_G                                (1 << 29)
 +#   define R500_INST_STAT_WE_B                                (1 << 30)
 +#   define R500_INST_STAT_WE_A                                (1 << 31)
 +/* note that these are 8 bit lengths, despite the offsets, at least for R500 */
 +#define R500_US_CODE_ADDR                             0x4630
 +#   define R500_US_CODE_START_ADDR(x)                 (x << 0)
 +#   define R500_US_CODE_END_ADDR(x)                   (x << 16)
 +#define R500_US_CODE_OFFSET                           0x4638
 +#   define R500_US_CODE_OFFSET_ADDR(x)                        (x << 0)
 +#define R500_US_CODE_RANGE                            0x4634
 +#   define R500_US_CODE_RANGE_ADDR(x)                 (x << 0)
 +#   define R500_US_CODE_RANGE_SIZE(x)                 (x << 16)
 +#define R500_US_CONFIG                                        0x4600
 +#   define R500_ZERO_TIMES_ANYTHING_EQUALS_ZERO               (1 << 1)
 +#define R500_US_FC_ADDR_0                             0xa000
 +#   define R500_FC_BOOL_ADDR(x)                               (x << 0)
 +#   define R500_FC_INT_ADDR(x)                                (x << 8)
 +#   define R500_FC_JUMP_ADDR(x)                               (x << 16)
 +#   define R500_FC_JUMP_GLOBAL                                (1 << 31)
 +#define R500_US_FC_BOOL_CONST                         0x4620
 +#   define R500_FC_KBOOL(x)                           (x)
 +#define R500_US_FC_CTRL                                       0x4624
 +#   define R500_FC_TEST_EN                            (1 << 30)
 +#   define R500_FC_FULL_FC_EN                         (1 << 31)
 +#define R500_US_FC_INST_0                             0x9800
 +#   define R500_FC_OP_JUMP                            (0 << 0)
 +#   define R500_FC_OP_LOOP                            (1 << 0)
 +#   define R500_FC_OP_ENDLOOP                         (2 << 0)
 +#   define R500_FC_OP_REP                             (3 << 0)
 +#   define R500_FC_OP_ENDREP                          (4 << 0)
 +#   define R500_FC_OP_BREAKLOOP                               (5 << 0)
 +#   define R500_FC_OP_BREAKREP                                (6 << 0)
 +#   define R500_FC_OP_CONTINUE                                (7 << 0)
 +#   define R500_FC_B_ELSE                             (1 << 4)
 +#   define R500_FC_JUMP_ANY                           (1 << 5)
 +#   define R500_FC_A_OP_NONE                          (0 << 6)
 +#   define R500_FC_A_OP_POP                           (1 << 6)
 +#   define R500_FC_A_OP_PUSH                          (2 << 6)
 +#   define R500_FC_JUMP_FUNC(x)                               (x << 8)
 +#   define R500_FC_B_POP_CNT(x)                               (x << 16)
 +#   define R500_FC_B_OP0_NONE                         (0 << 24)
 +#   define R500_FC_B_OP0_DECR                         (1 << 24)
 +#   define R500_FC_B_OP0_INCR                         (2 << 24)
 +#   define R500_FC_B_OP1_DECR                         (0 << 26)
 +#   define R500_FC_B_OP1_NONE                         (1 << 26)
 +#   define R500_FC_B_OP1_INCR                         (2 << 26)
 +#   define R500_FC_IGNORE_UNCOVERED                   (1 << 28)
 +#define R500_US_FC_INT_CONST_0                                0x4c00
 +#   define R500_FC_INT_CONST_KR(x)                    (x << 0)
 +#   define R500_FC_INT_CONST_KG(x)                    (x << 8)
 +#   define R500_FC_INT_CONST_KB(x)                    (x << 16)
 +/* _0 through _15 */
 +#define R500_US_FORMAT0_0                             0x4640
 +#   define R500_FORMAT_TXWIDTH(x)                     (x << 0)
 +#   define R500_FORMAT_TXHEIGHT(x)                    (x << 11)
 +#   define R500_FORMAT_TXDEPTH(x)                     (x << 22)
 +/* _0 through _3 */
 +#define R500_US_OUT_FMT_0                             0x46a4
 +#   define R500_OUT_FMT_C4_8                          (0 << 0)
 +#   define R500_OUT_FMT_C4_10                         (1 << 0)
 +#   define R500_OUT_FMT_C4_10_GAMMA                   (2 << 0)
 +#   define R500_OUT_FMT_C_16                          (3 << 0)
 +#   define R500_OUT_FMT_C2_16                         (4 << 0)
 +#   define R500_OUT_FMT_C4_16                         (5 << 0)
 +#   define R500_OUT_FMT_C_16_MPEG                     (6 << 0)
 +#   define R500_OUT_FMT_C2_16_MPEG                    (7 << 0)
 +#   define R500_OUT_FMT_C2_4                          (8 << 0)
 +#   define R500_OUT_FMT_C_3_3_2                               (9 << 0)
 +#   define R500_OUT_FMT_C_6_5_6                               (10 << 0)
 +#   define R500_OUT_FMT_C_11_11_10                    (11 << 0)
 +#   define R500_OUT_FMT_C_10_11_11                    (12 << 0)
 +#   define R500_OUT_FMT_C_2_10_10_10                  (13 << 0)
 +/* #define R500_OUT_FMT_RESERVED                      (14 << 0) */
 +#   define R500_OUT_FMT_UNUSED                                (15 << 0)
 +#   define R500_OUT_FMT_C_16_FP                               (16 << 0)
 +#   define R500_OUT_FMT_C2_16_FP                      (17 << 0)
 +#   define R500_OUT_FMT_C4_16_FP                      (18 << 0)
 +#   define R500_OUT_FMT_C_32_FP                               (19 << 0)
 +#   define R500_OUT_FMT_C2_32_FP                      (20 << 0)
 +#   define R500_OUT_FMT_C4_32_FP                      (21 << 0)
 +#   define R500_C0_SEL_A                              (0 << 8)
 +#   define R500_C0_SEL_R                              (1 << 8)
 +#   define R500_C0_SEL_G                              (2 << 8)
 +#   define R500_C0_SEL_B                              (3 << 8)
 +#   define R500_C1_SEL_A                              (0 << 10)
 +#   define R500_C1_SEL_R                              (1 << 10)
 +#   define R500_C1_SEL_G                              (2 << 10)
 +#   define R500_C1_SEL_B                              (3 << 10)
 +#   define R500_C2_SEL_A                              (0 << 12)
 +#   define R500_C2_SEL_R                              (1 << 12)
 +#   define R500_C2_SEL_G                              (2 << 12)
 +#   define R500_C2_SEL_B                              (3 << 12)
 +#   define R500_C3_SEL_A                              (0 << 14)
 +#   define R500_C3_SEL_R                              (1 << 14)
 +#   define R500_C3_SEL_G                              (2 << 14)
 +#   define R500_C3_SEL_B                              (3 << 14)
 +#   define R500_OUT_SIGN(x)                           (x << 16)
 +#   define R500_ROUND_ADJ                             (1 << 20)
 +#define R500_US_PIXSIZE                                       0x4604
 +#   define R500_PIX_SIZE(x)                           (x)
 +#define R500_US_TEX_ADDR_0                            0x9800
 +#   define R500_TEX_SRC_ADDR(x)                               (x << 0)
 +#   define R500_TEX_SRC_ADDR_REL                      (1 << 7)
 +#   define R500_TEX_SRC_S_SWIZ_R                      (0 << 8)
 +#   define R500_TEX_SRC_S_SWIZ_G                      (1 << 8)
 +#   define R500_TEX_SRC_S_SWIZ_B                      (2 << 8)
 +#   define R500_TEX_SRC_S_SWIZ_A                      (3 << 8)
 +#   define R500_TEX_SRC_T_SWIZ_R                      (0 << 10)
 +#   define R500_TEX_SRC_T_SWIZ_G                      (1 << 10)
 +#   define R500_TEX_SRC_T_SWIZ_B                      (2 << 10)
 +#   define R500_TEX_SRC_T_SWIZ_A                      (3 << 10)
 +#   define R500_TEX_SRC_R_SWIZ_R                      (0 << 12)
 +#   define R500_TEX_SRC_R_SWIZ_G                      (1 << 12)
 +#   define R500_TEX_SRC_R_SWIZ_B                      (2 << 12)
 +#   define R500_TEX_SRC_R_SWIZ_A                      (3 << 12)
 +#   define R500_TEX_SRC_Q_SWIZ_R                      (0 << 14)
 +#   define R500_TEX_SRC_Q_SWIZ_G                      (1 << 14)
 +#   define R500_TEX_SRC_Q_SWIZ_B                      (2 << 14)
 +#   define R500_TEX_SRC_Q_SWIZ_A                      (3 << 14)
 +#   define R500_TEX_DST_ADDR(x)                               (x << 16)
 +#   define R500_TEX_DST_ADDR_REL                      (1 << 23)
 +#   define R500_TEX_DST_R_SWIZ_R                      (0 << 24)
 +#   define R500_TEX_DST_R_SWIZ_G                      (1 << 24)
 +#   define R500_TEX_DST_R_SWIZ_B                      (2 << 24)
 +#   define R500_TEX_DST_R_SWIZ_A                      (3 << 24)
 +#   define R500_TEX_DST_G_SWIZ_R                      (0 << 26)
 +#   define R500_TEX_DST_G_SWIZ_G                      (1 << 26)
 +#   define R500_TEX_DST_G_SWIZ_B                      (2 << 26)
 +#   define R500_TEX_DST_G_SWIZ_A                      (3 << 26)
 +#   define R500_TEX_DST_B_SWIZ_R                      (0 << 28)
 +#   define R500_TEX_DST_B_SWIZ_G                      (1 << 28)
 +#   define R500_TEX_DST_B_SWIZ_B                      (2 << 28)
 +#   define R500_TEX_DST_B_SWIZ_A                      (3 << 28)
 +#   define R500_TEX_DST_A_SWIZ_R                      (0 << 30)
 +#   define R500_TEX_DST_A_SWIZ_G                      (1 << 30)
 +#   define R500_TEX_DST_A_SWIZ_B                      (2 << 30)
 +#   define R500_TEX_DST_A_SWIZ_A                      (3 << 30)
 +#define R500_US_TEX_ADDR_DXDY_0                               0xa000
 +#   define R500_DX_ADDR(x)                            (x << 0)
 +#   define R500_DX_ADDR_REL                           (1 << 7)
 +#   define R500_DX_S_SWIZ_R                           (0 << 8)
 +#   define R500_DX_S_SWIZ_G                           (1 << 8)
 +#   define R500_DX_S_SWIZ_B                           (2 << 8)
 +#   define R500_DX_S_SWIZ_A                           (3 << 8)
 +#   define R500_DX_T_SWIZ_R                           (0 << 10)
 +#   define R500_DX_T_SWIZ_G                           (1 << 10)
 +#   define R500_DX_T_SWIZ_B                           (2 << 10)
 +#   define R500_DX_T_SWIZ_A                           (3 << 10)
 +#   define R500_DX_R_SWIZ_R                           (0 << 12)
 +#   define R500_DX_R_SWIZ_G                           (1 << 12)
 +#   define R500_DX_R_SWIZ_B                           (2 << 12)
 +#   define R500_DX_R_SWIZ_A                           (3 << 12)
 +#   define R500_DX_Q_SWIZ_R                           (0 << 14)
 +#   define R500_DX_Q_SWIZ_G                           (1 << 14)
 +#   define R500_DX_Q_SWIZ_B                           (2 << 14)
 +#   define R500_DX_Q_SWIZ_A                           (3 << 14)
 +#   define R500_DY_ADDR(x)                            (x << 16)
 +#   define R500_DY_ADDR_REL                           (1 << 17)
 +#   define R500_DY_S_SWIZ_R                           (0 << 24)
 +#   define R500_DY_S_SWIZ_G                           (1 << 24)
 +#   define R500_DY_S_SWIZ_B                           (2 << 24)
 +#   define R500_DY_S_SWIZ_A                           (3 << 24)
 +#   define R500_DY_T_SWIZ_R                           (0 << 26)
 +#   define R500_DY_T_SWIZ_G                           (1 << 26)
 +#   define R500_DY_T_SWIZ_B                           (2 << 26)
 +#   define R500_DY_T_SWIZ_A                           (3 << 26)
 +#   define R500_DY_R_SWIZ_R                           (0 << 28)
 +#   define R500_DY_R_SWIZ_G                           (1 << 28)
 +#   define R500_DY_R_SWIZ_B                           (2 << 28)
 +#   define R500_DY_R_SWIZ_A                           (3 << 28)
 +#   define R500_DY_Q_SWIZ_R                           (0 << 30)
 +#   define R500_DY_Q_SWIZ_G                           (1 << 30)
 +#   define R500_DY_Q_SWIZ_B                           (2 << 30)
 +#   define R500_DY_Q_SWIZ_A                           (3 << 30)
 +#define R500_US_TEX_INST_0                            0x9000
 +#   define R500_TEX_ID(x)                             (x << 16)
 +#   define R500_TEX_INST_NOP                          (0 << 22)
 +#   define R500_TEX_INST_LD                           (1 << 22)
 +#   define R500_TEX_INST_TEXKILL                      (2 << 22)
 +#   define R500_TEX_INST_PROJ                         (3 << 22)
 +#   define R500_TEX_INST_LODBIAS                      (4 << 22)
 +#   define R500_TEX_INST_LOD                          (5 << 22)
 +#   define R500_TEX_INST_DXDY                         (6 << 22)
 +#   define R500_TEX_SEM_ACQUIRE                               (1 << 25)
 +#   define R500_TEX_IGNORE_UNCOVERED                  (1 << 26)
 +#   define R500_TEX_UNSCALED                          (1 << 27)
 +#define R500_US_W_FMT                                 0x46b4
 +#   define R500_W_FMT_W0                              (0 << 0)
 +#   define R500_W_FMT_W24                             (1 << 0)
 +#   define R500_W_FMT_W24FP                           (2 << 0)
 +#   define R500_W_SRC_US                              (0 << 2)
 +#   define R500_W_SRC_RAS                             (1 << 2)
 +
 +#define R500_GA_US_VECTOR_INDEX 0x4250
 +#define R500_GA_US_VECTOR_DATA 0x4254
 +
 +#define R500_RS_INST_0                                        0x4320
 +#define R500_RS_INST_1                                        0x4324
 +#   define R500_RS_INST_TEX_ID_SHIFT                  0
 +#   define R500_RS_INST_TEX_CN_WRITE                  (1 << 4)
 +#   define R500_RS_INST_TEX_ADDR_SHIFT                        5
 +#   define R500_RS_INST_COL_ID_SHIFT                  12
 +#   define R500_RS_INST_COL_CN_NO_WRITE                       (0 << 16)
 +#   define R500_RS_INST_COL_CN_WRITE                  (1 << 16)
 +#   define R500_RS_INST_COL_CN_WRITE_FBUFFER          (2 << 16)
 +#   define R500_RS_INST_COL_CN_WRITE_BACKFACE         (3 << 16)
 +#   define R500_RS_INST_COL_COL_ADDR_SHIFT            18
 +#   define R500_RS_INST_TEX_ADJ                               (1 << 25)
 +#   define R500_RS_INST_W_CN                          (1 << 26)
 +
 +#define R500_US_FC_CTRL                                       0x4624
 +#define R500_US_CODE_ADDR                             0x4630
 +#define R500_US_CODE_RANGE                            0x4634
 +#define R500_US_CODE_OFFSET                           0x4638
 +
 +#define R500_RS_IP_0                                  0x4074
 +#define R500_RS_IP_1                                  0x4078
 +#   define R500_RS_IP_PTR_K0                          62
 +#   define R500_RS_IP_PTR_K1                          63
 +#   define R500_RS_IP_TEX_PTR_S_SHIFT                         0
 +#   define R500_RS_IP_TEX_PTR_T_SHIFT                         6
 +#   define R500_RS_IP_TEX_PTR_R_SHIFT                         12
 +#   define R500_RS_IP_TEX_PTR_Q_SHIFT                         18
 +#   define R500_RS_IP_COL_PTR_SHIFT                   24
 +#   define R500_RS_IP_COL_FMT_SHIFT                   27
 +#   define R500_RS_IP_COL_FMT_RGBA                    (0 << 27)
 +#   define R500_RS_IP_OFFSET_EN                       (1 << 31)
 +
 +#define R500_DYN_SCLK_PWMEM_PIPE                        0x000d /* PLL */
 +
 +#endif
diff --combined shared-core/drm.h
@@@ -236,7 -236,7 +236,7 @@@ enum drm_map_type 
        _DRM_AGP = 3,             /**< AGP/GART */
        _DRM_SCATTER_GATHER = 4,  /**< Scatter/gather memory for PCI DMA */
        _DRM_CONSISTENT = 5,      /**< Consistent memory for PCI DMA */
 -      _DRM_TTM = 6
 +      _DRM_TTM = 6,
  };
  
  /**
@@@ -555,43 -555,9 +555,43 @@@ union drm_wait_vblank 
        struct drm_wait_vblank_reply reply;
  };
  
 +/* Handle monitor hotplug.
 + *
 + * May want to extend this later to pass reply information which
 + * details the connectors which generated the hotplug event.
 + * Some chipsets can't determine that though, and we'd need to leave
 + * it to the higher levels to determine exactly what changed.
 + */
 +enum drm_hotplug_seq_type {
 +      _DRM_HOTPLUG_SIGNAL = 0x00000001, /**< Send signal instead of blocking */
 +};
 +struct drm_wait_hotplug_request {
 +      enum drm_hotplug_seq_type type;
 +      unsigned long signal;
 +};
 +
 +struct drm_wait_hotplug_reply {
 +      enum drm_hotplug_seq_type type;
 +      unsigned int counter;
 +      long tval_sec;
 +      long tval_usec;
 +};
 +
 +/**
 + * DRM_IOCTL_WAIT_HOTPLUG ioctl argument type.
 + *
 + * \sa drmWaitHotplug().
 + */
 +union drm_wait_hotplug {
 +      struct drm_wait_hotplug_request request;
 +      struct drm_wait_hotplug_reply reply;
 +};
 +
 +enum drm_modeset_ctl_cmd {
 +      _DRM_PRE_MODESET = 1,
 +      _DRM_POST_MODESET = 2,
 +};
  
 -#define _DRM_PRE_MODESET 1
 -#define _DRM_POST_MODESET 2
  
  /**
   * DRM_IOCTL_MODESET_CTL ioctl argument type
@@@ -993,275 -959,6 +993,275 @@@ struct drm_mm_info_arg 
        uint64_t p_size;
  };
  
 +struct drm_gem_close {
 +      /** Handle of the object to be closed. */
 +      uint32_t handle;
 +      uint32_t pad;
 +};
 +
 +struct drm_gem_flink {
 +      /** Handle for the object being named */
 +      uint32_t handle;
 +
 +      /** Returned global name */
 +      uint32_t name;
 +};
 +
 +struct drm_gem_open {
 +      /** Name of object being opened */
 +      uint32_t name;
 +
 +      /** Returned handle for the object */
 +      uint32_t handle;
 +      
 +      /** Returned size of the object */
 +      uint64_t size;
 +};
 +
 +/*
 + * Drm mode setting
 + */
 +#define DRM_DISPLAY_INFO_LEN 32
 +#define DRM_CONNECTOR_NAME_LEN 32
 +#define DRM_DISPLAY_MODE_LEN 32
 +#define DRM_PROP_NAME_LEN 32
 +
 +#define DRM_MODE_TYPE_BUILTIN (1<<0)
 +#define DRM_MODE_TYPE_CLOCK_C ((1<<1) | DRM_MODE_TYPE_BUILTIN)
 +#define DRM_MODE_TYPE_CRTC_C  ((1<<2) | DRM_MODE_TYPE_BUILTIN)
 +#define DRM_MODE_TYPE_PREFERRED       (1<<3)
 +#define DRM_MODE_TYPE_DEFAULT (1<<4)
 +#define DRM_MODE_TYPE_USERDEF (1<<5)
 +#define DRM_MODE_TYPE_DRIVER  (1<<6)
 +
 +/* Video mode flags */
 +/* bit compatible with the xorg definitions. */
 +#define DRM_MODE_FLAG_PHSYNC  (1<<0)
 +#define DRM_MODE_FLAG_NHSYNC  (1<<1)
 +#define DRM_MODE_FLAG_PVSYNC  (1<<2)
 +#define DRM_MODE_FLAG_NVSYNC  (1<<3)
 +#define DRM_MODE_FLAG_INTERLACE       (1<<4)
 +#define DRM_MODE_FLAG_DBLSCAN (1<<5)
 +#define DRM_MODE_FLAG_CSYNC   (1<<6)
 +#define DRM_MODE_FLAG_PCSYNC  (1<<7)
 +#define DRM_MODE_FLAG_NCSYNC  (1<<8)
 +#define DRM_MODE_FLAG_HSKEW   (1<<9) /* hskew provided */
 +#define DRM_MODE_FLAG_BCAST   (1<<10)
 +#define DRM_MODE_FLAG_PIXMUX  (1<<11)
 +#define DRM_MODE_FLAG_DBLCLK  (1<<12)
 +#define DRM_MODE_FLAG_CLKDIV2 (1<<13)
 +
 +/* DPMS flags */
 +/* bit compatible with the xorg definitions. */
 +#define DRM_MODE_DPMS_ON 0
 +#define DRM_MODE_DPMS_STANDBY 1
 +#define DRM_MODE_DPMS_SUSPEND 2
 +#define DRM_MODE_DPMS_OFF 3
 +
 +/* Scaling mode options */
 +#define DRM_MODE_SCALE_NON_GPU 0
 +#define DRM_MODE_SCALE_FULLSCREEN 1
 +#define DRM_MODE_SCALE_NO_SCALE 2
 +#define DRM_MODE_SCALE_ASPECT 3
 +
 +/* Dithering mode options */
 +#define DRM_MODE_DITHERING_OFF 0
 +#define DRM_MODE_DITHERING_ON 1
 +
 +struct drm_mode_modeinfo {
 +      unsigned int clock;
 +      unsigned short hdisplay, hsync_start, hsync_end, htotal, hskew;
 +      unsigned short vdisplay, vsync_start, vsync_end, vtotal, vscan;
 +
 +      unsigned int vrefresh; /* vertical refresh * 1000 */
 +
 +      unsigned int flags;
 +      unsigned int type;
 +      char name[DRM_DISPLAY_MODE_LEN];
 +};
 +
 +struct drm_mode_card_res {
 +      uint64_t fb_id_ptr;
 +      uint64_t crtc_id_ptr;
 +      uint64_t connector_id_ptr;
 +      uint64_t encoder_id_ptr;
 +      int count_fbs;
 +      int count_crtcs;
 +      int count_connectors;
 +      int count_encoders;
 +      int min_width, max_width;
 +      int min_height, max_height;
 +};
 +
 +struct drm_mode_crtc {
 +      uint64_t set_connectors_ptr;
 +      int count_connectors;
 +
 +      unsigned int crtc_id; /**< Id */
 +      unsigned int fb_id; /**< Id of framebuffer */
 +
 +      int x, y; /**< Position on the frameuffer */
 +
 +      uint32_t gamma_size;
 +      int mode_valid;
 +      struct drm_mode_modeinfo mode;
 +};
 +
 +#define DRM_MODE_ENCODER_NONE 0
 +#define DRM_MODE_ENCODER_DAC  1
 +#define DRM_MODE_ENCODER_TMDS 2
 +#define DRM_MODE_ENCODER_LVDS 3
 +#define DRM_MODE_ENCODER_TVDAC 4
 +
 +struct drm_mode_get_encoder {
 +
 +      unsigned int encoder_type;
 +      unsigned int encoder_id;
 +
 +      unsigned int crtc_id; /**< Id of crtc */
 +
 +      uint32_t possible_crtcs;
 +      uint32_t possible_clones;
 +};
 +
 +/* This is for connectors with multiple signal types. */
 +/* Try to match DRM_MODE_CONNECTOR_X as closely as possible. */
 +#define DRM_MODE_SUBCONNECTOR_Automatic 0
 +#define DRM_MODE_SUBCONNECTOR_Unknown 0
 +#define DRM_MODE_SUBCONNECTOR_DVID 3
 +#define DRM_MODE_SUBCONNECTOR_DVIA 4
 +#define DRM_MODE_SUBCONNECTOR_Composite 5
 +#define DRM_MODE_SUBCONNECTOR_SVIDEO 6
 +#define DRM_MODE_SUBCONNECTOR_Component 8
 +
 +#define DRM_MODE_CONNECTOR_Unknown 0
 +#define DRM_MODE_CONNECTOR_VGA 1
 +#define DRM_MODE_CONNECTOR_DVII 2
 +#define DRM_MODE_CONNECTOR_DVID 3
 +#define DRM_MODE_CONNECTOR_DVIA 4
 +#define DRM_MODE_CONNECTOR_Composite 5
 +#define DRM_MODE_CONNECTOR_SVIDEO 6
 +#define DRM_MODE_CONNECTOR_LVDS 7
 +#define DRM_MODE_CONNECTOR_Component 8
 +#define DRM_MODE_CONNECTOR_9PinDIN 9
 +#define DRM_MODE_CONNECTOR_DisplayPort 10
 +#define DRM_MODE_CONNECTOR_HDMIA 11
 +#define DRM_MODE_CONNECTOR_HDMIB 12
 +
 +struct drm_mode_get_connector {
 +
 +      uint64_t encoders_ptr;
 +      uint64_t modes_ptr;
 +      uint64_t props_ptr;
 +      uint64_t prop_values_ptr;
 +
 +      int count_modes;
 +      int count_props;
 +      int count_encoders;
 +
 +      unsigned int encoder_id; /**< Current Encoder */
 +      unsigned int connector_id; /**< Id */
 +      unsigned int connector_type;
 +      unsigned int connector_type_id;
 +
 +      unsigned int connection;
 +      unsigned int mm_width, mm_height; /**< HxW in millimeters */
 +      unsigned int subpixel;
 +};
 +
 +#define DRM_MODE_PROP_PENDING (1<<0)
 +#define DRM_MODE_PROP_RANGE (1<<1)
 +#define DRM_MODE_PROP_IMMUTABLE (1<<2)
 +#define DRM_MODE_PROP_ENUM (1<<3) // enumerated type with text strings
 +#define DRM_MODE_PROP_BLOB (1<<4)
 +
 +struct drm_mode_property_enum {
 +      uint64_t value;
 +      unsigned char name[DRM_PROP_NAME_LEN];
 +};
 +
 +struct drm_mode_get_property {
 +      uint64_t values_ptr; /* values and blob lengths */
 +      uint64_t enum_blob_ptr; /* enum and blob id ptrs */
 +
 +      unsigned int prop_id;
 +      unsigned int flags;
 +      unsigned char name[DRM_PROP_NAME_LEN];
 +
 +      int count_values;
 +      int count_enum_blobs;
 +};
 +
 +struct drm_mode_connector_set_property {
 +      uint64_t value;
 +      unsigned int prop_id;
 +      unsigned int connector_id;
 +};
 +
 +struct drm_mode_get_blob {
 +      uint32_t blob_id;
 +      uint32_t length;
 +      uint64_t data;
 +};
 +
 +struct drm_mode_fb_cmd {
 +        unsigned int buffer_id;
 +        unsigned int width, height;
 +        unsigned int pitch;
 +        unsigned int bpp;
 +        unsigned int handle;
 +      unsigned int depth;
 +};
 +
 +struct drm_mode_mode_cmd {
 +      unsigned int connector_id;
 +      struct drm_mode_modeinfo mode;
 +};
 +
 +#define DRM_MODE_CURSOR_BO   0x01
 +#define DRM_MODE_CURSOR_MOVE 0x02
 +
 +/*
 + * depending on the value in flags diffrent members are used.
 + *
 + * CURSOR_BO uses
 + *    crtc
 + *    width
 + *    height
 + *    handle - if 0 turns the cursor of
 + *
 + * CURSOR_MOVE uses
 + *    crtc
 + *    x
 + *    y
 + */
 +struct drm_mode_cursor {
 +      unsigned int flags;
 +      unsigned int crtc;
 +      int x;
 +      int y;
 +      uint32_t width;
 +      uint32_t height;
 +      unsigned int handle;
 +};
 +
 +/*
 + * oh so ugly hotplug
 + */
 +struct drm_mode_hotplug {
 +      uint32_t counter;
 +};
 +
 +struct drm_mode_crtc_lut {
 +
 +      uint32_t crtc_id;
 +      uint32_t gamma_size;
 +
 +      uint64_t red;
 +      uint64_t green;
 +      uint64_t blue;
 +};
 +
  /**
   * \name Ioctls Definitions
   */
  #define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, struct drm_client)
  #define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, struct drm_stats)
  #define DRM_IOCTL_SET_VERSION         DRM_IOWR(0x07, struct drm_set_version)
 -#define DRM_IOCTL_MODESET_CTL           DRM_IOW(0x08, struct drm_modeset_ctl)
 +#define DRM_IOCTL_MODESET_CTL           DRM_IOW(0x08,  struct drm_modeset_ctl)
 +
 +#define DRM_IOCTL_GEM_CLOSE           DRM_IOW (0x09, struct drm_gem_close)
 +#define DRM_IOCTL_GEM_FLINK           DRM_IOWR(0x0a, struct drm_gem_flink)
 +#define DRM_IOCTL_GEM_OPEN            DRM_IOWR(0x0b, struct drm_gem_open)
  
  #define DRM_IOCTL_SET_UNIQUE          DRM_IOW( 0x10, struct drm_unique)
  #define DRM_IOCTL_AUTH_MAGIC          DRM_IOW( 0x11, struct drm_auth)
  #define DRM_IOCTL_SET_SAREA_CTX               DRM_IOW( 0x1c, struct drm_ctx_priv_map)
  #define DRM_IOCTL_GET_SAREA_CTX               DRM_IOWR(0x1d, struct drm_ctx_priv_map)
  
 +#define DRM_IOCTL_SET_MASTER            DRM_IO(0x1e)
 +#define DRM_IOCTL_DROP_MASTER           DRM_IO(0x1f)
 +
  #define DRM_IOCTL_ADD_CTX             DRM_IOWR(0x20, struct drm_ctx)
  #define DRM_IOCTL_RM_CTX              DRM_IOWR(0x21, struct drm_ctx)
  #define DRM_IOCTL_MOD_CTX             DRM_IOW( 0x22, struct drm_ctx)
  #define DRM_IOCTL_AGP_BIND            DRM_IOW( 0x36, struct drm_agp_binding)
  #define DRM_IOCTL_AGP_UNBIND          DRM_IOW( 0x37, struct drm_agp_binding)
  
- #define DRM_IOCTL_SG_ALLOC            DRM_IOW0x38, struct drm_scatter_gather)
+ #define DRM_IOCTL_SG_ALLOC            DRM_IOWR(0x38, struct drm_scatter_gather)
  #define DRM_IOCTL_SG_FREE             DRM_IOW( 0x39, struct drm_scatter_gather)
  
  #define DRM_IOCTL_WAIT_VBLANK         DRM_IOWR(0x3a, union drm_wait_vblank)
  #define DRM_IOCTL_BO_VERSION          DRM_IOR(0xd6, struct drm_bo_version_arg)
  #define DRM_IOCTL_MM_INFO               DRM_IOWR(0xd7, struct drm_mm_info_arg)
  
 +#define DRM_IOCTL_MODE_GETRESOURCES     DRM_IOWR(0xA0, struct drm_mode_card_res)
 +#define DRM_IOCTL_MODE_GETCRTC          DRM_IOWR(0xA1, struct drm_mode_crtc)
 +#define DRM_IOCTL_MODE_GETCONNECTOR        DRM_IOWR(0xA2, struct drm_mode_get_connector)
 +#define DRM_IOCTL_MODE_SETCRTC          DRM_IOWR(0xA3, struct drm_mode_crtc)
 +#define DRM_IOCTL_MODE_ADDFB            DRM_IOWR(0xA4, struct drm_mode_fb_cmd)
 +#define DRM_IOCTL_MODE_RMFB             DRM_IOWR(0xA5, unsigned int)
 +#define DRM_IOCTL_MODE_GETFB            DRM_IOWR(0xA6, struct drm_mode_fb_cmd)
 +
 +#define DRM_IOCTL_MODE_SETPROPERTY     DRM_IOWR(0xA7, struct drm_mode_connector_set_property)
 +#define DRM_IOCTL_MODE_GETPROPBLOB     DRM_IOWR(0xA8, struct drm_mode_get_blob)
 +#define DRM_IOCTL_MODE_ATTACHMODE      DRM_IOWR(0xA9, struct drm_mode_mode_cmd)
 +#define DRM_IOCTL_MODE_DETACHMODE      DRM_IOWR(0xAA, struct drm_mode_mode_cmd)
 +
 +#define DRM_IOCTL_MODE_GETPROPERTY     DRM_IOWR(0xAB, struct drm_mode_get_property)
 +#define DRM_IOCTL_MODE_CURSOR          DRM_IOWR(0xAC, struct drm_mode_cursor)
 +#define DRM_IOCTL_MODE_HOTPLUG         DRM_IOWR(0xAD, struct drm_mode_hotplug)
 +#define DRM_IOCTL_WAIT_HOTPLUG                DRM_IOWR(0xAE, union drm_wait_hotplug)
 +
 +#define DRM_IOCTL_MODE_REPLACEFB       DRM_IOWR(0xAF, struct drm_mode_fb_cmd)
 +#define DRM_IOCTL_MODE_GETENCODER      DRM_IOWR(0xB0, struct drm_mode_get_encoder)
 +#define DRM_IOCTL_MODE_GETGAMMA        DRM_IOWR(0xB1, struct drm_mode_crtc_lut)
 +#define DRM_IOCTL_MODE_SETGAMMA        DRM_IOWR(0xB2, struct drm_mode_crtc_lut)
 +
  /*@}*/
  
  /**
@@@ -1,7 -1,3 +1,7 @@@
 +[radeon_ms]
 +0x1002 0x4150 CHIP_RV350|RADEON_AGP "ATI Radeon RV350 9600"
 +0x1002 0x5b63 CHIP_RV370|RADEON_PCIE "ATI Radeon RV370 X550"
 +
  [radeon]
  0x1002 0x3150 CHIP_RV380|RADEON_IS_MOBILITY "ATI Radeon Mobility X600 M24"
  0x1002 0x3152 CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Radeon Mobility X300 M24"
@@@ -83,7 -79,6 +83,6 @@@
  0x1002 0x5460 CHIP_RV380|RADEON_IS_MOBILITY "ATI Radeon Mobility X300 M22"
  0x1002 0x5462 CHIP_RV380|RADEON_IS_MOBILITY "ATI Radeon Mobility X600 SE M24C"
  0x1002 0x5464 CHIP_RV380|RADEON_IS_MOBILITY "ATI FireGL M22 GL 5464"
- 0x1002 0x5657 CHIP_RV380|RADEON_NEW_MEMMAP "ATI Radeon RV370 X550XTX"
  0x1002 0x5548 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R423 X800"
  0x1002 0x5549 CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R423 X800 Pro"
  0x1002 0x554A CHIP_R420|RADEON_NEW_MEMMAP "ATI Radeon R423 X800 XT PE"
  0x1002 0x564F CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Radeon Mobility X700 XL M26"
  0x1002 0x5652 CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Radeon Mobility X700 M26"
  0x1002 0x5653 CHIP_RV410|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP "ATI Radeon Mobility X700 M26"
+ 0x1002 0x5657 CHIP_RV410|RADEON_NEW_MEMMAP "ATI Radeon X550XTX"
  0x1002 0x5834 CHIP_RS300|RADEON_IS_IGP "ATI Radeon RS300 9100 IGP"
  0x1002 0x5835 CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY "ATI Radeon RS300 Mobility IGP"
- 0x1002 0x5954 CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART "ATI RS480 XPRESS 200G"
+ 0x1002 0x5954 CHIP_RS480|RADEON_IS_IGP|RADEON_IS_IGPGART "ATI RS480 XPRESS 200G"
  0x1002 0x5955 CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART "ATI Radeon XPRESS 200M 5955"
  0x1002 0x5974 CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART "ATI Radeon RS482 XPRESS 200"
  0x1002 0x5975 CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART "ATI Radeon RS485 XPRESS 1100 IGP"
  0x1002 0x5964 CHIP_RV280 "ATI Radeon RV280 9200 SE"
  0x1002 0x5965 CHIP_RV280 "ATI FireMV 2200 PCI"
  0x1002 0x5969 CHIP_RV100 "ATI ES1000 RN50"
- 0x1002 0x5a61 CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART "ATI Radeon RC410 XPRESS 200"
- 0x1002 0x5a62 CHIP_RS480|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART "ATI Radeon RC410 XPRESS 200M"
+ 0x1002 0x5a41 CHIP_RS400|RADEON_IS_IGP|RADEON_IS_IGPGART "ATI Radeon XPRESS 200 5A41 (PCIE)"
+ 0x1002 0x5a42 CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART "ATI Radeon XPRESS 200M 5A42 (PCIE)"
+ 0x1002 0x5a61 CHIP_RS400|RADEON_IS_IGP|RADEON_IS_IGPGART "ATI Radeon RC410 XPRESS 200"
+ 0x1002 0x5a62 CHIP_RS400|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_IS_IGPGART "ATI Radeon RC410 XPRESS 200M"
  0x1002 0x5b60 CHIP_RV380|RADEON_NEW_MEMMAP "ATI Radeon RV370 X300 SE"
  0x1002 0x5b62 CHIP_RV380|RADEON_NEW_MEMMAP "ATI Radeon RV370 X600 Pro"
  0x1002 0x5b63 CHIP_RV380|RADEON_NEW_MEMMAP "ATI Radeon RV370 X550"
  0x8086 0x29C2 CHIP_I9XX|CHIP_I915 "Intel G33"
  0x8086 0x29B2 CHIP_I9XX|CHIP_I915 "Intel Q35"
  0x8086 0x29D2 CHIP_I9XX|CHIP_I915 "Intel Q33"
- 0x8086 0x2A42 CHIP_I9XX|CHIP_I965 "Intel Integrated Graphics Device"
+ 0x8086 0x2A42 CHIP_I9XX|CHIP_I965 "Mobile Intel® GM45 Express Chipset"
+ 0x8086 0x2E02 CHIP_I9XX|CHIP_I965 "Intel Integrated Graphics Device"
+ 0x8086 0x2E12 CHIP_I9XX|CHIP_I965 "Intel Q45/Q43"
+ 0x8086 0x2E22 CHIP_I9XX|CHIP_I965 "Intel G45/G43"
  
  [imagine]
  0x105d 0x2309 IMAGINE_128 "Imagine 128"
diff --combined shared-core/i915_dma.c
   */
  int i915_wait_ring(struct drm_device * dev, int n, const char *caller)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -      drm_i915_ring_buffer_t *ring = &(dev_priv->ring);
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_ring_buffer *ring = &(dev_priv->ring);
        u32 last_head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
 +      u32 acthd_reg = IS_I965G(dev) ? I965REG_ACTHD : I915REG_ACTHD;
 +      u32 last_acthd = I915_READ(acthd_reg);
 +      u32 acthd;
        int i;
  
        for (i = 0; i < 10000; i++) {
                ring->head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
 +              acthd = I915_READ(acthd_reg);
                ring->space = ring->head - (ring->tail + 8);
                if (ring->space < 0)
                        ring->space += ring->Size;
                if (ring->head != last_head)
                        i = 0;
  
 +              if (acthd != last_acthd)
 +                      i = 0;
 +
                last_head = ring->head;
 -              DRM_UDELAY(1);
 +              last_acthd = acthd;
 +              msleep_interruptible (10);
        }
  
        return -EBUSY;
  }
  
 -void i915_kernel_lost_context(struct drm_device * dev)
 +#if I915_RING_VALIDATE
 +/**
 + * Validate the cached ring tail value
 + *
 + * If the X server writes to the ring and DRM doesn't
 + * reload the head and tail pointers, it will end up writing
 + * data to the wrong place in the ring, causing havoc.
 + */
 +void i915_ring_validate(struct drm_device *dev, const char *func, int line)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
        drm_i915_ring_buffer_t *ring = &(dev_priv->ring);
 +      u32     tail = I915_READ(LP_RING+RING_TAIL) & HEAD_ADDR;
 +      u32     head = I915_READ(LP_RING+RING_HEAD) & HEAD_ADDR;
 +
 +      if (tail != ring->tail) {
 +              DRM_ERROR("%s:%d head sw %x, hw %x. tail sw %x hw %x\n",
 +                        func, line,
 +                        ring->head, head, ring->tail, tail);
 +              BUG_ON(1);
 +      }
 +}
 +#endif
 +
 +void i915_kernel_lost_context(struct drm_device * dev)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_ring_buffer *ring = &(dev_priv->ring);
 +
 +      /* we should never lose context on the ring with modesetting 
 +       * as we don't expose it to userspace */
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              return;
  
        ring->head = I915_READ(PRB0_HEAD) & HEAD_ADDR;
        ring->tail = I915_READ(PRB0_TAIL) & TAIL_ADDR;
                ring->space += ring->Size;
  }
  
 -static int i915_dma_cleanup(struct drm_device * dev)
 +int i915_dma_cleanup(struct drm_device * dev)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              return 0;
 +
        /* Make sure interrupts are disabled here because the uninstall ioctl
         * may not have been called from userspace and after dev_private
         * is freed, it's too late.
         */
 -      if (dev->irq)
 +      if (dev->irq_enabled)
                drm_irq_uninstall(dev);
  
 -      if (dev_priv->ring.virtual_start) {
 -              drm_core_ioremapfree(&dev_priv->ring.map, dev);
 -              dev_priv->ring.virtual_start = 0;
 -              dev_priv->ring.map.handle = 0;
 -              dev_priv->ring.map.size = 0;
 -      }
 -
 -      if (dev_priv->status_page_dmah) {
 -              drm_pci_free(dev, dev_priv->status_page_dmah);
 -              dev_priv->status_page_dmah = NULL;
 -              /* Need to rewrite hardware status page */
 -              I915_WRITE(0x02080, 0x1ffff000);
 -      }
 -
 -      if (dev_priv->status_gfx_addr) {
 -              dev_priv->status_gfx_addr = 0;
 -              drm_core_ioremapfree(&dev_priv->hws_map, dev);
 -              I915_WRITE(0x02080, 0x1ffff000);
 -      }
 +        if (dev_priv->ring.virtual_start) {
 +                drm_core_ioremapfree(&dev_priv->ring.map, dev);
 +                dev_priv->ring.virtual_start = 0;
 +                dev_priv->ring.map.handle = 0;
 +                dev_priv->ring.map.size = 0;
 +              dev_priv->ring.Size = 0;
 +        }
 +
 +        if (dev_priv->status_page_dmah) {
 +                drm_pci_free(dev, dev_priv->status_page_dmah);
 +                dev_priv->status_page_dmah = NULL;
 +                /* Need to rewrite hardware status page */
 +                I915_WRITE(0x02080, 0x1ffff000);
 +        }
 +
 +        if (dev_priv->hws_agpoffset) {
 +                dev_priv->hws_agpoffset = 0;
 +                drm_core_ioremapfree(&dev_priv->hws_map, dev);
 +                I915_WRITE(0x02080, 0x1ffff000);
 +        }
  
        return 0;
  }
  
 -#if defined(I915_HAVE_BUFFER)
 +#if defined(I915_HAVE_BUFFER) && defined(DRI2)
  #define DRI2_SAREA_BLOCK_TYPE(b) ((b) >> 16)
  #define DRI2_SAREA_BLOCK_SIZE(b) ((b) & 0xffff)
  #define DRI2_SAREA_BLOCK_NEXT(p)                              \
@@@ -164,7 -122,7 +164,7 @@@ setup_dri2_sarea(struct drm_device * de
                 struct drm_file *file_priv,
                 drm_i915_init_t * init)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
        int ret;
        unsigned int *p, *end, *next;
  
        while (p < end && DRI2_SAREA_BLOCK_TYPE(*p) != DRI2_SAREA_BLOCK_END) {
                switch (DRI2_SAREA_BLOCK_TYPE(*p)) {
                case DRI2_SAREA_BLOCK_LOCK:
 -                      dev->lock.hw_lock = (void *) (p + 1);
 -                      dev->sigdata.lock = dev->lock.hw_lock;
 +                      dev->primary->master->lock.hw_lock = (void *) (p + 1);
 +                      dev->sigdata.lock = dev->primary->master->lock.hw_lock;
                        break;
                }
                next = DRI2_SAREA_BLOCK_NEXT(p);
@@@ -213,50 -171,71 +213,50 @@@ static int i915_initialize(struct drm_d
                           struct drm_file *file_priv,
                           drm_i915_init_t * init)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -#if defined(I915_HAVE_BUFFER)
 -      int ret;
 -#endif
 -      dev_priv->sarea = drm_getsarea(dev);
 -      if (!dev_priv->sarea) {
 -              DRM_ERROR("can not find sarea!\n");
 -              i915_dma_cleanup(dev);
 -              return -EINVAL;
 -      }
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
  
 -      if (init->mmio_offset != 0)
 -              dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
 -      if (!dev_priv->mmio_map) {
 -              i915_dma_cleanup(dev);
 -              DRM_ERROR("can not find mmio map!\n");
 -              return -EINVAL;
 +      if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
 +              if (init->mmio_offset != 0)
 +                      dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
 +              if (!dev_priv->mmio_map) {
 +                      i915_dma_cleanup(dev);
 +                      DRM_ERROR("can not find mmio map!\n");
 +                      return -EINVAL;
 +              }
        }
  
  #ifdef I915_HAVE_BUFFER
 -      dev_priv->max_validate_buffers = I915_MAX_VALIDATE_BUFFERS;
 -#endif
 -
 -      if (init->sarea_priv_offset)
 -              dev_priv->sarea_priv = (drm_i915_sarea_t *)
 -                      ((u8 *) dev_priv->sarea->handle +
 -                       init->sarea_priv_offset);
 -      else {
 -              /* No sarea_priv for you! */
 -              dev_priv->sarea_priv = NULL;
 +      if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
 +              dev_priv->max_validate_buffers = I915_MAX_VALIDATE_BUFFERS;
        }
 +#endif
  
 -      dev_priv->ring.Start = init->ring_start;
 -      dev_priv->ring.End = init->ring_end;
 -      dev_priv->ring.Size = init->ring_size;
 -      dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
 -
 -      dev_priv->ring.map.offset = init->ring_start;
 -      dev_priv->ring.map.size = init->ring_size;
 -      dev_priv->ring.map.type = 0;
 -      dev_priv->ring.map.flags = 0;
 -      dev_priv->ring.map.mtrr = 0;
 -
 -      drm_core_ioremap(&dev_priv->ring.map, dev);
 -
 -      if (dev_priv->ring.map.handle == NULL) {
 -              i915_dma_cleanup(dev);
 -              DRM_ERROR("can not ioremap virtual address for"
 -                        " ring buffer\n");
 -              return -ENOMEM;
 +      if (init->ring_size != 0) {
 +              dev_priv->ring.Size = init->ring_size;
 +              dev_priv->ring.tail_mask = dev_priv->ring.Size - 1;
 +              dev_priv->ring.map.offset = init->ring_start;
 +              dev_priv->ring.map.size = init->ring_size;
 +              dev_priv->ring.map.type = 0;
 +              dev_priv->ring.map.flags = 0;
 +              dev_priv->ring.map.mtrr = 0;
 +              drm_core_ioremap(&dev_priv->ring.map, dev);
 +
 +              if (dev_priv->ring.map.handle == NULL) {
 +                      i915_dma_cleanup(dev);
 +                      DRM_ERROR("can not ioremap virtual address for"
 +                                " ring buffer\n");
 +                      return -ENOMEM;
 +              }
 +              dev_priv->ring.virtual_start = dev_priv->ring.map.handle;
        }
  
 -      dev_priv->ring.virtual_start = dev_priv->ring.map.handle;
 -
        dev_priv->cpp = init->cpp;
 -
 -      if (dev_priv->sarea_priv)
 -              dev_priv->sarea_priv->pf_current_page = 0;
 +      master_priv->sarea_priv->pf_current_page = 0;
  
        /* We are using separate values as placeholders for mechanisms for
         * private backbuffer/depthbuffer usage.
         */
 -      dev_priv->use_mi_batchbuffer_start = 0;
 -      if (IS_I965G(dev)) /* 965 doesn't support older method */
 -              dev_priv->use_mi_batchbuffer_start = 1;
  
        /* Allow hardware batchbuffers unless told otherwise.
         */
                        DRM_ERROR("Can not allocate hardware status page\n");
                        return -ENOMEM;
                }
 -              dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
 +              dev_priv->hws_vaddr = dev_priv->status_page_dmah->vaddr;
                dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
  
 -              memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
 +              memset(dev_priv->hws_vaddr, 0, PAGE_SIZE);
  
                I915_WRITE(0x02080, dev_priv->dma_status_page);
        }
        DRM_DEBUG("Enabled hardware status page\n");
 +
  #ifdef I915_HAVE_BUFFER
 -      mutex_init(&dev_priv->cmdbuf_mutex);
 -#endif
 -#if defined(I915_HAVE_BUFFER)
 +      if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
 +              mutex_init(&dev_priv->cmdbuf_mutex);
 +      }
 +#ifdef DRI2
        if (init->func == I915_INIT_DMA2) {
 -              ret = setup_dri2_sarea(dev, file_priv, init);
 +              int ret = setup_dri2_sarea(dev, file_priv, init);
                if (ret) {
                        i915_dma_cleanup(dev);
                        DRM_ERROR("could not set up dri2 sarea\n");
                        return ret;
                }
        }
 -#endif
 +#endif /* DRI2 */
 +#endif /* I915_HAVE_BUFFER */
  
        return 0;
  }
  
  static int i915_dma_resume(struct drm_device * dev)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
  
        DRM_DEBUG("\n");
  
 -      if (!dev_priv->sarea) {
 -              DRM_ERROR("can not find sarea!\n");
 -              return -EINVAL;
 -      }
 -
 -      if (!dev_priv->mmio_map) {
 -              DRM_ERROR("can not find mmio map!\n");
 -              return -EINVAL;
 -      }
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              return 0;
  
        if (dev_priv->ring.map.handle == NULL) {
                DRM_ERROR("can not ioremap virtual address for"
        }
  
        /* Program Hardware Status Page */
 -      if (!dev_priv->hw_status_page) {
 +      if (!dev_priv->hws_vaddr) {
                DRM_ERROR("Can not find hardware status page\n");
                return -EINVAL;
        }
 -      DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
 +      DRM_DEBUG("hw status page @ %p\n", dev_priv->hws_vaddr);
  
 -      if (dev_priv->status_gfx_addr != 0)
 -              I915_WRITE(0x02080, dev_priv->status_gfx_addr);
 +      if (dev_priv->hws_agpoffset != 0)
 +              I915_WRITE(HWS_PGA, dev_priv->hws_agpoffset);
        else
 -              I915_WRITE(0x02080, dev_priv->dma_status_page);
 +              I915_WRITE(HWS_PGA, dev_priv->dma_status_page);
        DRM_DEBUG("Enabled hardware status page\n");
  
        return 0;
  static int i915_dma_init(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
  {
 -      drm_i915_init_t *init = data;
 +      struct drm_i915_init *init = data;
        int retcode = 0;
  
        switch (init->func) {
@@@ -439,7 -422,7 +439,7 @@@ static int validate_cmd(int cmd
  static int i915_emit_cmds(struct drm_device *dev, int __user *buffer,
                          int dwords)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
        int i;
        RING_LOCALS;
  
        return 0;
  }
  
 -static int i915_emit_box(struct drm_device * dev,
 -                       struct drm_clip_rect __user * boxes,
 -                       int i, int DR1, int DR4)
 +int i915_emit_box(struct drm_device * dev,
 +                struct drm_clip_rect __user * boxes,
 +                int i, int DR1, int DR4)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_clip_rect box;
        RING_LOCALS;
  
  
  void i915_emit_breadcrumb(struct drm_device *dev)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
        RING_LOCALS;
  
        if (++dev_priv->counter > BREADCRUMB_MASK) {
                 DRM_DEBUG("Breadcrumb counter wrapped around\n");
        }
  
 -      if (dev_priv->sarea_priv)
 -              dev_priv->sarea_priv->last_enqueue = dev_priv->counter;
 +      master_priv->sarea_priv->last_enqueue = dev_priv->counter;
  
        BEGIN_LP_RING(4);
        OUT_RING(MI_STORE_DWORD_INDEX);
 -      OUT_RING(20);
 +      OUT_RING(5 << MI_STORE_DWORD_INDEX_SHIFT);
        OUT_RING(dev_priv->counter);
        OUT_RING(0);
        ADVANCE_LP_RING();
  
  int i915_emit_mi_flush(struct drm_device *dev, uint32_t flush)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
        uint32_t flush_cmd = MI_FLUSH;
        RING_LOCALS;
  
  
  
  static int i915_dispatch_cmdbuffer(struct drm_device * dev,
 -                                 drm_i915_cmdbuffer_t * cmd)
 +                                 struct drm_i915_cmdbuffer * cmd)
  {
  #ifdef I915_HAVE_FENCE
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
  #endif
        int nbox = cmd->num_cliprects;
        int i = 0, count, ret;
  int i915_dispatch_batchbuffer(struct drm_device * dev,
                              drm_i915_batchbuffer_t * batch)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_clip_rect __user *boxes = batch->cliprects;
        int nbox = batch->num_cliprects;
        int i = 0, count;
                                return ret;
                }
  
 -              if (dev_priv->use_mi_batchbuffer_start) {
 +              if (IS_I830(dev) || IS_845G(dev)) {
 +                      BEGIN_LP_RING(4);
 +                      OUT_RING(MI_BATCH_BUFFER);
 +                      OUT_RING(batch->start | MI_BATCH_NON_SECURE);
 +                      OUT_RING(batch->start + batch->used - 4);
 +                      OUT_RING(0);
 +                      ADVANCE_LP_RING();
 +              } else {
                        BEGIN_LP_RING(2);
                        if (IS_I965G(dev)) {
                                OUT_RING(MI_BATCH_BUFFER_START | (2 << 6) | MI_BATCH_NON_SECURE_I965);
                                OUT_RING(batch->start | MI_BATCH_NON_SECURE);
                        }
                        ADVANCE_LP_RING();
 -
 -              } else {
 -                      BEGIN_LP_RING(4);
 -                      OUT_RING(MI_BATCH_BUFFER);
 -                      OUT_RING(batch->start | MI_BATCH_NON_SECURE);
 -                      OUT_RING(batch->start + batch->used - 4);
 -                      OUT_RING(0);
 -                      ADVANCE_LP_RING();
                }
        }
  
  
  static void i915_do_dispatch_flip(struct drm_device * dev, int plane, int sync)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
        u32 num_pages, current_page, next_page, dspbase;
        int shift = 2 * plane, x, y;
        RING_LOCALS;
  
        /* Calculate display base offset */
 -      num_pages = dev_priv->sarea_priv->third_handle ? 3 : 2;
 -      current_page = (dev_priv->sarea_priv->pf_current_page >> shift) & 0x3;
 +      num_pages = master_priv->sarea_priv->third_handle ? 3 : 2;
 +      current_page = (master_priv->sarea_priv->pf_current_page >> shift) & 0x3;
        next_page = (current_page + 1) % num_pages;
  
        switch (next_page) {
        default:
        case 0:
 -              dspbase = dev_priv->sarea_priv->front_offset;
 +              dspbase = master_priv->sarea_priv->front_offset;
                break;
        case 1:
 -              dspbase = dev_priv->sarea_priv->back_offset;
 +              dspbase = master_priv->sarea_priv->back_offset;
                break;
        case 2:
 -              dspbase = dev_priv->sarea_priv->third_offset;
 +              dspbase = master_priv->sarea_priv->third_offset;
                break;
        }
  
        if (plane == 0) {
 -              x = dev_priv->sarea_priv->planeA_x;
 -              y = dev_priv->sarea_priv->planeA_y;
 +              x = master_priv->sarea_priv->planeA_x;
 +              y = master_priv->sarea_priv->planeA_y;
        } else {
 -              x = dev_priv->sarea_priv->planeB_x;
 -              y = dev_priv->sarea_priv->planeB_y;
 +              x = master_priv->sarea_priv->planeB_x;
 +              y = master_priv->sarea_priv->planeB_y;
        }
  
 -      dspbase += (y * dev_priv->sarea_priv->pitch + x) * dev_priv->cpp;
 +      dspbase += (y * master_priv->sarea_priv->pitch + x) * dev_priv->cpp;
  
        DRM_DEBUG("plane=%d current_page=%d dspbase=0x%x\n", plane, current_page,
                  dspbase);
                                       MI_WAIT_FOR_PLANE_A_FLIP)));
        OUT_RING(CMD_OP_DISPLAYBUFFER_INFO | (sync ? 0 : ASYNC_FLIP) |
                 (plane ? DISPLAY_PLANE_B : DISPLAY_PLANE_A));
 -      OUT_RING(dev_priv->sarea_priv->pitch * dev_priv->cpp);
 +      OUT_RING(master_priv->sarea_priv->pitch * dev_priv->cpp);
        OUT_RING(dspbase);
        ADVANCE_LP_RING();
  
 -      dev_priv->sarea_priv->pf_current_page &= ~(0x3 << shift);
 -      dev_priv->sarea_priv->pf_current_page |= next_page << shift;
 +      master_priv->sarea_priv->pf_current_page &= ~(0x3 << shift);
 +      master_priv->sarea_priv->pf_current_page |= next_page << shift;
  }
  
  void i915_dispatch_flip(struct drm_device * dev, int planes, int sync)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
        int i;
  
        DRM_DEBUG("planes=0x%x pfCurrentPage=%d\n",
 -                planes, dev_priv->sarea_priv->pf_current_page);
 +                planes, master_priv->sarea_priv->pf_current_page);
  
        i915_emit_mi_flush(dev, MI_READ_FLUSH | MI_EXE_FLUSH);
  
  
  int i915_quiescent(struct drm_device *dev)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      int ret;
  
        i915_kernel_lost_context(dev);
 -      return i915_wait_ring(dev, dev_priv->ring.Size - 8, __FUNCTION__);
 +      ret = i915_wait_ring(dev, dev_priv->ring.Size - 8, __FUNCTION__);
 +      if (ret)
 +      {
 +              i915_kernel_lost_context (dev);
 +              DRM_ERROR ("not quiescent head %08x tail %08x space %08x\n",
 +                         dev_priv->ring.head,
 +                         dev_priv->ring.tail,
 +                         dev_priv->ring.space);
 +      }
 +      return ret;
  }
  
  static int i915_flush_ioctl(struct drm_device *dev, void *data,
  static int i915_batchbuffer(struct drm_device *dev, void *data,
                            struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
 +      struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
        drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
 -          dev_priv->sarea_priv;
 +          master_priv->sarea_priv;
        drm_i915_batchbuffer_t *batch = data;
        int ret;
  
  static int i915_cmdbuffer(struct drm_device *dev, void *data,
                          struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 -      drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
 -          dev_priv->sarea_priv;
 -      drm_i915_cmdbuffer_t *cmdbuf = data;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
 +      struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
 +      struct drm_i915_sarea *sarea_priv = (struct drm_i915_sarea *)
 +              master_priv->sarea_priv;
 +      struct drm_i915_cmdbuffer *cmdbuf = data;
        int ret;
  
        DRM_DEBUG("i915 cmdbuffer, buf %p sz %d cliprects %d\n",
  #define DRM_DEBUG_RELOCATION  0
  #endif
  
 -static int i915_do_cleanup_pageflip(struct drm_device * dev)
 +int i915_do_cleanup_pageflip(struct drm_device * dev)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -      int i, planes, num_pages = dev_priv->sarea_priv->third_handle ? 3 : 2;
 +      struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
 +      int i, planes, num_pages;
  
        DRM_DEBUG("\n");
 -
 -      for (i = 0, planes = 0; i < 2; i++)
 -              if (dev_priv->sarea_priv->pf_current_page & (0x3 << (2 * i))) {
 -                      dev_priv->sarea_priv->pf_current_page =
 -                              (dev_priv->sarea_priv->pf_current_page &
 +      num_pages = master_priv->sarea_priv->third_handle ? 3 : 2;
 +      for (i = 0, planes = 0; i < 2; i++) {
 +              if (master_priv->sarea_priv->pf_current_page & (0x3 << (2 * i))) {
 +                      master_priv->sarea_priv->pf_current_page =
 +                              (master_priv->sarea_priv->pf_current_page &
                                 ~(0x3 << (2 * i))) | ((num_pages - 1) << (2 * i));
  
                        planes |= 1 << i;
                }
 +      }
  
        if (planes)
                i915_dispatch_flip(dev, planes, 0);
  
  static int i915_flip_bufs(struct drm_device *dev, void *data, struct drm_file *file_priv)
  {
 -      drm_i915_flip_t *param = data;
 +      struct drm_i915_flip *param = data;
  
        DRM_DEBUG("\n");
  
  static int i915_getparam(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -      drm_i915_getparam_t *param = data;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_getparam *param = data;
        int value;
  
        if (!dev_priv) {
  
        switch (param->param) {
        case I915_PARAM_IRQ_ACTIVE:
 -              value = dev->irq ? 1 : 0;
 +              value = dev->irq_enabled ? 1 : 0;
                break;
        case I915_PARAM_ALLOW_BATCHBUFFER:
                value = dev_priv->allow_batchbuffer ? 1 : 0;
  static int i915_setparam(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
        drm_i915_setparam_t *param = data;
  
        if (!dev_priv) {
  
        switch (param->param) {
        case I915_SETPARAM_USE_MI_BATCHBUFFER_START:
 -              if (!IS_I965G(dev))
 -                      dev_priv->use_mi_batchbuffer_start = param->value;
                break;
        case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY:
                dev_priv->tex_lru_log_granularity = param->value;
@@@ -942,26 -913,6 +942,26 @@@ drm_i915_mmio_entry_t mmio_table[] = 
                I915_MMIO_MAY_READ|I915_MMIO_MAY_WRITE,
                0x2350,
                8
 +      },
 +      [MMIO_REGS_DOVSTA] = {
 +              I915_MMIO_MAY_READ,
 +              0x30008,
 +              1
 +      },
 +      [MMIO_REGS_GAMMA] = {
 +              I915_MMIO_MAY_READ|I915_MMIO_MAY_WRITE,
 +              0x30010,
 +              6
 +      },
 +      [MMIO_REGS_FENCE] = {
 +              I915_MMIO_MAY_READ|I915_MMIO_MAY_WRITE,
 +              0x2000,
 +              8
 +      },
 +      [MMIO_REGS_FENCE_NEW] = {
 +              I915_MMIO_MAY_READ|I915_MMIO_MAY_WRITE,
 +              0x3000,
 +              16
        }
  };
  
@@@ -971,8 -922,8 +971,8 @@@ static int i915_mmio(struct drm_device 
                     struct drm_file *file_priv)
  {
        uint32_t buf[8];
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -      drm_i915_mmio_entry_t *e;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      drm_i915_mmio_entry_t *e;        
        drm_i915_mmio_t *mmio = data;
        void __iomem *base;
        int i;
  static int i915_set_status_page(struct drm_device *dev, void *data,
                                struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
        drm_i915_hws_addr_t *hws = data;
  
        if (!I915_NEED_GFX_HWS(dev))
                DRM_ERROR("called with no initialization\n");
                return -EINVAL;
        }
 +
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              return 0;
 +
        DRM_DEBUG("set status page addr 0x%08x\n", (u32)hws->addr);
  
 -      dev_priv->status_gfx_addr = hws->addr & (0x1ffff<<12);
 +      dev_priv->hws_agpoffset = hws->addr & (0x1ffff<<12);
  
        dev_priv->hws_map.offset = dev->agp->base + hws->addr;
        dev_priv->hws_map.size = 4*1024;
        drm_core_ioremap(&dev_priv->hws_map, dev);
        if (dev_priv->hws_map.handle == NULL) {
                i915_dma_cleanup(dev);
 -              dev_priv->status_gfx_addr = 0;
 +              dev_priv->hws_agpoffset = 0;
                DRM_ERROR("can not ioremap virtual address for"
                                " G33 hw status page\n");
                return -ENOMEM;
        }
 -      dev_priv->hw_status_page = dev_priv->hws_map.handle;
 -
 -      memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
 -      I915_WRITE(HWS_PGA, dev_priv->status_gfx_addr);
 -      DRM_DEBUG("load hws 0x2080 with gfx mem 0x%x\n",
 -                      dev_priv->status_gfx_addr);
 -      DRM_DEBUG("load hws at %p\n", dev_priv->hw_status_page);
 -      return 0;
 -}
 -
 -int i915_driver_load(struct drm_device *dev, unsigned long flags)
 -{
 -      struct drm_i915_private *dev_priv;
 -      unsigned long base, size;
 -      int ret = 0, num_pipes = 2, mmio_bar = IS_I9XX(dev) ? 0 : 1;
 -
 -      /* i915 has 4 more counters */
 -      dev->counters += 4;
 -      dev->types[6] = _DRM_STAT_IRQ;
 -      dev->types[7] = _DRM_STAT_PRIMARY;
 -      dev->types[8] = _DRM_STAT_SECONDARY;
 -      dev->types[9] = _DRM_STAT_DMA;
 -
 -      dev_priv = drm_alloc(sizeof(drm_i915_private_t), DRM_MEM_DRIVER);
 -      if (dev_priv == NULL)
 -              return -ENOMEM;
 -
 -      memset(dev_priv, 0, sizeof(drm_i915_private_t));
 -      dev->dev_private = (void *)dev_priv;
 +      dev_priv->hws_vaddr = dev_priv->hws_map.handle;
  
 -      /* Add register map (needed for suspend/resume) */
 -      base = drm_get_resource_start(dev, mmio_bar);
 -      size = drm_get_resource_len(dev, mmio_bar);
 +      memset(dev_priv->hws_vaddr, 0, PAGE_SIZE);
 +      I915_WRITE(HWS_PGA, dev_priv->hws_agpoffset);
 +      DRM_DEBUG("load hws at %p\n", dev_priv->hws_vaddr);
  
 -      ret = drm_addmap(dev, base, size, _DRM_REGISTERS,
 -              _DRM_KERNEL | _DRM_DRIVER, &dev_priv->mmio_map);
 -
 -#ifdef __linux__
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
 -      intel_init_chipset_flush_compat(dev);
 -#endif
 -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
 -      intel_opregion_init(dev);
 -#endif
 -#endif
 -
 -      I915_WRITE16(HWSTAM, 0xeffe);
 -      I915_WRITE16(IMR, 0x0);
 -      I915_WRITE16(IER, 0x0);
 -
 -      DRM_SPININIT(&dev_priv->swaps_lock, "swap");
 -      INIT_LIST_HEAD(&dev_priv->vbl_swaps.head);
 -      dev_priv->swaps_pending = 0;
 -
 -      DRM_SPININIT(&dev_priv->user_irq_lock, "userirq");
 -      dev_priv->user_irq_refcount = 0;
 -      dev_priv->irq_enable_reg = 0;
 -
 -      ret = drm_vblank_init(dev, num_pipes);
 -      if (ret)
 -              return ret;
 -
 -      dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
 -      dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
 -
 -      i915_enable_interrupt(dev);
 -      DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
 -
 -      /*
 -       * Initialize the hardware status page IRQ location.
 -       */
 -
 -      I915_WRITE(INSTPM, (1 << 5) | (1 << 21));
 -
 -      return ret;
 -}
 -
 -int i915_driver_unload(struct drm_device *dev)
 -{
 -      struct drm_i915_private *dev_priv = dev->dev_private;
 -      u32 temp;
 -
 -      if (dev_priv) {
 -              dev_priv->vblank_pipe = 0;
 -
 -              dev_priv->irq_enabled = 0;
 -              I915_WRITE(HWSTAM, 0xffffffff);
 -              I915_WRITE(IMR, 0xffffffff);
 -              I915_WRITE(IER, 0x0);
 -
 -              temp = I915_READ(PIPEASTAT);
 -              I915_WRITE(PIPEASTAT, temp);
 -              temp = I915_READ(PIPEBSTAT);
 -              I915_WRITE(PIPEBSTAT, temp);
 -              temp = I915_READ(IIR);
 -              I915_WRITE(IIR, temp);
 -      }
 -
 -      if (dev_priv->mmio_map)
 -              drm_rmmap(dev, dev_priv->mmio_map);
 -
 -#ifdef __linux__
 -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
 -      intel_opregion_free(dev);
 -#endif
 -#endif
 -
 -      drm_free(dev->dev_private, sizeof(drm_i915_private_t),
 -               DRM_MEM_DRIVER);
 -#ifdef __linux__
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
 -      intel_fini_chipset_flush_compat(dev);
 -#endif
 -#endif
        return 0;
  }
  
 -void i915_driver_lastclose(struct drm_device * dev)
 -{
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -
 -      /* agp off can use this to get called before dev_priv */
 -      if (!dev_priv)
 -              return;
 -
 -#ifdef I915_HAVE_BUFFER
 -      if (dev_priv->val_bufs) {
 -              vfree(dev_priv->val_bufs);
 -              dev_priv->val_bufs = NULL;
 -      }
 -#endif
 -
 -      if (drm_getsarea(dev) && dev_priv->sarea_priv)
 -              i915_do_cleanup_pageflip(dev);
 -      if (dev_priv->agp_heap)
 -              i915_mem_takedown(&(dev_priv->agp_heap));
 -#if defined(I915_HAVE_BUFFER)
 -      if (dev_priv->sarea_kmap.virtual) {
 -              drm_bo_kunmap(&dev_priv->sarea_kmap);
 -              dev_priv->sarea_kmap.virtual = NULL;
 -              dev->lock.hw_lock = NULL;
 -              dev->sigdata.lock = NULL;
 -      }
 -
 -      if (dev_priv->sarea_bo) {
 -              mutex_lock(&dev->struct_mutex);
 -              drm_bo_usage_deref_locked(&dev_priv->sarea_bo);
 -              mutex_unlock(&dev->struct_mutex);
 -              dev_priv->sarea_bo = NULL;
 -      }
 -#endif
 -      i915_dma_cleanup(dev);
 -}
 -
 -void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
 -{
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -      i915_mem_release(dev, file_priv, dev_priv->agp_heap);
 -}
 -
  struct drm_ioctl_desc i915_ioctls[] = {
 -      DRM_IOCTL_DEF(DRM_I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER),
        DRM_IOCTL_DEF(DRM_I915_FLUSH, i915_flush_ioctl, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_I915_FLIP, i915_flip_bufs, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_I915_BATCHBUFFER, i915_batchbuffer, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_I915_IRQ_EMIT, i915_irq_emit, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_I915_IRQ_WAIT, i915_irq_wait, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_I915_GETPARAM, i915_getparam, DRM_AUTH),
 -      DRM_IOCTL_DEF(DRM_I915_SETPARAM, i915_setparam, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_I915_SETPARAM, i915_setparam, DRM_AUTH|DRM_MASTER),
        DRM_IOCTL_DEF(DRM_I915_ALLOC, i915_mem_alloc, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_I915_FREE, i915_mem_free, DRM_AUTH),
        DRM_IOCTL_DEF(DRM_I915_INIT_HEAP, i915_mem_init_heap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
  #ifdef I915_HAVE_BUFFER
        DRM_IOCTL_DEF(DRM_I915_EXECBUFFER, i915_execbuffer, DRM_AUTH),
  #endif
 +      DRM_IOCTL_DEF(DRM_I915_GEM_INIT, i915_gem_init_ioctl, DRM_AUTH),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_EXECBUFFER, i915_gem_execbuffer, DRM_AUTH),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_PIN, i915_gem_pin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_UNPIN, i915_gem_unpin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_BUSY, i915_gem_busy_ioctl, DRM_AUTH),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_THROTTLE, i915_gem_throttle_ioctl, DRM_AUTH),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_ENTERVT, i915_gem_entervt_ioctl, DRM_AUTH),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_LEAVEVT, i915_gem_leavevt_ioctl, DRM_AUTH),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_CREATE, i915_gem_create_ioctl, 0),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_PREAD, i915_gem_pread_ioctl, 0),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_PWRITE, i915_gem_pwrite_ioctl, 0),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_MMAP, i915_gem_mmap_ioctl, 0),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_SET_DOMAIN, i915_gem_set_domain_ioctl, 0),
 +      DRM_IOCTL_DEF(DRM_I915_GEM_SW_FINISH, i915_gem_sw_finish_ioctl, 0),
  };
  
  int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);
@@@ -1114,3 -1199,10 +1115,3 @@@ int i915_driver_device_is_agp(struct dr
        return 1;
  }
  
 -int i915_driver_firstopen(struct drm_device *dev)
 -{
 -#ifdef I915_HAVE_BUFFER
 -      drm_bo_driver_init(dev);
 -#endif
 -      return 0;
 -}
diff --combined shared-core/i915_drv.h
  /* General customization:
   */
  
 +#include "intel_bios.h"
 +
  #define DRIVER_AUTHOR         "Tungsten Graphics, Inc."
  
  #define DRIVER_NAME           "i915"
  #define DRIVER_DESC           "Intel Graphics"
 -#define DRIVER_DATE           "20080312"
 +#define DRIVER_DATE           "20080611"
  
  #if defined(__linux__)
  #define I915_HAVE_FENCE
@@@ -63,7 -61,7 +63,7 @@@
   */
  #define DRIVER_MAJOR          1
  #if defined(I915_HAVE_FENCE) && defined(I915_HAVE_BUFFER)
 -#define DRIVER_MINOR          13
 +#define DRIVER_MINOR          14
  #else
  #define DRIVER_MINOR          6
  #endif
@@@ -79,16 -77,17 +79,16 @@@ enum pipe 
  struct drm_i915_validate_buffer;
  #endif
  
 -typedef struct _drm_i915_ring_buffer {
 +struct drm_i915_ring_buffer {
        int tail_mask;
 -      unsigned long Start;
 -      unsigned long End;
        unsigned long Size;
        u8 *virtual_start;
        int head;
        int tail;
        int space;
        drm_local_map_t map;
 -} drm_i915_ring_buffer_t;
 +      struct drm_gem_object *ring_obj;
 +};
  
  struct mem_block {
        struct mem_block *next;
        struct drm_file *file_priv; /* NULL: free, -1: heap, other: real files */
  };
  
 -typedef struct _drm_i915_vbl_swap {
 +struct drm_i915_vbl_swap {
        struct list_head head;
        drm_drawable_t drw_id;
        unsigned int plane;
        unsigned int sequence;
        int flip;
 -} drm_i915_vbl_swap_t;
 +      struct drm_minor *minor;
 +};
 +
+ #ifdef __linux__
+ struct opregion_header;
+ struct opregion_acpi;
+ struct opregion_swsci;
+ struct opregion_asle;
+ struct intel_opregion {
+       struct opregion_header *header;
+       struct opregion_acpi *acpi;
+       struct opregion_swsci *swsci;
+       struct opregion_asle *asle;
+       int enabled;
+ };
+ #endif
 -typedef struct drm_i915_private {
 +struct drm_i915_master_private {
        drm_local_map_t *sarea;
 +      struct drm_i915_sarea *sarea_priv;
 +};
 +      
 +struct drm_i915_private {
 +        struct drm_device *dev;
 +
        drm_local_map_t *mmio_map;
  
 -      drm_i915_sarea_t *sarea_priv;
 -      drm_i915_ring_buffer_t ring;
 +      unsigned long mmiobase;
 +      unsigned long mmiolen;
  
 -      drm_dma_handle_t *status_page_dmah;
 -      void *hw_status_page;
 +      struct drm_i915_ring_buffer ring;
 +
 +      struct drm_dma_handle *status_page_dmah;
        dma_addr_t dma_status_page;
        uint32_t counter;
 -      unsigned int status_gfx_addr;
 +      uint32_t hws_agpoffset;
        drm_local_map_t hws_map;
 +      void *hws_vaddr;
 +      struct drm_memrange_node *hws;
  
        unsigned int cpp;
 -      int use_mi_batchbuffer_start;
  
        wait_queue_head_t irq_queue;
        atomic_t irq_received;
 -      atomic_t irq_emitted;
  
        int tex_lru_log_granularity;
        int allow_batchbuffer;
        DRM_SPINTYPE user_irq_lock;
        int user_irq_refcount;
        int fence_irq_on;
 -      uint32_t irq_enable_reg;
 +      uint32_t irq_mask_reg;
        int irq_enabled;
 +      struct workqueue_struct *wq;
 +
 +      bool cursor_needs_physical;
 +
 +      struct drm_memrange vram;
  
  #ifdef I915_HAVE_FENCE
        uint32_t flush_sequence;
        void *agp_iomap;
        unsigned int max_validate_buffers;
        struct mutex cmdbuf_mutex;
 +      u32 stolen_base;
        struct drm_i915_validate_buffer *val_bufs;
  #endif
  
        DRM_SPINTYPE swaps_lock;
 -      drm_i915_vbl_swap_t vbl_swaps;
 +      struct drm_i915_vbl_swap vbl_swaps;
        unsigned int swaps_pending;
 -#if defined(I915_HAVE_BUFFER)
 +
 +      /* LVDS info */
 +      int backlight_duty_cycle;  /* restore backlight to this value */
 +      bool panel_wants_dither;
 +      struct drm_display_mode *panel_fixed_mode;
 +      struct drm_display_mode *vbt_mode; /* if any */
 +
 +#if defined(I915_HAVE_BUFFER) && defined(DRI2)
        /* DRI2 sarea */
 -      struct drm_buffer_object *sarea_bo;
 -      struct drm_bo_kmap_obj sarea_kmap;
 +      struct drm_gem_object *sarea_object;
 +        struct drm_bo_kmap_obj sarea_kmap;
  #endif
  
 +      /* Feature bits from the VBIOS */
 +      int int_tv_support:1;
 +      int lvds_dither:1;
 +      int lvds_vbt:1;
 +      int int_crt_support:1;
 +
 +      struct {
 +              struct drm_memrange gtt_space;
 +
 +              /**
 +               * List of objects currently involved in rendering from the
 +               * ringbuffer.
 +               *
 +               * A reference is held on the buffer while on this list.
 +               */
 +              struct list_head active_list;
 +
 +              /**
 +               * List of objects which are not in the ringbuffer but which
 +               * still have a write_domain which needs to be flushed before
 +               * unbinding.
 +               *
 +               * A reference is held on the buffer while on this list.
 +               */
 +              struct list_head flushing_list;
 +
 +              /**
 +               * LRU list of objects which are not in the ringbuffer and
 +               * are ready to unbind, but are still in the GTT.
 +               *
 +               * A reference is not held on the buffer while on this list,
 +               * as merely being GTT-bound shouldn't prevent its being
 +               * freed, and we'll pull it off the list in the free path.
 +               */
 +              struct list_head inactive_list;
 +
 +              /**
 +               * List of breadcrumbs associated with GPU requests currently
 +               * outstanding.
 +               */
 +              struct list_head request_list;
 +
 +              /**
 +               * We leave the user IRQ off as much as possible,
 +               * but this means that requests will finish and never
 +               * be retired once the system goes idle. Set a timer to
 +               * fire periodically while the ring is running. When it
 +               * fires, go retire requests.
 +               */
 +              struct delayed_work retire_work;
 +              
 +              uint32_t next_gem_seqno;
 +
 +              /**
 +               * Waiting sequence number, if any
 +               */
 +              uint32_t waiting_gem_seqno;
 +      
 +              /**
 +               * Last seq seen at irq time
 +               */
 +              uint32_t irq_gem_seqno;
 +
 +              /**
 +               * Flag if the X Server, and thus DRM, is not currently in
 +               * control of the device.
 +               *
 +               * This is set between LeaveVT and EnterVT.  It needs to be
 +               * replaced with a semaphore.  It also needs to be
 +               * transitioned away from for kernel modesetting.
 +               */
 +              int suspended;
 +
 +              /**
 +               * Flag if the hardware appears to be wedged.
 +               *
 +               * This is set when attempts to idle the device timeout.
 +               * It prevents command submission from occuring and makes
 +               * every pending request fail
 +               */
 +              int wedged;
 +      } mm;
 +
 +      struct work_struct user_interrupt_task;
 +
+ #ifdef __linux__
+       struct intel_opregion opregion;
+ #endif
        /* Register state */
        u8 saveLBB;
        u32 saveDSPACNTR;
        u8 saveDACMASK;
        u8 saveDACDATA[256*3]; /* 256 3-byte colors */
        u8 saveCR[37];
 -} drm_i915_private_t;
 +};
 +
 +struct drm_i915_file_private {
 +      struct {
 +              uint32_t last_gem_seqno;
 +              uint32_t last_gem_throttle_seqno;
 +      } mm;
 +};
  
  enum intel_chip_family {
        CHIP_I8XX = 0x01,
        CHIP_I965 = 0x08,
  };
  
 +/** driver private structure attached to each drm_gem_object */
 +struct drm_i915_gem_object {
 +      struct drm_gem_object *obj;
 +
 +      /** Current space allocated to this object in the GTT, if any. */
 +      struct drm_memrange_node *gtt_space;
 +
 +      /** This object's place on the active/flushing/inactive lists */
 +      struct list_head list;
 +
 +      /**
 +       * This is set if the object is on the active or flushing lists
 +       * (has pending rendering), and is not set if it's on inactive (ready
 +       * to be unbound).
 +       */
 +      int active;
 +
 +      /**
 +       * This is set if the object has been written to since last bound
 +       * to the GTT
 +       */
 +      int dirty;
 +
 +      /** AGP memory structure for our GTT binding. */
 +      DRM_AGP_MEM *agp_mem;
 +
 +      struct page **page_list;
 +
 +      /**
 +       * Current offset of the object in GTT space.
 +       *
 +       * This is the same as gtt_space->start
 +       */
 +      uint32_t gtt_offset;
 +
 +      /** Boolean whether this object has a valid gtt offset. */
 +      int gtt_bound;
 +
 +      /** How many users have pinned this object in GTT space */
 +      int pin_count;
 +
 +      /** Breadcrumb of last rendering to the buffer. */
 +      uint32_t last_rendering_seqno;
 +};
 +
 +/**
 + * Request queue structure.
 + *
 + * The request queue allows us to note sequence numbers that have been emitted
 + * and may be associated with active buffers to be retired.
 + *
 + * By keeping this list, we can avoid having to do questionable
 + * sequence-number comparisons on buffer last_rendering_seqnos, and associate
 + * an emission time with seqnos for tracking how far ahead of the GPU we are.
 + */
 +struct drm_i915_gem_request {
 +      /** GEM sequence number associated with this request. */
 +      uint32_t seqno;
 +
 +      /** Time at which this request was emitted, in jiffies. */
 +      unsigned long emitted_jiffies;
 +
 +      /** Cache domains that were flushed at the start of the request. */
 +      uint32_t flush_domains;
 +
 +      struct list_head list;
 +};
 +
  extern struct drm_ioctl_desc i915_ioctls[];
  extern int i915_max_ioctl;
  
 +extern int i915_master_create(struct drm_device *dev, struct drm_master *master);
 +extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master);
                                /* i915_dma.c */
  extern void i915_kernel_lost_context(struct drm_device * dev);
  extern int i915_driver_load(struct drm_device *, unsigned long flags);
 -extern int i915_driver_unload(struct drm_device *);
 +extern int i915_driver_unload(struct drm_device *dev);
  extern void i915_driver_lastclose(struct drm_device * dev);
 +extern int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv);
  extern void i915_driver_preclose(struct drm_device *dev,
                                 struct drm_file *file_priv);
 +extern void i915_driver_postclose(struct drm_device *dev,
 +                                struct drm_file *file_priv);
  extern int i915_driver_device_is_agp(struct drm_device * dev);
  extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
                              unsigned long arg);
@@@ -460,16 -293,10 +481,16 @@@ extern void i915_emit_breadcrumb(struc
  extern void i915_dispatch_flip(struct drm_device * dev, int pipes, int sync);
  extern int i915_emit_mi_flush(struct drm_device *dev, uint32_t flush);
  extern int i915_driver_firstopen(struct drm_device *dev);
 +extern int i915_do_cleanup_pageflip(struct drm_device *dev);
 +extern int i915_dma_cleanup(struct drm_device *dev);
  extern int i915_dispatch_batchbuffer(struct drm_device * dev,
                                     drm_i915_batchbuffer_t * batch);
  extern int i915_quiescent(struct drm_device *dev);
  
 +int i915_emit_box(struct drm_device * dev,
 +                struct drm_clip_rect __user * boxes,
 +                int i, int DR1, int DR4);
 +
  /* i915_irq.c */
  extern int i915_irq_emit(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
@@@ -480,20 -307,19 +501,21 @@@ extern irqreturn_t i915_driver_irq_hand
  extern void i915_driver_irq_preinstall(struct drm_device * dev);
  extern int i915_driver_irq_postinstall(struct drm_device * dev);
  extern void i915_driver_irq_uninstall(struct drm_device * dev);
+ extern void i915_enable_interrupt(struct drm_device *dev);
  extern int i915_vblank_pipe_set(struct drm_device *dev, void *data,
                                struct drm_file *file_priv);
  extern int i915_vblank_pipe_get(struct drm_device *dev, void *data,
                                struct drm_file *file_priv);
  extern int i915_emit_irq(struct drm_device * dev);
 +extern void i915_enable_interrupt (struct drm_device *dev);
 +extern int i915_wait_irq(struct drm_device * dev, int irq_nr);
  extern int i915_enable_vblank(struct drm_device *dev, int crtc);
  extern void i915_disable_vblank(struct drm_device *dev, int crtc);
  extern u32 i915_get_vblank_counter(struct drm_device *dev, int crtc);
  extern int i915_vblank_swap(struct drm_device *dev, void *data,
                            struct drm_file *file_priv);
 -extern void i915_user_irq_on(drm_i915_private_t *dev_priv);
 -extern void i915_user_irq_off(drm_i915_private_t *dev_priv);
 +extern void i915_user_irq_on(struct drm_device *dev);
 +extern void i915_user_irq_off(struct drm_device *dev);
  
  /* i915_mem.c */
  extern int i915_mem_alloc(struct drm_device *dev, void *data,
@@@ -508,6 -334,11 +530,11 @@@ extern void i915_mem_takedown(struct me
  extern void i915_mem_release(struct drm_device * dev,
                             struct drm_file *file_priv,
                             struct mem_block *heap);
+ /* i915_suspend.c */
+ extern int i915_save_state(struct drm_device *dev);
+ extern int i915_restore_state(struct drm_device *dev);
  #ifdef I915_HAVE_FENCE
  /* i915_fence.c */
  extern void i915_fence_handler(struct drm_device *dev);
@@@ -515,7 -346,7 +542,7 @@@ extern void i915_invalidate_reported_se
  
  #endif
  
 -#ifdef I915_HAVE_BUFFER
 +#if defined(I915_HAVE_BUFFER) && defined(I915_TTM)
  /* i915_buffer.c */
  extern struct drm_ttm_backend *i915_create_ttm_backend_entry(struct drm_device *dev);
  extern int i915_fence_type(struct drm_buffer_object *bo, uint32_t *fclass,
@@@ -527,96 -358,49 +554,112 @@@ extern uint64_t i915_evict_flags(struc
  extern int i915_move(struct drm_buffer_object *bo, int evict,
                int no_wait, struct drm_bo_mem_reg *new_mem);
  void i915_flush_ttm(struct drm_ttm *ttm);
 +#endif /* ttm */
 +#ifdef I915_HAVE_BUFFER
  /* i915_execbuf.c */
  int i915_execbuffer(struct drm_device *dev, void *data,
                                   struct drm_file *file_priv);
 -
 +/* i915_gem.c */
 +int i915_gem_init_ioctl(struct drm_device *dev, void *data,
 +                      struct drm_file *file_priv);
 +int i915_gem_create_ioctl(struct drm_device *dev, void *data,
 +                        struct drm_file *file_priv);
 +int i915_gem_pread_ioctl(struct drm_device *dev, void *data,
 +                       struct drm_file *file_priv);
 +int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
 +                        struct drm_file *file_priv);
 +int i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
 +                      struct drm_file *file_priv);
 +int i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
 +                            struct drm_file *file_priv);
 +int i915_gem_sw_finish_ioctl(struct drm_device *dev, void *data,
 +                           struct drm_file *file_priv);
 +int i915_gem_execbuffer(struct drm_device *dev, void *data,
 +                      struct drm_file *file_priv);
 +int i915_gem_pin_ioctl(struct drm_device *dev, void *data,
 +                     struct drm_file *file_priv);
 +int i915_gem_unpin_ioctl(struct drm_device *dev, void *data,
 +                       struct drm_file *file_priv);
 +int i915_gem_busy_ioctl(struct drm_device *dev, void *data,
 +                      struct drm_file *file_priv);
 +int i915_gem_throttle_ioctl(struct drm_device *dev, void *data,
 +                          struct drm_file *file_priv);
 +int i915_gem_entervt_ioctl(struct drm_device *dev, void *data,
 +                         struct drm_file *file_priv);
 +int i915_gem_leavevt_ioctl(struct drm_device *dev, void *data,
 +                         struct drm_file *file_priv);
 +int i915_gem_proc_init(struct drm_minor *minor);
 +void i915_gem_proc_cleanup(struct drm_minor *minor);
 +int i915_gem_init_object(struct drm_gem_object *obj);
 +void i915_gem_free_object(struct drm_gem_object *obj);
 +int i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment);
 +void i915_gem_object_unpin(struct drm_gem_object *obj);
 +void i915_gem_lastclose(struct drm_device *dev);
 +uint32_t i915_get_gem_seqno(struct drm_device *dev);
 +void i915_gem_retire_requests(struct drm_device *dev);
 +int i915_gem_init_ringbuffer(struct drm_device *dev);
 +void i915_gem_cleanup_ringbuffer(struct drm_device *dev);
 +int i915_gem_do_init(struct drm_device *dev, unsigned long start,
 +                   unsigned long end);
 +void i915_gem_retire_work_handler(struct work_struct *work);
  #endif
  
 +extern unsigned int i915_fbpercrtc;
 +
  #ifdef __linux__
+ /* i915_opregion.c */
+ extern int intel_opregion_init(struct drm_device *dev);
+ extern void intel_opregion_free(struct drm_device *dev);
+ extern void opregion_asle_intr(struct drm_device *dev);
+ extern void opregion_enable_asle(struct drm_device *dev);
+ #endif
+ #ifdef __linux__
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
  extern void intel_init_chipset_flush_compat(struct drm_device *dev);
  extern void intel_fini_chipset_flush_compat(struct drm_device *dev);
  #endif
  #endif
  
 +
 +/* modesetting */
 +extern void intel_modeset_init(struct drm_device *dev);
 +extern void intel_modeset_cleanup(struct drm_device *dev);
 +
 +
  #define I915_READ(reg)          DRM_READ32(dev_priv->mmio_map, (reg))
  #define I915_WRITE(reg,val)     DRM_WRITE32(dev_priv->mmio_map, (reg), (val))
  #define I915_READ16(reg)      DRM_READ16(dev_priv->mmio_map, (reg))
  #define I915_WRITE16(reg,val) DRM_WRITE16(dev_priv->mmio_map, (reg), (val))
+ #define I915_READ8(reg)               DRM_READ8(dev_priv->mmio_map, (reg))
+ #define I915_WRITE8(reg,val)  DRM_WRITE8(dev_priv->mmio_map, (reg), (val))
+ #if defined(__FreeBSD__)
+ typedef boolean_t bool;
+ #endif
  
  #define I915_VERBOSE 0
 +#define I915_RING_VALIDATE 0
 +
 +#define PRIMARY_RINGBUFFER_SIZE         (128*1024)
  
+ #define PRIMARY_RINGBUFFER_SIZE         (128*1024)
  #define RING_LOCALS   unsigned int outring, ringmask, outcount; \
                        volatile char *virt;
  
 +#if I915_RING_VALIDATE
 +void i915_ring_validate(struct drm_device *dev, const char *func, int line);
 +#define I915_RING_DO_VALIDATE(dev) i915_ring_validate(dev, __FUNCTION__, __LINE__)
 +#else
 +#define I915_RING_DO_VALIDATE(dev)
 +#endif
 +
  #define BEGIN_LP_RING(n) do {                         \
        if (I915_VERBOSE)                               \
                DRM_DEBUG("BEGIN_LP_RING(%d)\n",        \
                                 (n));                  \
 +      I915_RING_DO_VALIDATE(dev);                     \
        if (dev_priv->ring.space < (n)*4)                      \
                i915_wait_ring(dev, (n)*4, __FUNCTION__);      \
        outcount = 0;                                   \
  
  #define ADVANCE_LP_RING() do {                                                \
        if (I915_VERBOSE) DRM_DEBUG("ADVANCE_LP_RING %x\n", outring);   \
 +      I915_RING_DO_VALIDATE(dev);                                     \
        dev_priv->ring.tail = outring;                                  \
        dev_priv->ring.space -= outcount * 4;                           \
        I915_WRITE(PRB0_TAIL, outring);                 \
@@@ -740,9 -523,9 +783,10 @@@ extern int i915_wait_ring(struct drm_de
  #define MI_BATCH_BUFFER_END   MI_INSTR(0x0a, 0)
  #define MI_REPORT_HEAD                MI_INSTR(0x07, 0)
  #define MI_LOAD_SCAN_LINES_INCL MI_INSTR(0x12, 0)
- #define MI_STORE_DWORD_IMM    MI_INSTR(0x20, 1) /* used to have 1<<22? */
+ #define MI_STORE_DWORD_IMM    MI_INSTR(0x20, 1)
+ #define   MI_MEM_VIRTUAL      (1 << 22) /* 965+ only */
  #define MI_STORE_DWORD_INDEX  MI_INSTR(0x21, 1)
 +#define   MI_STORE_DWORD_INDEX_SHIFT 2
  #define MI_LOAD_REGISTER_IMM  MI_INSTR(0x22, 1)
  #define MI_BATCH_BUFFER               MI_INSTR(0x30, 1)
  #define   MI_BATCH_NON_SECURE (1)
  #define BREADCRUMB_BITS 31
  #define BREADCRUMB_MASK ((1U << BREADCRUMB_BITS) - 1)
  
 -#define READ_BREADCRUMB(dev_priv)  (((volatile u32*)(dev_priv->hw_status_page))[5])
 +#define READ_BREADCRUMB(dev_priv)  (((volatile u32*)(dev_priv->hws_vaddr))[5])
  
  /**
   * Reads a dword out of the status page, which is written to from the command
   *
   * The area from dword 0x10 to 0x3ff is available for driver usage.
   */
 -#define READ_HWSP(dev_priv, reg)  (((volatile u32*)(dev_priv->hw_status_page))[reg])
 +#define READ_HWSP(dev_priv, reg)  (((volatile u32*)(dev_priv->hws_vaddr))[reg])
  #define I915_GEM_HWS_INDEX            0x10
  
  /*
   */
  #define GFX_INSTR(opcode, flags) ((0x3 << 29) | ((opcode) << 24) | (flags))
  
 +#define GFX_OP_USER_INTERRUPT  ((0<<29)|(2<<23))
  #define GFX_OP_RASTER_RULES    ((0x3<<29)|(0x7<<24))
  #define GFX_OP_SCISSOR         ((0x3<<29)|(0x1c<<24)|(0x10<<19))
  #define   SC_UPDATE_SCISSOR       (0x1<<1)
  #define   BLT_DEPTH_16_1555           (2<<24)
  #define   BLT_DEPTH_32                        (3<<24)
  #define   BLT_ROP_GXCOPY              (0xcc<<16)
- #define XY_SRC_COPY_BLT_SRC_TILED     (1<<15)
- #define XY_SRC_COPY_BLT_DST_TILED     (1<<11)
+ #define XY_SRC_COPY_BLT_SRC_TILED     (1<<15) /* 965+ only */
+ #define XY_SRC_COPY_BLT_DST_TILED     (1<<11) /* 965+ only */
  #define CMD_OP_DISPLAYBUFFER_INFO ((0x0<<29)|(0x14<<23)|2)
  #define   ASYNC_FLIP                (1<<22)
  #define   DISPLAY_PLANE_A           (0<<20)
  #define PRB1_HEAD     0x02044 /* 915+ only */
  #define PRB1_START    0x02048 /* 915+ only */
  #define PRB1_CTL      0x0204c /* 915+ only */
 +#define I965REG_ACTHD 0x02074
  #define HWS_PGA               0x02080
  #define IPEIR         0x02088
  #define NOPID         0x02094
  #define   I915_DISPLAY_PIPE_B_EVENT_INTERRUPT         (1<<4)
  #define   I915_DEBUG_INTERRUPT                                (1<<2)
  #define   I915_USER_INTERRUPT                         (1<<1)
+ #define   I915_ASLE_INTERRUPT                         (1<<0)
  #define EIR           0x020b0
  #define EMR           0x020b4
  #define ESR           0x020b8
  #define INSTPM                0x020c0
 +#define I915REG_ACTHD 0x020C8
  #define FW_BLC                0x020d8
  #define FW_BLC_SELF   0x020e0 /* 915+ only */
  #define MI_ARB_STATE  0x020e4 /* 915+ only */
  #define   DPLLB_LVDS_P2_CLOCK_DIV_7   (1 << 24) /* i915 */
  #define   DPLL_P2_CLOCK_DIV_MASK      0x03000000 /* i915 */
  #define   DPLL_FPA01_P1_POST_DIV_MASK 0x00ff0000 /* i915 */
 +/*
 + * Pixel within the current frame is counted in the PIPEAFRAMEPIXEL register
 + * and is 24 bits wide.
 + */
 +#define PIPE_PIXEL_MASK         0x00ffffff
 +#define PIPE_PIXEL_SHIFT        0
  
  #define I915_FIFO_UNDERRUN_STATUS             (1UL<<31)
  #define I915_CRC_ERROR_ENABLE                 (1UL<<29)
                       (dev)->pci_device == 0x29A2 || \
                       (dev)->pci_device == 0x2A02 || \
                       (dev)->pci_device == 0x2A12 || \
-                      (dev)->pci_device == 0x2A42)
+                      (dev)->pci_device == 0x2A42 || \
+                      (dev)->pci_device == 0x2E02 || \
+                      (dev)->pci_device == 0x2E12 || \
+                      (dev)->pci_device == 0x2E22)
  
  #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
  
- #define IS_IGD_GM(dev) ((dev)->pci_device == 0x2A42)
+ #define IS_GM45(dev) ((dev)->pci_device == 0x2A42)
+ #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \
+                    (dev)->pci_device == 0x2E12 || \
+                    (dev)->pci_device == 0x2E22)
  
  #define IS_G33(dev)    ((dev)->pci_device == 0x29C2 ||        \
                        (dev)->pci_device == 0x29B2 ||  \
                      IS_I945GM(dev) || IS_I965G(dev) || IS_G33(dev))
  
  #define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \
-                       IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(dev))
+                       IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev))
  
- #define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_IGD_GM(dev))
+ #define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev))
  
  #endif
diff --combined shared-core/i915_init.c
index 3a652e8,0000000..009d447
mode 100644,000000..100644
--- /dev/null
@@@ -1,532 -1,0 +1,594 @@@
-       int ret = 0;
 +/*
 + * Copyright (c) 2007 Intel Corporation
 + *   Jesse Barnes <jesse.barnes@intel.com>
 + *
 + * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
 + *                   2004 Sylvain Meyer
 + *
 + * GPL/BSD dual license
 + */
 +#include "drmP.h"
 +#include "drm.h"
 +#include "drm_sarea.h"
 +#include "i915_drm.h"
 +#include "i915_drv.h"
 +#include "intel_bios.h"
 +#include "intel_drv.h"
 +
 +/**
 + * i915_probe_agp - get AGP bootup configuration
 + * @pdev: PCI device
 + * @aperture_size: returns AGP aperture configured size
 + * @preallocated_size: returns size of BIOS preallocated AGP space
 + *
 + * Since Intel integrated graphics are UMA, the BIOS has to set aside
 + * some RAM for the framebuffer at early boot.  This code figures out
 + * how much was set aside so we can use it for our own purposes.
 + */
 +int i915_probe_agp(struct pci_dev *pdev, unsigned long *aperture_size,
 +                 unsigned long *preallocated_size)
 +{
 +      struct pci_dev *bridge_dev;
 +      u16 tmp = 0;
 +      unsigned long overhead;
 +
 +      bridge_dev = pci_get_bus_and_slot(0, PCI_DEVFN(0,0));
 +      if (!bridge_dev) {
 +              DRM_ERROR("bridge device not found\n");
 +              return -1;
 +      }
 +
 +      /* Get the fb aperture size and "stolen" memory amount. */
 +      pci_read_config_word(bridge_dev, INTEL_GMCH_CTRL, &tmp);
 +      pci_dev_put(bridge_dev);
 +
 +      *aperture_size = 1024 * 1024;
 +      *preallocated_size = 1024 * 1024;
 +
 +      switch (pdev->device) {
 +      case PCI_DEVICE_ID_INTEL_82830_CGC:
 +      case PCI_DEVICE_ID_INTEL_82845G_IG:
 +      case PCI_DEVICE_ID_INTEL_82855GM_IG:
 +      case PCI_DEVICE_ID_INTEL_82865_IG:
 +              if ((tmp & INTEL_GMCH_MEM_MASK) == INTEL_GMCH_MEM_64M)
 +                      *aperture_size *= 64;
 +              else
 +                      *aperture_size *= 128;
 +              break;
 +      default:
 +              /* 9xx supports large sizes, just look at the length */
 +              *aperture_size = pci_resource_len(pdev, 2);
 +              break;
 +      }
 +
 +      /*
 +       * Some of the preallocated space is taken by the GTT
 +       * and popup.  GTT is 1K per MB of aperture size, and popup is 4K.
 +       */
 +      overhead = (*aperture_size / 1024) + 4096;
 +      switch (tmp & INTEL_855_GMCH_GMS_MASK) {
 +      case INTEL_855_GMCH_GMS_STOLEN_1M:
 +              break; /* 1M already */
 +      case INTEL_855_GMCH_GMS_STOLEN_4M:
 +              *preallocated_size *= 4;
 +              break;
 +      case INTEL_855_GMCH_GMS_STOLEN_8M:
 +              *preallocated_size *= 8;
 +              break;
 +      case INTEL_855_GMCH_GMS_STOLEN_16M:
 +              *preallocated_size *= 16;
 +              break;
 +      case INTEL_855_GMCH_GMS_STOLEN_32M:
 +              *preallocated_size *= 32;
 +              break;
 +      case INTEL_915G_GMCH_GMS_STOLEN_48M:
 +              *preallocated_size *= 48;
 +              break;
 +      case INTEL_915G_GMCH_GMS_STOLEN_64M:
 +              *preallocated_size *= 64;
 +              break;
 +      case INTEL_855_GMCH_GMS_DISABLED:
 +              DRM_ERROR("video memory is disabled\n");
 +              return -1;
 +      default:
 +              DRM_ERROR("unexpected GMCH_GMS value: 0x%02x\n",
 +                      tmp & INTEL_855_GMCH_GMS_MASK);
 +              return -1;
 +      }
 +      *preallocated_size -= overhead;
 +
 +      return 0;
 +}
 +
 +static int i915_init_hwstatus(struct drm_device *dev)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_memrange_node *free_space;
 +      int ret = 0;
 +
 +      /* Program Hardware Status Page */
 +      if (!IS_G33(dev)) {
 +              dev_priv->status_page_dmah = 
 +                      drm_pci_alloc(dev, PAGE_SIZE, PAGE_SIZE, 0xffffffff);
 +
 +              if (!dev_priv->status_page_dmah) {
 +                      DRM_ERROR("Can not allocate hardware status page\n");
 +                      ret = -ENOMEM;
 +                      goto out;
 +              }
 +              dev_priv->hws_vaddr = dev_priv->status_page_dmah->vaddr;
 +              dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
 +
 +              I915_WRITE(HWS_PGA, dev_priv->dma_status_page);
 +      } else {
 +              free_space = drm_memrange_search_free(&dev_priv->vram,
 +                                                    PAGE_SIZE,
 +                                                    PAGE_SIZE, 0);
 +              if (!free_space) {
 +                      DRM_ERROR("No free vram available, aborting\n");
 +                      ret = -ENOMEM;
 +                      goto out;
 +              }
 +
 +              dev_priv->hws = drm_memrange_get_block(free_space, PAGE_SIZE,
 +                                                     PAGE_SIZE);
 +              if (!dev_priv->hws) {
 +                      DRM_ERROR("Unable to allocate or pin hw status page\n");
 +                      ret = -EINVAL;
 +                      goto out;
 +              }
 +
 +              dev_priv->hws_agpoffset = dev_priv->hws->start;
 +              dev_priv->hws_map.offset = dev->agp->base +
 +                      dev_priv->hws->start;
 +              dev_priv->hws_map.size = PAGE_SIZE;
 +              dev_priv->hws_map.type= 0;
 +              dev_priv->hws_map.flags= 0;
 +              dev_priv->hws_map.mtrr = 0;
 +
 +              drm_core_ioremap(&dev_priv->hws_map, dev);
 +              if (dev_priv->hws_map.handle == NULL) {
 +                      dev_priv->hws_agpoffset = 0;
 +                      DRM_ERROR("can not ioremap virtual addr for"
 +                                      "G33 hw status page\n");
 +                      ret = -ENOMEM;
 +                      goto out_free;
 +              }
 +              dev_priv->hws_vaddr = dev_priv->hws_map.handle;
 +              I915_WRITE(HWS_PGA, dev_priv->hws_agpoffset);
 +      }
 +
 +      memset(dev_priv->hws_vaddr, 0, PAGE_SIZE);
 +
 +      DRM_DEBUG("Enabled hardware status page\n");
 +
 +      return 0;
 +
 +out_free:
 +      /* free hws */
 +out:
 +      return ret;
 +}
 +
 +static void i915_cleanup_hwstatus(struct drm_device *dev)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +
 +      if (!IS_G33(dev)) {
 +              if (dev_priv->status_page_dmah)
 +                      drm_pci_free(dev, dev_priv->status_page_dmah);
 +      } else {
 +              if (dev_priv->hws_map.handle)
 +                      drm_core_ioremapfree(&dev_priv->hws_map, dev);
 +              if (dev_priv->hws)
 +                      drm_memrange_put_block(dev_priv->hws);
 +      }
 +      I915_WRITE(HWS_PGA, 0x1ffff000);
 +}
 +
 +static int i915_load_modeset_init(struct drm_device *dev)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      unsigned long agp_size, prealloc_size;
 +      int ret = 0;
 +
 +      i915_probe_agp(dev->pdev, &agp_size, &prealloc_size);
 +
 +      /* Basic memrange allocator for stolen space (aka vram) */
 +      drm_memrange_init(&dev_priv->vram, 0, prealloc_size);
 +      /* Let GEM Manage from end of prealloc space to end of aperture */
 +      i915_gem_do_init(dev, prealloc_size, agp_size);
 +
 +      ret = i915_gem_init_ringbuffer(dev);
 +      if (ret)
 +              goto out;
 +
 +      ret = i915_init_hwstatus(dev);
 +      if (ret)
 +              goto destroy_ringbuffer;
 +
 +      /* Allow hardware batchbuffers unless told otherwise.
 +       */
 +      dev_priv->allow_batchbuffer = 1;
 +      dev_priv->max_validate_buffers = I915_MAX_VALIDATE_BUFFERS;
 +      mutex_init(&dev_priv->cmdbuf_mutex);
 +
 +      dev_priv->wq = create_singlethread_workqueue("i915");
 +      if (dev_priv->wq == 0) {
 +              DRM_DEBUG("Error\n");
 +              ret = -EINVAL;
 +              goto destroy_hws;
 +      }
 +
 +      ret = intel_init_bios(dev);
 +      if (ret) {
 +              DRM_ERROR("failed to find VBIOS tables\n");
 +              ret = -ENODEV;
 +              goto destroy_wq;
 +      }
 +
 +      intel_modeset_init(dev);
 +      drm_helper_initial_config(dev, false);
 +
 +      dev->devname = kstrdup(DRIVER_NAME, GFP_KERNEL);
 +      if (!dev->devname) {
 +              ret = -ENOMEM;
 +              goto modeset_cleanup;
 +      }
 +
 +      ret = drm_irq_install(dev);
 +      if (ret) {
 +              kfree(dev->devname);
 +              goto modeset_cleanup;
 +      }
 +      return 0;
 +
 +modeset_cleanup:
 +      intel_modeset_cleanup(dev);
 +destroy_wq:
 +      destroy_workqueue(dev_priv->wq);
 +destroy_hws:
 +      i915_cleanup_hwstatus(dev);
 +destroy_ringbuffer:
 +      i915_gem_cleanup_ringbuffer(dev);
 +out:
 +      return ret;
 +}
 +
 +/**
 + * i915_driver_load - setup chip and create an initial config
 + * @dev: DRM device
 + * @flags: startup flags
 + *
 + * The driver load routine has to do several things:
 + *   - drive output discovery via intel_modeset_init()
 + *   - initialize the memory manager
 + *   - allocate initial config memory
 + *   - setup the DRM framebuffer with the allocated memory
 + */
 +int i915_driver_load(struct drm_device *dev, unsigned long flags)
 +{
 +      struct drm_i915_private *dev_priv;
-         intel_init_chipset_flush_compat(dev);
++      int ret = 0, num_pipes = 2;
++      u32 tmp;
 +
 +      dev_priv = drm_alloc(sizeof(struct drm_i915_private), DRM_MEM_DRIVER);
 +      if (dev_priv == NULL)
 +              return -ENOMEM;
 +
 +      memset(dev_priv, 0, sizeof(struct drm_i915_private));
 +      dev->dev_private = (void *)dev_priv;
 +      dev_priv->dev = dev;
 +
 +      /* i915 has 4 more counters */
 +      dev->counters += 4;
 +      dev->types[6] = _DRM_STAT_IRQ;
 +      dev->types[7] = _DRM_STAT_PRIMARY;
 +      dev->types[8] = _DRM_STAT_SECONDARY;
 +      dev->types[9] = _DRM_STAT_DMA;
 +
 +      if (IS_MOBILE(dev) || IS_I9XX(dev))
 +              dev_priv->cursor_needs_physical = true;
 +      else
 +              dev_priv->cursor_needs_physical = false;
 +
 +      if (IS_I965G(dev) || IS_G33(dev))
 +              dev_priv->cursor_needs_physical = false;
 +
 +      if (IS_I9XX(dev))
 +              pci_read_config_dword(dev->pdev, 0x5C, &dev_priv->stolen_base);
 +
 +      if (IS_I9XX(dev)) {
 +              dev_priv->mmiobase = drm_get_resource_start(dev, 0);
 +              dev_priv->mmiolen = drm_get_resource_len(dev, 0);
 +              dev->mode_config.fb_base =
 +                      drm_get_resource_start(dev, 2) & 0xff000000;
 +      } else if (drm_get_resource_start(dev, 1)) {
 +              dev_priv->mmiobase = drm_get_resource_start(dev, 1);
 +              dev_priv->mmiolen = drm_get_resource_len(dev, 1);
 +              dev->mode_config.fb_base =
 +                      drm_get_resource_start(dev, 0) & 0xff000000;
 +      } else {
 +              DRM_ERROR("Unable to find MMIO registers\n");
 +              ret = -ENODEV;
 +              goto free_priv;
 +      }
 +
 +      DRM_DEBUG("fb_base: 0x%08lx\n", dev->mode_config.fb_base);
 +
 +      ret = drm_addmap(dev, dev_priv->mmiobase, dev_priv->mmiolen,
 +                       _DRM_REGISTERS, _DRM_KERNEL|_DRM_READ_ONLY|_DRM_DRIVER,
 +                       &dev_priv->mmio_map);
 +      if (ret != 0) {
 +              DRM_ERROR("Cannot add mapping for MMIO registers\n");
 +              goto free_priv;
 +      }
 +
 +      INIT_LIST_HEAD(&dev_priv->mm.active_list);
 +      INIT_LIST_HEAD(&dev_priv->mm.flushing_list);
 +      INIT_LIST_HEAD(&dev_priv->mm.inactive_list);
 +      INIT_LIST_HEAD(&dev_priv->mm.request_list);
 +      INIT_DELAYED_WORK(&dev_priv->mm.retire_work,
 +                        i915_gem_retire_work_handler);
 +      dev_priv->mm.next_gem_seqno = 1;
 +
 +#ifdef __linux__
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
-         intel_init_chipset_flush_compat(dev);
++      intel_init_chipset_flush_compat(dev);
++#endif
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
++      intel_opregion_init(dev);
 +#endif
 +#endif
 +
++      tmp = I915_READ(PIPEASTAT);
++      I915_WRITE(PIPEASTAT, tmp);
++      tmp = I915_READ(PIPEBSTAT);
++      I915_WRITE(PIPEBSTAT, tmp);
++
++      atomic_set(&dev_priv->irq_received, 0);
++      I915_WRITE(HWSTAM, 0xeffe);
++      I915_WRITE(IMR, 0x0);
++      I915_WRITE(IER, 0x0);
++
++      DRM_SPININIT(&dev_priv->swaps_lock, "swap");
++      INIT_LIST_HEAD(&dev_priv->vbl_swaps.head);
++      dev_priv->swaps_pending = 0;
++
++      DRM_SPININIT(&dev_priv->user_irq_lock, "userirq");
++      dev_priv->user_irq_refcount = 0;
++      dev_priv->irq_mask_reg = ~0;
++
++      ret = drm_vblank_init(dev, num_pipes);
++      if (ret)
++              goto out_rmmap;
++
++      ret = drm_hotplug_init(dev);
++      if (ret)
++              goto out_rmmap;
++
++      dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
++      dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
++
++      i915_enable_interrupt(dev);
++      DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
++
++      /*
++       * Initialize the hardware status page IRQ location.
++       */
++
++      I915_WRITE(INSTPM, (1 << 5) | (1 << 21));
++
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +              ret = i915_load_modeset_init(dev);
 +              if (ret < 0) {
 +                      DRM_ERROR("failed to init modeset\n");
 +                      goto out_rmmap;
 +              }
 +      }
++
 +      return 0;
 +
 +out_rmmap:
 +      drm_rmmap(dev, dev_priv->mmio_map);
 +free_priv:
 +      drm_free(dev_priv, sizeof(struct drm_i915_private), DRM_MEM_DRIVER);
 +      return ret;
 +}
 +
 +int i915_driver_unload(struct drm_device *dev)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +
++      u32 temp;
++
++      dev_priv->vblank_pipe = 0;
++
++      dev_priv->irq_enabled = 0;
++
++      I915_WRITE(HWSTAM, 0xffffffff);
++      I915_WRITE(IMR, 0xffffffff);
++      I915_WRITE(IER, 0x0);
++
++      temp = I915_READ(PIPEASTAT);
++      I915_WRITE(PIPEASTAT, temp);
++      temp = I915_READ(PIPEBSTAT);
++      I915_WRITE(PIPEBSTAT, temp);
++      temp = I915_READ(IIR);
++      I915_WRITE(IIR, temp);
++
 +      I915_WRITE(PRB0_CTL, 0);
 +
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +              drm_irq_uninstall(dev);
 +              intel_modeset_cleanup(dev);
 +              destroy_workqueue(dev_priv->wq);
 +      }
 +
 +#if 0
 +      if (dev_priv->ring.virtual_start) {
 +              drm_core_ioremapfree(&dev_priv->ring.map, dev);
 +      }
 +#endif
 +
 +#ifdef DRI2
 +      if (dev_priv->sarea_kmap.virtual) {
 +              drm_bo_kunmap(&dev_priv->sarea_kmap);
 +              dev_priv->sarea_kmap.virtual = NULL;
 +              dev->sigdata.lock = NULL;
 +      }
 +
 +      if (dev_priv->sarea_bo) {
 +              mutex_lock(&dev->struct_mutex);
 +              drm_bo_usage_deref_locked(&dev_priv->sarea_bo);
 +              mutex_unlock(&dev->struct_mutex);
 +              dev_priv->sarea_bo = NULL;
 +      }
 +#endif
 +      i915_cleanup_hwstatus(dev);
 +
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +              mutex_lock(&dev->struct_mutex);
 +              i915_gem_cleanup_ringbuffer(dev);
 +              mutex_unlock(&dev->struct_mutex);
 +              drm_memrange_takedown(&dev_priv->vram);
 +              i915_gem_lastclose(dev);
 +      }
 +
++        drm_rmmap(dev, dev_priv->mmio_map);
++
 +#ifdef __linux__
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
++      intel_opregion_free(dev);
++#endif
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
-         DRM_DEBUG("%p\n", dev_priv->mmio_map);
-         drm_rmmap(dev, dev_priv->mmio_map);
++      intel_fini_chipset_flush_compat(dev);
 +#endif
 +#endif
 +
 +      drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
 +
 +      dev->dev_private = NULL;
 +      return 0;
 +}
 +
 +int i915_master_create(struct drm_device *dev, struct drm_master *master)
 +{
 +      struct drm_i915_master_private *master_priv;
 +      unsigned long sareapage;
 +      int ret;
 +
 +      master_priv = drm_calloc(1, sizeof(*master_priv), DRM_MEM_DRIVER);
 +      if (!master_priv)
 +              return -ENOMEM;
 +
 +      /* prebuild the SAREA */
 +      sareapage = max(SAREA_MAX, PAGE_SIZE);
 +      ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK|_DRM_DRIVER,
 +                       &master_priv->sarea);
 +      if (ret) {
 +              DRM_ERROR("SAREA setup failed\n");
 +              return ret;
 +      }
 +      master_priv->sarea_priv = master_priv->sarea->handle + sizeof(struct drm_sarea);
 +      master_priv->sarea_priv->pf_current_page = 0;
 +
 +      master->driver_priv = master_priv;
 +      return 0;
 +}
 +
 +void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
 +{
 +      struct drm_i915_master_private *master_priv = master->driver_priv;
 +
 +      if (!master_priv)
 +              return;
 +
 +      if (master_priv->sarea)
 +              drm_rmmap(dev, master_priv->sarea);
 +              
 +      drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER);
 +
 +      master->driver_priv = NULL;
 +}
 +
 +int i915_driver_open(struct drm_device *dev, struct drm_file *file_priv)
 +{
 +      struct drm_i915_file_private *i915_file_priv;
 +
 +      DRM_DEBUG("\n");
 +      i915_file_priv = (struct drm_i915_file_private *)
 +          drm_alloc(sizeof(*i915_file_priv), DRM_MEM_FILES);
 +
 +      if (!i915_file_priv)
 +              return -ENOMEM;
 +
 +      file_priv->driver_priv = i915_file_priv;
 +
 +      i915_file_priv->mm.last_gem_seqno = 0;
 +      i915_file_priv->mm.last_gem_throttle_seqno = 0;
 +
 +      return 0;
 +}
 +
 +void i915_driver_postclose(struct drm_device *dev, struct drm_file *file_priv)
 +{
 +      struct drm_i915_file_private *i915_file_priv = file_priv->driver_priv;
 +
 +      drm_free(i915_file_priv, sizeof(*i915_file_priv), DRM_MEM_FILES);
 +}
 +
 +void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
 +{
 +        struct drm_i915_private *dev_priv = dev->dev_private;
 +      if (!drm_core_check_feature(dev, DRIVER_MODESET))
 +              i915_mem_release(dev, file_priv, dev_priv->agp_heap);
 +}
 +
 +void i915_driver_lastclose(struct drm_device * dev)
 +{
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              return;
 +
 +#ifdef I915_HAVE_BUFFER
 +      if (dev_priv->val_bufs) {
 +              vfree(dev_priv->val_bufs);
 +              dev_priv->val_bufs = NULL;
 +      }
 +#endif
 +
 +      i915_gem_lastclose(dev);
 +
 +      if (dev_priv->agp_heap)
 +              i915_mem_takedown(&(dev_priv->agp_heap));
 +
 +#if defined(DRI2)
 +      if (dev_priv->sarea_kmap.virtual) {
 +              drm_bo_kunmap(&dev_priv->sarea_kmap);
 +              dev_priv->sarea_kmap.virtual = NULL;
 +              dev->control->master->lock.hw_lock = NULL;
 +              dev->sigdata.lock = NULL;
 +      }
 +
 +      if (dev_priv->sarea_bo) {
 +              mutex_lock(&dev->struct_mutex);
 +              drm_bo_usage_deref_locked(&dev_priv->sarea_bo);
 +              mutex_unlock(&dev->struct_mutex);
 +              dev_priv->sarea_bo = NULL;
 +      }
 +#endif
 +      
 +      i915_dma_cleanup(dev);
 +}
 +
 +int i915_driver_firstopen(struct drm_device *dev)
 +{
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              return 0;
 +#if defined(I915_HAVE_BUFFER) && defined(I915_TTM)
 +      drm_bo_driver_init(dev);
 +#endif
 +      return 0;
 +}
diff --combined shared-core/i915_irq.c
  #include "drm.h"
  #include "i915_drm.h"
  #include "i915_drv.h"
 +#include "intel_drv.h"
 +#include "drm_crtc_helper.h"
  
  #define MAX_NOPID ((u32)~0)
  
 +/*
 + * These are the interrupts used by the driver
 + */
 +#define I915_INTERRUPT_ENABLE_MASK (I915_USER_INTERRUPT | \
 +                                  I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | \
 +                                  I915_DISPLAY_PIPE_B_EVENT_INTERRUPT)
 +
 +static inline void
 +i915_enable_irq(struct drm_i915_private *dev_priv, uint32_t mask)
 +{
 +      if ((dev_priv->irq_mask_reg & mask) != 0) {
 +              dev_priv->irq_mask_reg &= ~mask;
 +              I915_WRITE(IMR, dev_priv->irq_mask_reg);
 +              (void) I915_READ(IMR);
 +      }
 +}
 +
 +static inline void
 +i915_disable_irq(struct drm_i915_private *dev_priv, uint32_t mask)
 +{
 +      if ((dev_priv->irq_mask_reg & mask) != mask) {
 +              dev_priv->irq_mask_reg |= mask;
 +              I915_WRITE(IMR, dev_priv->irq_mask_reg);
 +              (void) I915_READ(IMR);
 +      }
 +}
 +
  /**
   * i915_get_pipe - return the the pipe associated with a given plane
   * @dev: DRM device
@@@ -74,7 -45,7 +74,7 @@@
  static int
  i915_get_pipe(struct drm_device *dev, int plane)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
        u32 dspcntr;
  
        dspcntr = plane ? I915_READ(DSPBCNTR) : I915_READ(DSPACNTR);
@@@ -111,7 -82,7 +111,7 @@@ i915_get_plane(struct drm_device *dev, 
  static int
  i915_pipe_enabled(struct drm_device *dev, int pipe)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
        unsigned long pipeconf = pipe ? PIPEBCONF : PIPEACONF;
  
        if (I915_READ(pipeconf) & PIPEACONF_ENABLE)
@@@ -129,8 -100,8 +129,8 @@@ static voi
  i915_dispatch_vsync_flip(struct drm_device *dev, struct drm_drawable_info *drw,
                         int plane)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 -      drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
 +      struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
 +      struct drm_i915_sarea *sarea_priv = master_priv->sarea_priv;
        u16 x1, y1, x2, y2;
        int pf_planes = 1 << plane;
  
   */
  static void i915_vblank_tasklet(struct drm_device *dev)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
 +      struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
        struct list_head *list, *tmp, hits, *hit;
        int nhits, nrects, slice[2], upper[2], lower[2], i, num_pages;
        unsigned counter[2];
        struct drm_drawable_info *drw;
 -      drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
 +      struct drm_i915_sarea *sarea_priv = master_priv->sarea_priv;
        u32 cpp = dev_priv->cpp,  offsets[3];
        u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
                                XY_SRC_COPY_BLT_WRITE_ALPHA |
        u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24);
        RING_LOCALS;
        
-       if (sarea_priv->front_tiled) {
+       if (IS_I965G(dev) && sarea_priv->front_tiled) {
                cmd |= XY_SRC_COPY_BLT_DST_TILED;
                dst_pitch >>= 2;
        }
-       if (sarea_priv->back_tiled) {
+       if (IS_I965G(dev) && sarea_priv->back_tiled) {
                cmd |= XY_SRC_COPY_BLT_SRC_TILED;
                src_pitch >>= 2;
        }
  
        /* Find buffer swaps scheduled for this vertical blank */
        list_for_each_safe(list, tmp, &dev_priv->vbl_swaps.head) {
 -              drm_i915_vbl_swap_t *vbl_swap =
 -                      list_entry(list, drm_i915_vbl_swap_t, head);
 +              struct drm_i915_vbl_swap *vbl_swap =
 +                      list_entry(list, struct drm_i915_vbl_swap, head);
                int pipe = i915_get_pipe(dev, vbl_swap->plane);
  
                if ((counter[pipe] - vbl_swap->sequence) > (1<<23))
                        continue;
  
 +              master_priv = vbl_swap->minor->master->driver_priv;
 +              sarea_priv = master_priv->sarea_priv;
 +              
                list_del(list);
                dev_priv->swaps_pending--;
                drm_vblank_put(dev, pipe);
                }
  
                list_for_each(hit, &hits) {
 -                      drm_i915_vbl_swap_t *swap_cmp =
 -                              list_entry(hit, drm_i915_vbl_swap_t, head);
 +                      struct drm_i915_vbl_swap *swap_cmp =
 +                              list_entry(hit, struct drm_i915_vbl_swap, head);
                        struct drm_drawable_info *drw_cmp =
                                drm_get_drawable_info(dev, swap_cmp->drw_id);
  
                        lower[0] = lower[1] = sarea_priv->height;
  
                list_for_each(hit, &hits) {
 -                      drm_i915_vbl_swap_t *swap_hit =
 -                              list_entry(hit, drm_i915_vbl_swap_t, head);
 +                      struct drm_i915_vbl_swap *swap_hit =
 +                              list_entry(hit, struct drm_i915_vbl_swap, head);
                        struct drm_clip_rect *rect;
                        int num_rects, plane, front, back;
                        unsigned short top, bottom;
                        top = upper[plane];
                        bottom = lower[plane];
  
 -                      front = (dev_priv->sarea_priv->pf_current_page >>
 +                      front = (master_priv->sarea_priv->pf_current_page >>
                                 (2 * plane)) & 0x3;
                        back = (front + 1) % num_pages;
  
        DRM_SPINUNLOCK(&dev->drw_lock);
  
        list_for_each_safe(hit, tmp, &hits) {
 -              drm_i915_vbl_swap_t *swap_hit =
 -                      list_entry(hit, drm_i915_vbl_swap_t, head);
 +              struct drm_i915_vbl_swap *swap_hit =
 +                      list_entry(hit, struct drm_i915_vbl_swap, head);
  
                list_del(hit);
  
                drm_free(swap_hit, sizeof(*swap_hit), DRM_MEM_DRIVER);
        }
  }
- #if 0
- static int i915_in_vblank(struct drm_device *dev, int pipe)
- {
-       struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
-       unsigned long pipedsl, vblank, vtotal;
-       unsigned long vbl_start, vbl_end, cur_line;
-       pipedsl = pipe ? PIPEBDSL : PIPEADSL;
-       vblank = pipe ? VBLANK_B : VBLANK_A;
-       vtotal = pipe ? VTOTAL_B : VTOTAL_A;
-       vbl_start = I915_READ(vblank) & VBLANK_START_MASK;
-       vbl_end = (I915_READ(vblank) >> VBLANK_END_SHIFT) & VBLANK_END_MASK;
-       cur_line = I915_READ(pipedsl);
  
-       if (cur_line >= vbl_start)
-               return 1;
-       return 0;
- }
- #endif
  u32 i915_get_vblank_counter(struct drm_device *dev, int plane)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
        unsigned long high_frame;
        unsigned long low_frame;
        u32 high1, high2, low, count;
  
        count = (high1 << 8) | low;
  
-       /*
-        * If we're in the middle of the vblank period, the
-        * above regs won't have been updated yet, so return
-        * an incremented count to stay accurate
-        */
- #if 0
-       if (i915_in_vblank(dev, pipe))
-               count++;
- #endif
-       /* count may be reset by other driver(e.g. 2D driver), 
-          we have no way to know if it is wrapped or resetted 
-          when count is zero. do a rough guess.
-       */
-       if (count == 0 && dev->last_vblank[pipe] < dev->max_vblank_count/2)
-               dev->last_vblank[pipe] = 0; 
-       
        return count;
  }
  
 +static struct drm_device *hotplug_dev;
 +
 +/**
 + * Handler for user interrupts in process context (able to sleep, do VFS
 + * operations, etc.
 + *
 + * If another IRQ comes in while we're in this handler, it will still get put
 + * on the queue again to be rerun when we finish.
 + */
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
 +static void i915_hotplug_work_func(void *work)
 +#else
 +static void i915_hotplug_work_func(struct work_struct *work)
 +#endif
 +{
 +      struct drm_device *dev = hotplug_dev;
 +
 +      drm_helper_hotplug_stage_two(dev);
 +      drm_handle_hotplug(dev);
 +}
 +
 +static int i915_run_hotplug_tasklet(struct drm_device *dev, uint32_t stat)
 +{
 +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
 +      static DECLARE_WORK(hotplug, i915_hotplug_work_func, NULL);
 +#else
 +      static DECLARE_WORK(hotplug, i915_hotplug_work_func);
 +#endif
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +
 +      hotplug_dev = dev;
 +
 +      if (stat & TV_HOTPLUG_INT_STATUS) {
 +              DRM_DEBUG("TV event\n");
 +      }
 +
 +      if (stat & CRT_HOTPLUG_INT_STATUS) {
 +              DRM_DEBUG("CRT event\n");
 +      }
 +
 +      if (stat & SDVOB_HOTPLUG_INT_STATUS) {
 +              DRM_DEBUG("sDVOB event\n");
 +      }
 +
 +      if (stat & SDVOC_HOTPLUG_INT_STATUS) {
 +              DRM_DEBUG("sDVOC event\n");
 +      }
 +      queue_work(dev_priv->wq, &hotplug);
 +
 +      return 0;
 +}
 +
  irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
  {
        struct drm_device *dev = (struct drm_device *) arg;
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_master_private *master_priv;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
        u32 iir;
 -      u32 pipea_stats, pipeb_stats;
 +      u32 pipea_stats = 0, pipeb_stats = 0, tvdac;
 +      int hotplug = 0;
        int vblank = 0;
  
 +      if (dev->pdev->msi_enabled)
 +              I915_WRITE(IMR, ~0);
        iir = I915_READ(IIR);
- #if 0
-       DRM_DEBUG("flag=%08x\n", iir);
- #endif
 -      if (iir == 0)
 -              return IRQ_NONE;
 +      atomic_inc(&dev_priv->irq_received);
 +      if (iir == 0) {
-               DRM_DEBUG ("iir 0x%08x im 0x%08x ie 0x%08x pipea 0x%08x pipeb 0x%08x\n",
-                          iir,
-                          I915_READ(IMR),
-                          I915_READ(IER),
-                          I915_READ(PIPEASTAT),
-                          I915_READ(PIPEBSTAT));
 +              if (dev->pdev->msi_enabled) {
-                       I915_WRITE(IMR,
-                                  dev_priv->irq_mask_reg);
++                      I915_WRITE(IMR, dev_priv->irq_mask_reg);
 +                      (void) I915_READ(IMR);
 +              }
-               return IRQ_NONE;
 +      }
  
        /*
         * Clear the PIPE(A|B)STAT regs before the IIR otherwise
         */
        if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {
                pipea_stats = I915_READ(PIPEASTAT);
 -              if (pipea_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
 -                                 PIPE_VBLANK_INTERRUPT_STATUS))
 -              {
 -                      vblank++;
 -                      drm_handle_vblank(dev, i915_get_plane(dev, 0));
 -              }
 -
                I915_WRITE(PIPEASTAT, pipea_stats);
        }
 +
        if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {
                pipeb_stats = I915_READ(PIPEBSTAT);
 -              /* Ack the event */
                I915_WRITE(PIPEBSTAT, pipeb_stats);
 +      }
  
 -              /* The vblank interrupt gets enabled even if we didn't ask for
 -                 it, so make sure it's shut down again */
 -              if (!(dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B))
 -                      pipeb_stats &= ~(I915_VBLANK_INTERRUPT_ENABLE);
 -
 -              if (pipeb_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
 -                                 PIPE_VBLANK_INTERRUPT_STATUS))
 -              {
 -                      vblank++;
 -                      drm_handle_vblank(dev, i915_get_plane(dev, 1));
 -              }
 +      I915_WRITE(IIR, iir);
 +      if (dev->pdev->msi_enabled)
 +              I915_WRITE(IMR, dev_priv->irq_mask_reg);
 +      (void) I915_READ(IIR); /* Flush posted writes */
 +
 +      /* This is a global event, and not a pipe A event */
 +      if (pipea_stats & PIPE_HOTPLUG_INTERRUPT_STATUS)
 +              hotplug = 1;
 +
 +      if (pipea_stats & PIPE_HOTPLUG_TV_INTERRUPT_STATUS) {
 +              hotplug = 1;
 +              /* Toggle hotplug detection to clear hotplug status */
 +              tvdac = I915_READ(TV_DAC);
 +              I915_WRITE(TV_DAC, tvdac & ~TVDAC_STATE_CHG_EN);
 +              I915_WRITE(TV_DAC, tvdac | TVDAC_STATE_CHG_EN);
 +      }
  
 -#ifdef __linux__
 -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
 -              if (pipeb_stats & I915_LEGACY_BLC_EVENT_ENABLE)
 -                      opregion_asle_intr(dev);
 -#endif
 -#endif
 -              I915_WRITE(PIPEBSTAT, pipeb_stats);
 +      if (dev->primary->master) {
 +              master_priv = dev->primary->master->driver_priv;
 +              master_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
        }
  
 -      if (dev_priv->sarea_priv)
 -          dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
 -
 -      I915_WRITE(IIR, iir);
 -      (void) I915_READ(IIR);
 -
+ #ifdef __linux__
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
++      if ((iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) &&
++          (pipeb_stats & I915_LEGACY_BLC_EVENT_ENABLE))
++              opregion_asle_intr(dev);
+       if (iir & I915_ASLE_INTERRUPT)
+               opregion_asle_intr(dev);
+ #endif
+ #endif
        if (iir & I915_USER_INTERRUPT) {
 +              dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
                DRM_WAKEUP(&dev_priv->irq_queue);
  #ifdef I915_HAVE_FENCE
                i915_fence_handler(dev);
  #endif
        }
  
 +      if (pipea_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
 +                         PIPE_VBLANK_INTERRUPT_STATUS)) {
 +              vblank++;
 +              drm_handle_vblank(dev, i915_get_plane(dev, 0));
 +      }
 +
++      /* The vblank interrupt gets enabled even if we didn't ask for
++         it, so make sure it's shut down again */
++      if (!(dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B))
++              pipeb_stats &= ~(I915_VBLANK_INTERRUPT_ENABLE);
++
 +      if (pipeb_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
 +                         PIPE_VBLANK_INTERRUPT_STATUS)) {
 +              vblank++;
 +              drm_handle_vblank(dev, i915_get_plane(dev, 1));
 +      }
 +
        if (vblank) {
                if (dev_priv->swaps_pending > 0)
                        drm_locked_tasklet(dev, i915_vblank_tasklet);
        }
  
 +      if ((iir & I915_DISPLAY_PORT_INTERRUPT) || hotplug) {
 +              u32 temp2 = 0;
 +
 +              DRM_INFO("Hotplug event received\n");
 +
 +              if (!IS_I9XX(dev) || IS_I915G(dev) || IS_I915GM(dev)) {
 +                      if (pipea_stats & PIPE_HOTPLUG_INTERRUPT_STATUS)
 +                              temp2 |= SDVOB_HOTPLUG_INT_STATUS |
 +                                      SDVOC_HOTPLUG_INT_STATUS;
 +                      if (pipea_stats & PIPE_HOTPLUG_TV_INTERRUPT_STATUS)
 +                              temp2 |= TV_HOTPLUG_INT_STATUS;
 +              } else {
 +                      temp2 = I915_READ(PORT_HOTPLUG_STAT);
 +
 +                      I915_WRITE(PORT_HOTPLUG_STAT, temp2);
 +              }
 +              i915_run_hotplug_tasklet(dev, temp2);
 +      }
 +
        return IRQ_HANDLED;
  }
  
  int i915_emit_irq(struct drm_device *dev)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
        RING_LOCALS;
  
        i915_kernel_lost_context(dev);
        return dev_priv->counter;
  }
  
 -void i915_user_irq_on(drm_i915_private_t *dev_priv)
 +void i915_user_irq_on(struct drm_device *dev)
  {
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
 +
        DRM_SPINLOCK(&dev_priv->user_irq_lock);
 -      if (dev_priv->irq_enabled && (++dev_priv->user_irq_refcount == 1)){
 -              dev_priv->irq_enable_reg |= I915_USER_INTERRUPT;
 -              I915_WRITE(IER, dev_priv->irq_enable_reg);
 -      }
 +      if (dev_priv->irq_enabled && (++dev_priv->user_irq_refcount == 1))
 +              i915_enable_irq(dev_priv, I915_USER_INTERRUPT);
        DRM_SPINUNLOCK(&dev_priv->user_irq_lock);
 -
  }
 -
 -void i915_user_irq_off(drm_i915_private_t *dev_priv)
 +              
 +void i915_user_irq_off(struct drm_device *dev)
  {
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
 +
        DRM_SPINLOCK(&dev_priv->user_irq_lock);
 -      if (dev_priv->irq_enabled && (--dev_priv->user_irq_refcount == 0)) {
 -              //              dev_priv->irq_enable_reg &= ~I915_USER_INTERRUPT;
 -              //              I915_WRITE(IER, dev_priv->irq_enable_reg);
 -      }
 +      BUG_ON(dev_priv->irq_enabled && dev_priv->user_irq_refcount <= 0);
 +      if (dev_priv->irq_enabled && (--dev_priv->user_irq_refcount == 0))
 +              i915_disable_irq(dev_priv, I915_USER_INTERRUPT);
        DRM_SPINUNLOCK(&dev_priv->user_irq_lock);
  }
  
  
 -static int i915_wait_irq(struct drm_device * dev, int irq_nr)
 +int i915_wait_irq(struct drm_device * dev, int irq_nr)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
 +      struct drm_i915_master_private *master_priv;
        int ret = 0;
  
 +      if (!dev_priv) {
 +              DRM_ERROR("called with no initialization\n");
 +              return -EINVAL;
 +      }
 +
        DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
                  READ_BREADCRUMB(dev_priv));
  
 -      if (READ_BREADCRUMB(dev_priv) >= irq_nr)
 +      master_priv = dev->primary->master->driver_priv;
 +
 +      if (!master_priv) {
 +              DRM_ERROR("no master priv?\n");
 +              return -EINVAL;
 +      }
 +
 +      if (READ_BREADCRUMB(dev_priv) >= irq_nr) {
 +              master_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
                return 0;
 +      }
  
 -      i915_user_irq_on(dev_priv);
 +      i915_user_irq_on(dev);
        DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
                    READ_BREADCRUMB(dev_priv) >= irq_nr);
 -      i915_user_irq_off(dev_priv);
 +      i915_user_irq_off(dev);
  
        if (ret == -EBUSY) {
                DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",
                          READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
        }
 +      
 +      if (READ_BREADCRUMB(dev_priv) >= irq_nr)
 +              master_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
  
 -      if (dev_priv->sarea_priv)
 -              dev_priv->sarea_priv->last_dispatch =
 -                      READ_BREADCRUMB(dev_priv);
        return ret;
  }
  
  int i915_irq_emit(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -      drm_i915_irq_emit_t *emit = data;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_irq_emit *emit = data;
        int result;
  
        LOCK_TEST_WITH_RETURN(dev, file_priv);
  int i915_irq_wait(struct drm_device *dev, void *data,
                  struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -      drm_i915_irq_wait_t *irqwait = data;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_irq_wait *irqwait = data;
  
        if (!dev_priv) {
                DRM_ERROR("called with no initialization\n");
  
  int i915_enable_vblank(struct drm_device *dev, int plane)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
        int pipe = i915_get_pipe(dev, plane);
        u32     pipestat_reg = 0;
 +      u32     mask_reg = 0;
        u32     pipestat;
  
        switch (pipe) {
        case 0:
                pipestat_reg = PIPEASTAT;
 -              dev_priv->irq_enable_reg |= I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
 +              mask_reg |= I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
                break;
        case 1:
                pipestat_reg = PIPEBSTAT;
 -              dev_priv->irq_enable_reg |= I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
 +              mask_reg |= I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
                break;
        default:
                DRM_ERROR("tried to enable vblank on non-existent pipe %d\n",
                             PIPE_VBLANK_INTERRUPT_STATUS);
                I915_WRITE(pipestat_reg, pipestat);
        }
 -      I915_WRITE(IER, dev_priv->irq_enable_reg);
 +
 +      DRM_SPINLOCK(&dev_priv->user_irq_lock);
 +      i915_enable_irq(dev_priv, mask_reg);
 +      DRM_SPINUNLOCK(&dev_priv->user_irq_lock);
  
        return 0;
  }
  
  void i915_disable_vblank(struct drm_device *dev, int plane)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
        int pipe = i915_get_pipe(dev, plane);
        u32     pipestat_reg = 0;
 +      u32     mask_reg = 0;
        u32     pipestat;
  
        switch (pipe) {
        case 0:
                pipestat_reg = PIPEASTAT;
 -              dev_priv->irq_enable_reg &= ~I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
 +              mask_reg |= I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
                break;
        case 1:
                pipestat_reg = PIPEBSTAT;
 -              dev_priv->irq_enable_reg &= ~I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
 +              mask_reg |= I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
                break;
        default:
                DRM_ERROR("tried to disable vblank on non-existent pipe %d\n",
                break;
        }
  
 -      I915_WRITE(IER, dev_priv->irq_enable_reg);
 +      DRM_SPINLOCK(&dev_priv->user_irq_lock);
 +      i915_disable_irq(dev_priv, mask_reg);
 +      DRM_SPINUNLOCK(&dev_priv->user_irq_lock);
  
 -      if (pipestat_reg)
 -      {
 +      if (pipestat_reg) {
                pipestat = I915_READ (pipestat_reg);
                pipestat &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |
                              PIPE_VBLANK_INTERRUPT_ENABLE);
                pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |
                             PIPE_VBLANK_INTERRUPT_STATUS);
                I915_WRITE(pipestat_reg, pipestat);
 +              (void) I915_READ(pipestat_reg);
        }
  }
  
  void i915_enable_interrupt (struct drm_device *dev)
  {
 -      drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +      struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
 +      struct drm_connector *o;
        
 -      dev_priv->irq_enable_reg |= I915_USER_INTERRUPT;
 +      dev_priv->irq_mask_reg &= ~0;
 +
 +      if (IS_I9XX(dev) && !IS_I915G(dev) && !IS_I915GM(dev)) {
 +              if (dev->mode_config.num_connector)
 +                      dev_priv->irq_mask_reg &= ~I915_DISPLAY_PORT_INTERRUPT;
 +      } else {
 +              if (dev->mode_config.num_connector)
 +                      dev_priv->irq_mask_reg &= ~I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
 +
 +              /* Enable global interrupts for hotplug - not a pipeA event */
 +              I915_WRITE(PIPEASTAT, I915_READ(PIPEASTAT) |
 +                         PIPE_HOTPLUG_INTERRUPT_ENABLE |
 +                         PIPE_HOTPLUG_TV_INTERRUPT_ENABLE |
 +                         PIPE_HOTPLUG_TV_INTERRUPT_STATUS |
 +                         PIPE_HOTPLUG_INTERRUPT_STATUS);
 +      }
 +
 +      if (!(dev_priv->irq_mask_reg & I915_DISPLAY_PORT_INTERRUPT) ||
 +          !(dev_priv->irq_mask_reg & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT)) {
 +              u32 temp = 0;
 +
 +              if (IS_I9XX(dev) && !IS_I915G(dev) && !IS_I915GM(dev)) {
 +                      temp = I915_READ(PORT_HOTPLUG_EN);
 +
 +                      /* Activate the CRT */
 +                      temp |= CRT_HOTPLUG_INT_EN;
 +              }
 +
 +              if (IS_I9XX(dev)) {
 +                      /* SDVOB */
 +                      o = intel_sdvo_find(dev, 1);
 +                      if (o && intel_sdvo_supports_hotplug(o)) {
 +                              intel_sdvo_set_hotplug(o, 1);
 +                              temp |= SDVOB_HOTPLUG_INT_EN;
 +                      }
 +
 +                      /* SDVOC */
 +                      o = intel_sdvo_find(dev, 0);
 +                      if (o && intel_sdvo_supports_hotplug(o)) {
 +                              intel_sdvo_set_hotplug(o, 1);
 +                              temp |= SDVOC_HOTPLUG_INT_EN;
 +                      }
 +
 +                      I915_WRITE(SDVOB, I915_READ(SDVOB) | SDVO_INTERRUPT_ENABLE);
 +                      I915_WRITE(SDVOC, I915_READ(SDVOC) | SDVO_INTERRUPT_ENABLE);
 +
 +                      /* TV */
 +                      I915_WRITE(TV_DAC, I915_READ(TV_DAC) | TVDAC_STATE_CHG_EN);
 +              } else {
 +                      /* DVO ???? */
 +              }
 +
 +              if (IS_I9XX(dev) && !IS_I915G(dev) && !IS_I915GM(dev)) {
 +                      I915_WRITE(PORT_HOTPLUG_EN, temp);
 +
 +                      DRM_DEBUG("HEN %08x\n",I915_READ(PORT_HOTPLUG_EN));
 +                      DRM_DEBUG("HST %08x\n",I915_READ(PORT_HOTPLUG_STAT));
 +
 +                      I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
 +              }
 +      }
  
 -      I915_WRITE(IER, dev_priv->irq_enable_reg);
+ #ifdef __linux__
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,25)
+       opregion_enable_asle(dev);
+ #endif
+ #endif
 +      I915_WRITE(IMR, dev_priv->irq_mask_reg);
 +      I915_WRITE(IER, I915_INTERRUPT_ENABLE_MASK);
 +      (void) I915_READ (IER);
++
        dev_priv->irq_enabled = 1;
  }
  
  int i915_vblank_pipe_set(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
-       struct drm_i915_vblank_pipe *pipe = data;
  
        if (!dev_priv) {
                DRM_ERROR("called with no initialization\n");
                return -EINVAL;
        }
  
-       if (pipe->pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) {
-               DRM_ERROR("called with invalid pipe 0x%x\n", pipe->pipe);
-               return -EINVAL;
-       }
-       dev_priv->vblank_pipe = pipe->pipe;
        return 0;
  }
  
  int i915_vblank_pipe_get(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -      drm_i915_vblank_pipe_t *pipe = data;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_vblank_pipe *pipe = data;
 +      u32 flag = 0;
  
        if (!dev_priv) {
                DRM_ERROR("called with no initialization\n");
                return -EINVAL;
        }
  
 -      pipe->pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
 +      if (dev_priv->irq_enabled)
 +          flag = ~dev_priv->irq_mask_reg;
 +
 +      pipe->pipe = 0;
 +      if (flag & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT)
 +              pipe->pipe |= DRM_I915_VBLANK_PIPE_A;
 +      if (flag & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT)
 +              pipe->pipe |= DRM_I915_VBLANK_PIPE_B;
  
        return 0;
  }
  int i915_vblank_swap(struct drm_device *dev, void *data,
                     struct drm_file *file_priv)
  {
 -      drm_i915_private_t *dev_priv = dev->dev_private;
 -      drm_i915_vblank_swap_t *swap = data;
 -      drm_i915_vbl_swap_t *vbl_swap;
 +      struct drm_i915_private *dev_priv = dev->dev_private;
 +      struct drm_i915_master_private *master_priv;
 +      struct drm_i915_vblank_swap *swap = data;
 +      struct drm_i915_vbl_swap *vbl_swap;
        unsigned int pipe, seqtype, curseq, plane;
        unsigned long irqflags;
        struct list_head *list;
                return -EINVAL;
        }
  
 -      if (!dev_priv->sarea_priv || dev_priv->sarea_priv->rotation) {
 +      if (!dev->primary->master)
 +              return -EINVAL;
 +
 +      master_priv = dev->primary->master->driver_priv;
 +
 +      if (master_priv->sarea_priv->rotation) {
                DRM_DEBUG("Rotation not supported\n");
                return -EINVAL;
        }
  
        DRM_SPINUNLOCK_IRQRESTORE(&dev->drw_lock, irqflags);
  
-       drm_update_vblank_count(dev, pipe);
+       /*
+        * We take the ref here and put it when the swap actually completes
+        * in the tasklet.
+        */
+       ret = drm_vblank_get(dev, pipe);
+       if (ret)
+               return ret;
        curseq = drm_vblank_count(dev, pipe);
  
        if (seqtype == _DRM_VBLANK_RELATIVE)
                        swap->sequence = curseq + 1;
                } else {
                        DRM_DEBUG("Missed target sequence\n");
+                       drm_vblank_put(dev, pipe);
                        return -EINVAL;
                }
        }
                                    irqflags);
                                DRM_DEBUG("Invalid drawable ID %d\n",
                                          swap->drawable);
+                               drm_vblank_put(dev, pipe);
                                return -EINVAL;
                        }
  
  
                        DRM_SPINUNLOCK_IRQRESTORE(&dev->drw_lock, irqflags);
  
+                       drm_vblank_put(dev, pipe);
                        return 0;
                }
        }
        DRM_SPINLOCK_IRQSAVE(&dev_priv->swaps_lock, irqflags);
  
        list_for_each(list, &dev_priv->vbl_swaps.head) {
 -              vbl_swap = list_entry(list, drm_i915_vbl_swap_t, head);
 +              vbl_swap = list_entry(list, struct drm_i915_vbl_swap, head);
  
                if (vbl_swap->drw_id == swap->drawable &&
                    vbl_swap->plane == plane &&
  
        if (dev_priv->swaps_pending >= 100) {
                DRM_DEBUG("Too many swaps queued\n");
+               drm_vblank_put(dev, pipe);
                return -EBUSY;
        }
  
  
        if (!vbl_swap) {
                DRM_ERROR("Failed to allocate memory to queue swap\n");
+               drm_vblank_put(dev, pipe);
                return -ENOMEM;
        }
  
        DRM_DEBUG("\n");
  
-       ret = drm_vblank_get(dev, pipe);
-       if (ret) {
-               drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
-               return ret;
-       }
        vbl_swap->drw_id = swap->drawable;
        vbl_swap->plane = plane;
        vbl_swap->sequence = swap->sequence;
        vbl_swap->flip = (swap->seqtype & _DRM_VBLANK_FLIP);
 +      vbl_swap->minor = file_priv->minor;
  
        if (vbl_swap->flip)
                swap->sequence++;
  */
  void i915_driver_irq_preinstall(struct drm_device * dev)
  {
-       struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
-       u32 tmp;
-       tmp = I915_READ(PIPEASTAT);
-       I915_WRITE(PIPEASTAT, tmp);
-       tmp = I915_READ(PIPEBSTAT);
-       I915_WRITE(PIPEBSTAT, tmp);
-       atomic_set(&dev_priv->irq_received, 0);
-       I915_WRITE(HWSTAM, 0xffff);
-       I915_WRITE(IER, 0x0);
-       I915_WRITE(IMR, 0xffffffff);
-       I915_WRITE(IIR, 0xffffffff);
-       (void) I915_READ(IIR);
+       return;
  }
  
  int i915_driver_irq_postinstall(struct drm_device * dev)
  {
-       struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
-       int ret, num_pipes = 2;
-       DRM_SPININIT(&dev_priv->swaps_lock, "swap");
-       INIT_LIST_HEAD(&dev_priv->vbl_swaps.head);
-       dev_priv->swaps_pending = 0;
-       DRM_SPININIT(&dev_priv->user_irq_lock, "userirq");
-       dev_priv->user_irq_refcount = 0;
-       dev_priv->irq_mask_reg = ~0;
-       ret = drm_vblank_init(dev, num_pipes);
-       if (ret)
-               return ret;
-       ret = drm_hotplug_init(dev);
-       if (ret)
-               return ret;
-       dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
-       i915_enable_interrupt(dev);
-       DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
-       /*
-        * Initialize the hardware status page IRQ location.
-        */
-       I915_WRITE(INSTPM, (1 << 5) | (1 << 21));
        return 0;
  }
  
  void i915_driver_irq_uninstall(struct drm_device * dev)
  {
-       struct drm_i915_private *dev_priv = (struct drm_i915_private *) dev->dev_private;
-       u32 temp;
-       if (!dev_priv)
-               return;
-       dev_priv->irq_enabled = 1;
-       temp = I915_READ(PIPEASTAT);
-       I915_WRITE(PIPEASTAT, temp);
-       temp = I915_READ(PIPEBSTAT);
-       I915_WRITE(PIPEBSTAT, temp);
-       if (IS_I9XX(dev) && !IS_I915G(dev) && !IS_I915GM(dev)) {
-               I915_WRITE(HWSTAM, 0xffffffff);
-               I915_WRITE(IMR, 0xffffffff);
-               I915_WRITE(IER, 0x0);
-               temp = I915_READ(IIR);
-               I915_WRITE(IIR, temp);
-       } else {
-               I915_WRITE16(HWSTAM, 0xffff);
-               I915_WRITE16(IMR, 0xffff);
-               I915_WRITE16(IER, 0x0);
-               temp = I915_READ16(IIR);
-               I915_WRITE16(IIR, temp);
-       }
+       return;
  }
@@@ -34,9 -34,7 +34,8 @@@
  #include "drm.h"
  #include "drm_sarea.h"
  #include "nouveau_drv.h"
 +#include "nv50_kms_wrapper.h"
  
  static struct mem_block *
  split_block(struct mem_block *p, uint64_t start, uint64_t size,
            struct drm_file *file_priv)
@@@ -122,17 -120,6 +121,17 @@@ static struct mem_block *find_block(str
        return NULL;
  }
  
 +struct mem_block *find_block_by_handle(struct mem_block *heap, drm_handle_t handle)
 +{
 +      struct mem_block *p;
 +
 +      list_for_each(p, heap)
 +              if (p->map_handle == handle)
 +                      return p;
 +
 +      return NULL;
 +}
 +
  void nouveau_mem_free_block(struct mem_block *p)
  {
        p->file_priv = NULL;
@@@ -747,30 -734,6 +746,30 @@@ void nouveau_mem_free(struct drm_device
  
        DRM_DEBUG("freeing 0x%llx type=0x%08x\n", block->start, block->flags);
  
 +      /* Check if the deallocations cause problems for our modesetting system. */
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +              if (dev_priv->card_type >= NV_50) {
 +                      struct nv50_crtc *crtc = NULL;
 +                      struct nv50_display *display = nv50_get_display(dev);
 +
 +                      list_for_each_entry(crtc, &display->crtcs, item) {
 +                              if (crtc->fb->block == block) {
 +                                      crtc->fb->block = NULL;
 +
 +                                      if (!crtc->blanked)
 +                                              crtc->blank(crtc, true);
 +                              }
 +
 +                              if (crtc->cursor->block == block) {
 +                                      crtc->cursor->block = NULL;
 +
 +                                      if (crtc->cursor->visible)
 +                                              crtc->cursor->hide(crtc);
 +                              }
 +                      }
 +              }
 +      }
 +
        if (block->flags&NOUVEAU_MEM_MAPPED)
                drm_rmmap(dev, block->map);
  
@@@ -77,6 -77,9 +77,9 @@@ static int r300_emit_cliprects(drm_rade
                                return -EFAULT;
                        }
  
+                       box.x2--; /* Hardware expects inclusive bottom-right corner */
+                       box.y2--;
                        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) {
                                box.x1 = (box.x1) &
                                        R300_CLIPRECT_MASK;
@@@ -95,8 -98,8 +98,8 @@@
                                        R300_CLIPRECT_MASK;
                                box.y2 = (box.y2 + R300_CLIPRECT_OFFSET) &
                                        R300_CLIPRECT_MASK;
                        }
                        OUT_RING((box.x1 << R300_CLIPRECT_X_SHIFT) |
                                 (box.y1 << R300_CLIPRECT_Y_SHIFT));
                        OUT_RING((box.x2 << R300_CLIPRECT_X_SHIFT) |
                ADVANCE_RING();
        }
  
+       /* flus cache and wait idle clean after cliprect change */
+       BEGIN_RING(2);
+       OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+       OUT_RING(R300_RB3D_DC_FLUSH);
+       ADVANCE_RING();
+       BEGIN_RING(2);
+       OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+       OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+       ADVANCE_RING();
+       /* set flush flag */
+       dev_priv->track_flush |= RADEON_FLUSH_EMITED;
        return 0;
  }
  
@@@ -166,13 -181,13 +181,13 @@@ void r300_init_reg_flags(struct drm_dev
        ADD_RANGE(0x21DC, 1);
        ADD_RANGE(R300_VAP_UNKNOWN_221C, 1);
        ADD_RANGE(R300_VAP_CLIP_X_0, 4);
-       ADD_RANGE(R300_VAP_PVS_WAITIDLE, 1);
+       ADD_RANGE(R300_VAP_PVS_STATE_FLUSH_REG, 1);
        ADD_RANGE(R300_VAP_UNKNOWN_2288, 1);
        ADD_RANGE(R300_VAP_OUTPUT_VTX_FMT_0, 2);
        ADD_RANGE(R300_VAP_PVS_CNTL_1, 3);
        ADD_RANGE(R300_GB_ENABLE, 1);
        ADD_RANGE(R300_GB_MSPOS0, 5);
-       ADD_RANGE(R300_TX_CNTL, 1);
+       ADD_RANGE(R300_TX_INVALTAGS, 1);
        ADD_RANGE(R300_TX_ENABLE, 1);
        ADD_RANGE(0x4200, 4);
        ADD_RANGE(0x4214, 1);
        ADD_RANGE(0x42C0, 2);
        ADD_RANGE(R300_RS_CNTL_0, 2);
  
-       ADD_RANGE(0x43A4, 2);
+       ADD_RANGE(R300_SC_HYPERZ, 2);
        ADD_RANGE(0x43E8, 1);
  
        ADD_RANGE(0x46A4, 5);
        ADD_RANGE(0x4E50, 9);
        ADD_RANGE(0x4E88, 1);
        ADD_RANGE(0x4EA0, 2);
-       ADD_RANGE(R300_RB3D_ZSTENCIL_CNTL_0, 3);
-       ADD_RANGE(R300_RB3D_ZSTENCIL_FORMAT, 4);
-       ADD_RANGE_MARK(R300_RB3D_DEPTHOFFSET, 1, MARK_CHECK_OFFSET);    /* check offset */
-       ADD_RANGE(R300_RB3D_DEPTHPITCH, 1);
-       ADD_RANGE(0x4F28, 1);
-       ADD_RANGE(0x4F30, 2);
-       ADD_RANGE(0x4F44, 1);
-       ADD_RANGE(0x4F54, 1);
+       ADD_RANGE(R300_ZB_CNTL, 3);
+       ADD_RANGE(R300_ZB_FORMAT, 4);
+       ADD_RANGE_MARK(R300_ZB_DEPTHOFFSET, 1, MARK_CHECK_OFFSET);      /* check offset */
+       ADD_RANGE(R300_ZB_DEPTHPITCH, 1);
+       ADD_RANGE(R300_ZB_DEPTHCLEARVALUE, 1);
+       ADD_RANGE(R300_ZB_ZMASK_OFFSET, 13);
  
        ADD_RANGE(R300_TX_FILTER_0, 16);
        ADD_RANGE(R300_TX_FILTER1_0, 16);
        ADD_RANGE(R300_TX_BORDER_COLOR_0, 16);
  
        /* Sporadic registers used as primitives are emitted */
-       ADD_RANGE(R300_RB3D_ZCACHE_CTLSTAT, 1);
+       ADD_RANGE(R300_ZB_ZCACHE_CTLSTAT, 1);
        ADD_RANGE(R300_RB3D_DSTCACHE_CTLSTAT, 1);
        ADD_RANGE(R300_VAP_INPUT_ROUTE_0_0, 8);
        ADD_RANGE(R300_VAP_INPUT_ROUTE_1_0, 8);
                ADD_RANGE(R500_RS_INST_0, 16);
                ADD_RANGE(R500_RB3D_COLOR_CLEAR_VALUE_AR, 2);
                ADD_RANGE(R500_RB3D_CONSTANT_COLOR_AR, 2);
+               ADD_RANGE(R500_ZB_FIFO_SIZE, 2);
        } else {
                ADD_RANGE(R300_PFS_CNTL_0, 3);
                ADD_RANGE(R300_PFS_NODE_0, 4);
@@@ -390,15 -404,28 +404,28 @@@ static __inline__ int r300_emit_vpu(drm
        if (sz * 16 > cmdbuf->bufsz)
                return -EINVAL;
  
-       BEGIN_RING(5 + sz * 4);
-       /* Wait for VAP to come to senses.. */
-       /* there is no need to emit it multiple times, (only once before VAP is programmed,
-          but this optimization is for later */
-       OUT_RING_REG(R300_VAP_PVS_WAITIDLE, 0);
+       /* VAP is very sensitive so we purge cache before we program it
+        * and we also flush its state before & after */
+       BEGIN_RING(6);
+       OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+       OUT_RING(R300_RB3D_DC_FLUSH);
+       OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+       OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+       OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0));
+       OUT_RING(0);
+       ADVANCE_RING();
+       /* set flush flag */
+       dev_priv->track_flush |= RADEON_FLUSH_EMITED;
+       BEGIN_RING(3 + sz * 4);
        OUT_RING_REG(R300_VAP_PVS_UPLOAD_ADDRESS, addr);
        OUT_RING(CP_PACKET0_TABLE(R300_VAP_PVS_UPLOAD_DATA, sz * 4 - 1));
        OUT_RING_TABLE((int *)cmdbuf->buf, sz * 4);
+       ADVANCE_RING();
  
+       BEGIN_RING(2);
+       OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0));
+       OUT_RING(0);
        ADVANCE_RING();
  
        cmdbuf->buf += sz * 16;
@@@ -426,6 -453,15 +453,15 @@@ static __inline__ int r300_emit_clear(d
        OUT_RING_TABLE((int *)cmdbuf->buf, 8);
        ADVANCE_RING();
  
+       BEGIN_RING(4);
+       OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+       OUT_RING(R300_RB3D_DC_FLUSH);
+       OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+       OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+       ADVANCE_RING();
+       /* set flush flag */
+       dev_priv->track_flush |= RADEON_FLUSH_EMITED;
        cmdbuf->buf += 8 * 4;
        cmdbuf->bufsz -= 8 * 4;
  
@@@ -545,22 -581,23 +581,23 @@@ static __inline__ int r300_emit_bitblt_
        return 0;
  }
  
- static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,
-                                            drm_radeon_kcmd_buffer_t *cmdbuf)
+ static __inline__ int r300_emit_draw_indx_2(drm_radeon_private_t *dev_priv,
+                                           drm_radeon_kcmd_buffer_t *cmdbuf)
  {
-       u32 *cmd = (u32 *) cmdbuf->buf;
-       int count, ret;
+       u32 *cmd;
+       int count;
+       int expected_count;
        RING_LOCALS;
  
-       count=(cmd[0]>>16) & 0x3fff;
+       cmd = (u32 *) cmdbuf->buf;
+       count = (cmd[0]>>16) & 0x3fff;
+       expected_count = cmd[1] >> 16;
+       if (!(cmd[1] & R300_VAP_VF_CNTL__INDEX_SIZE_32bit))
+               expected_count = (expected_count+1)/2;
  
-       if ((cmd[1] & 0x8000ffff) != 0x80000810) {
-               DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
-               return -EINVAL;
-       }
-       ret = !radeon_check_offset(dev_priv, cmd[2]);
-       if (ret) {
-               DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
+       if (count && count != expected_count) {
+               DRM_ERROR("3D_DRAW_INDX_2: packet size %i, expected %i\n",
+                       count, expected_count);
                return -EINVAL;
        }
  
        cmdbuf->buf += (count+2)*4;
        cmdbuf->bufsz -= (count+2)*4;
  
+       if (!count) {
+               drm_r300_cmd_header_t header;
+               if (cmdbuf->bufsz < 4*4 + sizeof(header)) {
+                       DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER, but stream is too short.\n");
+                       return -EINVAL;
+               }
+               header.u = *(unsigned int *)cmdbuf->buf;
+               cmdbuf->buf += sizeof(header);
+               cmdbuf->bufsz -= sizeof(header);
+               cmd = (u32 *) cmdbuf->buf;
+               if (header.header.cmd_type != R300_CMD_PACKET3 ||
+                   header.packet3.packet != R300_CMD_PACKET3_RAW ||
+                   cmd[0] != CP_PACKET3(RADEON_CP_INDX_BUFFER, 2)) {
+                       DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER.\n");
+                       return -EINVAL;
+               }
+               if ((cmd[1] & 0x8000ffff) != 0x80000810) {
+                       DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
+                       return -EINVAL;
+               }
+               if (!radeon_check_offset(dev_priv, cmd[2])) {
+                       DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
+                       return -EINVAL;
+               }
+               if (cmd[3] != expected_count) {
+                       DRM_ERROR("INDX_BUFFER: buffer size %i, expected %i\n",
+                               cmd[3], expected_count);
+                       return -EINVAL;
+               }
+               BEGIN_RING(4);
+               OUT_RING(cmd[0]);
+               OUT_RING_TABLE((int *)(cmdbuf->buf + 4), 3);
+               ADVANCE_RING();
+               cmdbuf->buf += 4*4;
+               cmdbuf->bufsz -= 4*4;
+       }
        return 0;
  }
  
@@@ -615,11 -696,22 +696,22 @@@ static __inline__ int r300_emit_raw_pac
        case RADEON_CNTL_BITBLT_MULTI:
                return r300_emit_bitblt_multi(dev_priv, cmdbuf);
  
-       case RADEON_CP_INDX_BUFFER:     /* DRAW_INDX_2 without INDX_BUFFER seems to lock up the gpu */
-               return r300_emit_indx_buffer(dev_priv, cmdbuf);
-       case RADEON_CP_3D_DRAW_IMMD_2:  /* triggers drawing using in-packet vertex data */
-       case RADEON_CP_3D_DRAW_VBUF_2:  /* triggers drawing of vertex buffers setup elsewhere */
-       case RADEON_CP_3D_DRAW_INDX_2:  /* triggers drawing using indices to vertex buffer */
+       case RADEON_CP_INDX_BUFFER:
+               DRM_ERROR("packet3 INDX_BUFFER without preceding 3D_DRAW_INDX_2 is illegal.\n");
+               return -EINVAL;
+       case RADEON_CP_3D_DRAW_IMMD_2:
+               /* triggers drawing using in-packet vertex data */
+       case RADEON_CP_3D_DRAW_VBUF_2:
+               /* triggers drawing of vertex buffers setup elsewhere */
+               dev_priv->track_flush &= ~(RADEON_FLUSH_EMITED |
+                                          RADEON_PURGE_EMITED);
+               break;
+       case RADEON_CP_3D_DRAW_INDX_2:
+               /* triggers drawing using indices to vertex buffer */
+               /* whenever we send vertex we clear flush & purge */
+               dev_priv->track_flush &= ~(RADEON_FLUSH_EMITED |
+                                          RADEON_PURGE_EMITED);
+               return r300_emit_draw_indx_2(dev_priv, cmdbuf);
        case RADEON_WAIT_FOR_IDLE:
        case RADEON_CP_NOP:
                /* these packets are safe */
@@@ -715,16 -807,53 +807,53 @@@ static __inline__ int r300_emit_packet3
   */
  static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv)
  {
+       uint32_t cache_z, cache_3d, cache_2d;
        RING_LOCALS;
  
-       BEGIN_RING(6);
+       cache_z = R300_ZC_FLUSH;
 -      cache_2d = R300_RB2D_DC_FLUSH;
 -      cache_3d = R300_RB3D_DC_FLUSH;
++      cache_2d = R300_DC_FLUSH_2D;
++      cache_3d = R300_DC_FLUSH_3D;
+       if (!(dev_priv->track_flush & RADEON_PURGE_EMITED)) {
+               /* we can purge, primitive where draw since last purge */
+               cache_z |= R300_ZC_FREE;
 -              cache_2d |= R300_RB2D_DC_FREE;
 -              cache_3d |= R300_RB3D_DC_FREE;
++              cache_2d |= R300_DC_FREE_2D;
++              cache_3d |= R300_DC_FREE_3D;
+       }
+       /* flush & purge zbuffer */
+       BEGIN_RING(2);
+       OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0));
+       OUT_RING(cache_z);
+       ADVANCE_RING();
+       /* flush & purge 3d */
+       BEGIN_RING(2);
        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
-       OUT_RING(R300_RB3D_DSTCACHE_UNKNOWN_0A);
-       OUT_RING(CP_PACKET0(R300_RB3D_ZCACHE_CTLSTAT, 0));
-       OUT_RING(R300_RB3D_ZCACHE_UNKNOWN_03);
-       OUT_RING(CP_PACKET3(RADEON_CP_NOP, 0));
-       OUT_RING(0x0);
+       OUT_RING(cache_3d);
+       ADVANCE_RING();
+       /* flush & purge texture */
+       BEGIN_RING(2);
+       OUT_RING(CP_PACKET0(R300_TX_INVALTAGS, 0));
+       OUT_RING(0);
+       ADVANCE_RING();
+       /* FIXME: is this one really needed ? */
+       BEGIN_RING(2);
+       OUT_RING(CP_PACKET0(R300_RB3D_AARESOLVE_CTL, 0));
+       OUT_RING(0);
+       ADVANCE_RING();
+       BEGIN_RING(2);
+       OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+       OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+       ADVANCE_RING();
+       /* flush & purge 2d through E2 as RB2D will trigger lockup */
+       BEGIN_RING(4);
+       OUT_RING(CP_PACKET0(R300_DSTCACHE_CTLSTAT, 0));
+       OUT_RING(cache_2d);
+       OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+       OUT_RING(RADEON_WAIT_2D_IDLECLEAN |
+                RADEON_WAIT_HOST_IDLECLEAN);
        ADVANCE_RING();
+       /* set flush & purge flags */
+       dev_priv->track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED;
  }
  
  /**
   * The actual age emit is done by r300_do_cp_cmdbuf, which is why you must
   * be careful about how this function is called.
   */
 -static void r300_discard_buffer(struct drm_device * dev, struct drm_buf * buf)
 +static void r300_discard_buffer(struct drm_device * dev, struct drm_master *master, struct drm_buf * buf)
  {
 -      drm_radeon_private_t *dev_priv = dev->dev_private;
        drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
 +      struct drm_radeon_master_private *master_priv = master->driver_priv;
  
 -      buf_priv->age = ++dev_priv->sarea_priv->last_dispatch;
 +      buf_priv->age = ++master_priv->sarea_priv->last_dispatch;
        buf->pending = 1;
        buf->used = 0;
  }
@@@ -898,7 -1027,6 +1027,7 @@@ int r300_do_cp_cmdbuf(struct drm_devic
                      drm_radeon_kcmd_buffer_t *cmdbuf)
  {
        drm_radeon_private_t *dev_priv = dev->dev_private;
 +      struct drm_radeon_master_private *master_priv = file_priv->master->driver_priv;
        struct drm_device_dma *dma = dev->dma;
        struct drm_buf *buf = NULL;
        int emit_dispatch_age = 0;
  
        DRM_DEBUG("\n");
  
-       /* See the comment above r300_emit_begin3d for why this call must be here,
-        * and what the cleanup gotos are for. */
+       /* pacify */
        r300_pacify(dev_priv);
  
        if (cmdbuf->nbox <= R300_SIMULTANEOUS_CLIPRECTS) {
                        }
  
                        emit_dispatch_age = 1;
 -                      r300_discard_buffer(dev, buf);
 +                      r300_discard_buffer(dev, file_priv->master, buf);
                        break;
  
                case R300_CMD_WAIT:
  
                /* Emit the vertex buffer age */
                BEGIN_RING(2);
 -              RADEON_DISPATCH_AGE(dev_priv->sarea_priv->last_dispatch);
 +              RADEON_DISPATCH_AGE(master_priv->sarea_priv->last_dispatch);
                ADVANCE_RING();
        }
  
diff --combined shared-core/radeon_cp.c
@@@ -31,7 -31,6 +31,7 @@@
  
  #include "drmP.h"
  #include "drm.h"
 +#include "drm_sarea.h"
  #include "radeon_drm.h"
  #include "radeon_drv.h"
  #include "r300_reg.h"
@@@ -40,6 -39,7 +40,7 @@@
  #define RADEON_FIFO_DEBUG     0
  
  static int radeon_do_cleanup_cp(struct drm_device * dev);
+ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv);
  
  static u32 R500_READ_MCIND(drm_radeon_private_t *dev_priv, int addr)
  {
@@@ -76,23 -76,6 +77,23 @@@ static u32 IGP_READ_MCIND(drm_radeon_pr
            return RS480_READ_MCIND(dev_priv, addr);
  }
  
 +u32 radeon_read_mc_reg(drm_radeon_private_t *dev_priv, int addr)
 +{
 +        if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690)
 +              return IGP_READ_MCIND(dev_priv, addr);
 +      if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515)
 +              return R500_READ_MCIND(dev_priv, addr);
 +      return 0;
 +}
 +
 +void radeon_write_mc_reg(drm_radeon_private_t *dev_priv, u32 addr, u32 val)
 +{
 +        if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690)
 +              IGP_WRITE_MCIND(addr, val);
 +      else if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515)
 +              R500_WRITE_MCIND(addr, val);
 +}
 +
  u32 radeon_read_fb_location(drm_radeon_private_t *dev_priv)
  {
  
@@@ -144,64 -127,23 +145,68 @@@ static void radeon_write_agp_base(drm_r
        } else if ((dev_priv->flags & RADEON_FAMILY_MASK) > CHIP_RV515) {
                R500_WRITE_MCIND(R520_MC_AGP_BASE, agp_base_lo);
                R500_WRITE_MCIND(R520_MC_AGP_BASE_2, agp_base_hi);
+       } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS400) ||
+                  ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS480)) {
+               RADEON_WRITE(RADEON_AGP_BASE, agp_base_lo);
+               RADEON_WRITE(RS480_AGP_BASE_2, agp_base_hi);
        } else {
-               RADEON_WRITE(RADEON_MC_AGP_LOCATION, agp_base_lo);
+               RADEON_WRITE(RADEON_AGP_BASE, agp_base_lo);
                if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R200)
                        RADEON_WRITE(RADEON_AGP_BASE_2, agp_base_hi);
        }
  }
  
 -static int RADEON_READ_PLL(struct drm_device * dev, int addr)
 +
 +void radeon_pll_errata_after_index(struct drm_radeon_private *dev_priv)
  {
 -      drm_radeon_private_t *dev_priv = dev->dev_private;
 +      if (!(dev_priv->pll_errata & CHIP_ERRATA_PLL_DUMMYREADS))
 +              return;
  
 -      RADEON_WRITE8(RADEON_CLOCK_CNTL_INDEX, addr & 0x1f);
 -      return RADEON_READ(RADEON_CLOCK_CNTL_DATA);
 +      (void)RADEON_READ(RADEON_CLOCK_CNTL_DATA);
 +      (void)RADEON_READ(RADEON_CRTC_GEN_CNTL);
 +}
 +
 +void radeon_pll_errata_after_data(struct drm_radeon_private *dev_priv)
 +{
 +      /* This workarounds is necessary on RV100, RS100 and RS200 chips
 +       * or the chip could hang on a subsequent access
 +       */
 +      if (dev_priv->pll_errata & CHIP_ERRATA_PLL_DELAY)
 +              udelay(5000);
 +
 +      /* This function is required to workaround a hardware bug in some (all?)
 +       * revisions of the R300.  This workaround should be called after every
 +       * CLOCK_CNTL_INDEX register access.  If not, register reads afterward
 +       * may not be correct.
 +       */
 +      if (dev_priv->pll_errata & CHIP_ERRATA_R300_CG) {
 +              uint32_t save, tmp;
 +
 +              save = RADEON_READ(RADEON_CLOCK_CNTL_INDEX);
 +              tmp = save & ~(0x3f | RADEON_PLL_WR_EN);
 +              RADEON_WRITE(RADEON_CLOCK_CNTL_INDEX, tmp);
 +              tmp = RADEON_READ(RADEON_CLOCK_CNTL_DATA);
 +              RADEON_WRITE(RADEON_CLOCK_CNTL_INDEX, save);
 +      }
 +}
 +
 +int RADEON_READ_PLL(struct drm_radeon_private *dev_priv, int addr)
 +{
 +      uint32_t data;
 +
 +      RADEON_WRITE8(RADEON_CLOCK_CNTL_INDEX, addr & 0x3f);
 +      radeon_pll_errata_after_index(dev_priv);
 +      data = RADEON_READ(RADEON_CLOCK_CNTL_DATA);
 +      radeon_pll_errata_after_data(dev_priv);
 +      return data;
 +}
 +
 +void RADEON_WRITE_PLL(struct drm_radeon_private *dev_priv, int addr, uint32_t data)
 +{
 +      RADEON_WRITE8(RADEON_CLOCK_CNTL_INDEX, ((addr & 0x3f) | RADEON_PLL_WR_EN));
 +      radeon_pll_errata_after_index(dev_priv);
 +      RADEON_WRITE(RADEON_CLOCK_CNTL_DATA, data);
 +      radeon_pll_errata_after_data(dev_priv);
  }
  
  static u32 RADEON_READ_PCIE(drm_radeon_private_t *dev_priv, int addr)
        return RADEON_READ(RADEON_PCIE_DATA);
  }
  
 +/* ATOM accessor methods */
 +static uint32_t cail_mc_read(struct card_info *info, uint32_t reg)
 +{
 +      uint32_t ret = radeon_read_mc_reg(info->dev->dev_private, reg);
 +
 +      //      DRM_DEBUG("(%x) = %x\n", reg, ret);
 +      return ret;
 +}
 +
 +static void cail_mc_write(struct card_info *info, uint32_t reg, uint32_t val)
 +{
 +  //  DRM_DEBUG("(%x,  %x)\n", reg, val);
 +      radeon_write_mc_reg(info->dev->dev_private, reg, val);
 +}
 +
 +static void cail_reg_write(struct card_info *info, uint32_t reg, uint32_t val)
 +{
 +      drm_radeon_private_t *dev_priv = info->dev->dev_private;
 +      
 +      //      DRM_DEBUG("(%x,  %x)\n", reg*4, val);
 +      RADEON_WRITE(reg*4, val);
 +}
 +
 +static uint32_t cail_reg_read(struct card_info *info, uint32_t reg)
 +{
 +      uint32_t ret;
 +      drm_radeon_private_t *dev_priv = info->dev->dev_private;
 +
 +      ret = RADEON_READ(reg*4);
 +      //      DRM_DEBUG("(%x) = %x\n", reg*4, ret);
 +      return ret;
 +}
 +
  #if RADEON_FIFO_DEBUG
  static void radeon_status(drm_radeon_private_t * dev_priv)
  {
@@@ -290,23 -199,8 +295,8 @@@ static int radeon_do_pixcache_flush(drm
                        DRM_UDELAY(1);
                }
        } else {
-               /* 3D */
-               tmp = RADEON_READ(R300_RB3D_DSTCACHE_CTLSTAT);
-               tmp |= RADEON_RB3D_DC_FLUSH_ALL;
-               RADEON_WRITE(R300_RB3D_DSTCACHE_CTLSTAT, tmp);
-               /* 2D */
-               tmp = RADEON_READ(RADEON_RB2D_DSTCACHE_CTLSTAT);
-               tmp |= RADEON_RB3D_DC_FLUSH_ALL;
-               RADEON_WRITE(RADEON_RB3D_DSTCACHE_CTLSTAT, tmp);
-               for (i = 0; i < dev_priv->usec_timeout; i++) {
-                       if (!(RADEON_READ(RADEON_RB2D_DSTCACHE_CTLSTAT)
-                         & RADEON_RB3D_DC_BUSY)) {
-                               return 0;
-                       }
-                       DRM_UDELAY(1);
-               }
+               /* don't flush or purge cache here or lockup */
+               return 0;
        }
  
  #if RADEON_FIFO_DEBUG
@@@ -329,6 -223,9 +319,9 @@@ static int radeon_do_wait_for_fifo(drm_
                        return 0;
                DRM_UDELAY(1);
        }
+       DRM_INFO("wait for fifo failed status : 0x%08X 0x%08X\n",
+                RADEON_READ(RADEON_RBBM_STATUS),
+                RADEON_READ(R300_VAP_CNTL_STATUS));
  
  #if RADEON_FIFO_DEBUG
        DRM_ERROR("failed!\n");
@@@ -355,6 -252,9 +348,9 @@@ static int radeon_do_wait_for_idle(drm_
                }
                DRM_UDELAY(1);
        }
+       DRM_INFO("wait idle failed status : 0x%08X 0x%08X\n",
+                RADEON_READ(RADEON_RBBM_STATUS),
+                RADEON_READ(R300_VAP_CNTL_STATUS));
  
  #if RADEON_FIFO_DEBUG
        DRM_ERROR("failed!\n");
@@@ -394,7 -294,7 +390,7 @@@ static void radeon_init_pipes(drm_radeo
        }
  
        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) {
 -              RADEON_WRITE_PLL(R500_DYN_SCLK_PWMEM_PIPE, (1 | ((gb_pipe_sel >> 8) & 0xf) << 4));
 +              RADEON_WRITE_PLL(dev_priv, R500_DYN_SCLK_PWMEM_PIPE, (1 | ((gb_pipe_sel >> 8) & 0xf) << 4));
                RADEON_WRITE(R500_SU_REG_DEST, ((1 << dev_priv->num_gb_pipes) - 1));
        }
        RADEON_WRITE(R300_GB_TILE_CONFIG, gb_tile_config);
@@@ -448,6 -348,7 +444,7 @@@ static void radeon_cp_load_microcode(dr
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_R350) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV350) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV380) ||
+                  ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS400) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS480)) {
                DRM_INFO("Loading R300 Microcode\n");
                for (i = 0; i < 256; i++) {
@@@ -536,14 -437,20 +533,20 @@@ static void radeon_do_cp_start(drm_rade
  
        dev_priv->cp_running = 1;
  
-       BEGIN_RING(6);
+       BEGIN_RING(8);
+       /* isync can only be written through cp on r5xx write it here */
+       OUT_RING(CP_PACKET0(RADEON_ISYNC_CNTL, 0));
+       OUT_RING(RADEON_ISYNC_ANY2D_IDLE3D |
+                RADEON_ISYNC_ANY3D_IDLE2D |
+                RADEON_ISYNC_WAIT_IDLEGUI |
+                RADEON_ISYNC_CPSCRATCH_IDLEGUI);
        RADEON_PURGE_CACHE();
        RADEON_PURGE_ZCACHE();
        RADEON_WAIT_UNTIL_IDLE();
        ADVANCE_RING();
        COMMIT_RING();
+       dev_priv->track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED;
  }
  
  /* Reset the Command Processor.  This will not flush any pending
@@@ -587,15 -494,15 +590,15 @@@ static int radeon_do_engine_reset(struc
        if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV410) {
                /* may need something similar for newer chips */
                clock_cntl_index = RADEON_READ(RADEON_CLOCK_CNTL_INDEX);
 -              mclk_cntl = RADEON_READ_PLL(dev, RADEON_MCLK_CNTL);
 -
 -              RADEON_WRITE_PLL(RADEON_MCLK_CNTL, (mclk_cntl |
 -                                                  RADEON_FORCEON_MCLKA |
 -                                                  RADEON_FORCEON_MCLKB |
 -                                                  RADEON_FORCEON_YCLKA |
 -                                                  RADEON_FORCEON_YCLKB |
 -                                                  RADEON_FORCEON_MC |
 -                                                  RADEON_FORCEON_AIC));
 +              mclk_cntl = RADEON_READ_PLL(dev_priv, RADEON_MCLK_CNTL);
 +
 +              RADEON_WRITE_PLL(dev_priv, RADEON_MCLK_CNTL, (mclk_cntl |
 +                                                            RADEON_FORCEON_MCLKA |
 +                                                            RADEON_FORCEON_MCLKB |
 +                                                            RADEON_FORCEON_YCLKA |
 +                                                            RADEON_FORCEON_YCLKB |
 +                                                            RADEON_FORCEON_MC |
 +                                                            RADEON_FORCEON_AIC));
        }
  
        rbbm_soft_reset = RADEON_READ(RADEON_RBBM_SOFT_RESET);
        RADEON_READ(RADEON_RBBM_SOFT_RESET);
  
        if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV410) {
 -              RADEON_WRITE_PLL(RADEON_MCLK_CNTL, mclk_cntl);
 +              RADEON_WRITE_PLL(dev_priv, RADEON_MCLK_CNTL, mclk_cntl);
                RADEON_WRITE(RADEON_CLOCK_CNTL_INDEX, clock_cntl_index);
                RADEON_WRITE(RADEON_RBBM_SOFT_RESET, rbbm_soft_reset);
        }
        dev_priv->cp_running = 0;
  
        /* Reset any pending vertex, indirect buffers */
 -      radeon_freelist_reset(dev);
 +      if (dev->dma)
 +              radeon_freelist_reset(dev);
  
        return 0;
  }
@@@ -655,13 -561,9 +658,13 @@@ static void radeon_cp_init_ring_buffer(
         */
        if (!dev_priv->new_memmap)
                radeon_write_fb_location(dev_priv,
 -                           ((dev_priv->gart_vm_start - 1) & 0xffff0000)
 -                           | (dev_priv->fb_location >> 16));
 -
 +                                       ((dev_priv->gart_vm_start - 1) & 0xffff0000)
 +                                       | (dev_priv->fb_location >> 16));
 +      
 +      if (dev_priv->mm.ring) {
 +              ring_start = dev_priv->mm.ring->offset +
 +                      dev_priv->gart_vm_start;
 +      } else
  #if __OS_HAS_AGP
        if (dev_priv->flags & RADEON_IS_AGP) {
                radeon_write_agp_base(dev_priv, dev->agp->base);
        SET_RING_HEAD(dev_priv, cur_read_ptr);
        dev_priv->ring.tail = cur_read_ptr;
  
 +
 +      if (dev_priv->mm.ring_read_ptr) {
 +              RADEON_WRITE(RADEON_CP_RB_RPTR_ADDR,
 +                           dev_priv->mm.ring_read_ptr->offset +
 +                           dev_priv->gart_vm_start);
 +      } else
  #if __OS_HAS_AGP
        if (dev_priv->flags & RADEON_IS_AGP) {
                RADEON_WRITE(RADEON_CP_RB_RPTR_ADDR,
        RADEON_WRITE(RADEON_SCRATCH_ADDR, RADEON_READ(RADEON_CP_RB_RPTR_ADDR)
                     + RADEON_SCRATCH_REG_OFFSET);
  
 -      dev_priv->scratch = ((__volatile__ u32 *)
 -                           dev_priv->ring_rptr->handle +
 -                           (RADEON_SCRATCH_REG_OFFSET / sizeof(u32)));
 +      if (dev_priv->mm.ring_read_ptr)
 +              dev_priv->scratch = ((__volatile__ u32 *)
 +                                   dev_priv->mm.ring_read_ptr_map.virtual +
 +                                   (RADEON_SCRATCH_REG_OFFSET / sizeof(u32)));
 +      else
 +              dev_priv->scratch = ((__volatile__ u32 *)
 +                                   dev_priv->ring_rptr->handle +
 +                                   (RADEON_SCRATCH_REG_OFFSET / sizeof(u32)));
  
        RADEON_WRITE(RADEON_SCRATCH_UMSK, 0x7);
  
        tmp = RADEON_READ(RADEON_BUS_CNTL) & ~RADEON_BUS_MASTER_DIS;
        RADEON_WRITE(RADEON_BUS_CNTL, tmp);
  
 -      dev_priv->sarea_priv->last_frame = dev_priv->scratch[0] = 0;
 -      RADEON_WRITE(RADEON_LAST_FRAME_REG, dev_priv->sarea_priv->last_frame);
 +      dev_priv->scratch[0] = 0;
 +      RADEON_WRITE(RADEON_LAST_FRAME_REG, 0);
  
 -      dev_priv->sarea_priv->last_dispatch = dev_priv->scratch[1] = 0;
 -      RADEON_WRITE(RADEON_LAST_DISPATCH_REG,
 -                   dev_priv->sarea_priv->last_dispatch);
 +      dev_priv->scratch[1] = 0;
 +      RADEON_WRITE(RADEON_LAST_DISPATCH_REG, 0);
  
 -      dev_priv->sarea_priv->last_clear = dev_priv->scratch[2] = 0;
 -      RADEON_WRITE(RADEON_LAST_CLEAR_REG, dev_priv->sarea_priv->last_clear);
 +      dev_priv->scratch[2] = 0;
 +      RADEON_WRITE(RADEON_LAST_CLEAR_REG, 0);
  
        radeon_do_wait_for_idle(dev_priv);
  
  static void radeon_test_writeback(drm_radeon_private_t * dev_priv)
  {
        u32 tmp;
 +      void *ring_read_ptr;
 +
 +      if (dev_priv->mm.ring_read_ptr)
 +              ring_read_ptr = dev_priv->mm.ring_read_ptr_map.virtual;
 +      else
 +              ring_read_ptr = dev_priv->ring_rptr->handle;
  
        /* Writeback doesn't seem to work everywhere, test it here and possibly
         * enable it if it appears to work
         */
 -      DRM_WRITE32(dev_priv->ring_rptr, RADEON_SCRATCHOFF(1), 0);
 +      writel(0, ring_read_ptr + RADEON_SCRATCHOFF(1));
        RADEON_WRITE(RADEON_SCRATCH_REG1, 0xdeadbeef);
  
        for (tmp = 0; tmp < dev_priv->usec_timeout; tmp++) {
 -              if (DRM_READ32(dev_priv->ring_rptr, RADEON_SCRATCHOFF(1)) ==
 +              if (readl(ring_read_ptr + RADEON_SCRATCHOFF(1)) ==
                    0xdeadbeef)
                        break;
                DRM_UDELAY(1);
@@@ -858,14 -744,7 +861,7 @@@ static void radeon_set_igpgart(drm_rade
                IGP_WRITE_MCIND(RS480_AGP_MODE_CNTL, ((1 << RS480_REQ_TYPE_SNOOP_SHIFT) |
                                                      RS480_REQ_TYPE_SNOOP_DIS));
  
-               if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) {
-                       IGP_WRITE_MCIND(RS690_MC_AGP_BASE,
-                                       (unsigned int)dev_priv->gart_vm_start);
-                       IGP_WRITE_MCIND(RS690_MC_AGP_BASE_2, 0);
-               } else {
-                       RADEON_WRITE(RADEON_AGP_BASE, (unsigned int)dev_priv->gart_vm_start);
-                       RADEON_WRITE(RS480_AGP_BASE_2, 0);
-               }
+               radeon_write_agp_base(dev_priv, dev_priv->gart_vm_start);
  
                dev_priv->gart_size = 32*1024*1024;
                temp = (((dev_priv->gart_vm_start - 1 + dev_priv->gart_size) & 
@@@ -930,7 -809,7 +926,7 @@@ static void radeon_set_pciegart(drm_rad
  }
  
  /* Enable or disable PCI GART on the chip */
 -static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
 +void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
  {
        u32 tmp;
  
        }
  }
  
 -static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
 +static int radeon_do_init_cp(struct drm_device *dev, drm_radeon_init_t *init,
 +                           struct drm_file *file_priv)
  {
        drm_radeon_private_t *dev_priv = dev->dev_private;
 +      struct drm_radeon_master_private *master_priv = file_priv->master->driver_priv;
  
        DRM_DEBUG("\n");
  
        dev_priv->depth_clear.rb3d_cntl = (RADEON_PLANE_MASK_ENABLE |
                                           (dev_priv->color_fmt << 10) |
                                           (dev_priv->chip_family < CHIP_R200 ? RADEON_ZBLOCK16 : 0));
-       
        dev_priv->depth_clear.rb3d_zstencilcntl =
            (dev_priv->depth_fmt |
             RADEON_Z_TEST_ALWAYS |
        dev_priv->buffers_offset = init->buffers_offset;
        dev_priv->gart_textures_offset = init->gart_textures_offset;
  
 -      dev_priv->sarea = drm_getsarea(dev);
 -      if (!dev_priv->sarea) {
 +      master_priv->sarea = drm_getsarea(dev);
 +      if (!master_priv->sarea) {
                DRM_ERROR("could not find sarea!\n");
                radeon_do_cleanup_cp(dev);
                return -EINVAL;
                }
        }
  
 -      dev_priv->sarea_priv =
 -          (drm_radeon_sarea_t *) ((u8 *) dev_priv->sarea->handle +
 -                                  init->sarea_priv_offset);
 -
  #if __OS_HAS_AGP
        if (dev_priv->flags & RADEON_IS_AGP) {
                drm_core_ioremap(dev_priv->cp_ring, dev);
                dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
                /* if we have an offset set from userspace */
                if (dev_priv->pcigart_offset_set) {
 -                      dev_priv->gart_info.bus_addr =
 -                          dev_priv->pcigart_offset + dev_priv->fb_location;
 -                      dev_priv->gart_info.mapping.offset =
 -                          dev_priv->pcigart_offset + dev_priv->fb_aper_offset;
 -                      dev_priv->gart_info.mapping.size =
 -                          dev_priv->gart_info.table_size;
 -
 -                      drm_core_ioremap_wc(&dev_priv->gart_info.mapping, dev);
 -                      dev_priv->gart_info.addr =
 -                          dev_priv->gart_info.mapping.handle;
 -
 -                      if (dev_priv->flags & RADEON_IS_PCIE)
 -                              dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCIE;
 -                      else
 -                              dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCI;
 -                      dev_priv->gart_info.gart_table_location =
 -                          DRM_ATI_GART_FB;
--
 -                      DRM_DEBUG("Setting phys_pci_gart to %p %08lX\n",
 -                                dev_priv->gart_info.addr,
 -                                dev_priv->pcigart_offset);
 +                      /* if it came from userspace - remap it */
 +                      if (dev_priv->pcigart_offset_set == 1) {
 +                              dev_priv->gart_info.bus_addr =
 +                                      dev_priv->pcigart_offset + dev_priv->fb_location;
 +                              dev_priv->gart_info.mapping.offset =
 +                                      dev_priv->pcigart_offset + dev_priv->fb_aper_offset;
 +                              dev_priv->gart_info.mapping.size =
 +                                      dev_priv->gart_info.table_size;
 +                              
 +                              /* this is done by the mm now */
 +                              drm_core_ioremap(&dev_priv->gart_info.mapping, dev);
 +                              dev_priv->gart_info.addr =
 +                                      dev_priv->gart_info.mapping.handle;
 +                              
 +                              memset(dev_priv->gart_info.addr, 0, dev_priv->gart_info.table_size);
 +                              if (dev_priv->flags & RADEON_IS_PCIE)
 +                                      dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCIE;
 +                              else
 +                                      dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCI;
 +                              dev_priv->gart_info.gart_table_location =
 +                                      DRM_ATI_GART_FB;
 +                              
 +                              DRM_DEBUG("Setting phys_pci_gart to %p %08lX\n",
 +                                        dev_priv->gart_info.addr,
 +                                        dev_priv->pcigart_offset);
 +                      }
                } else {
 +
 +                      if (dev_priv->flags & RADEON_IS_PCIE) {
 +                              DRM_ERROR
 +                                  ("Cannot use PCI Express without GART in FB memory\n");
 +                              radeon_do_cleanup_cp(dev);
 +                              return -EINVAL;
 +                      }
                        if (dev_priv->flags & RADEON_IS_IGPGART)
                                dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_IGP;
                        else
                            DRM_ATI_GART_MAIN;
                        dev_priv->gart_info.addr = NULL;
                        dev_priv->gart_info.bus_addr = 0;
 -                      if (dev_priv->flags & RADEON_IS_PCIE) {
 -                              DRM_ERROR
 -                                  ("Cannot use PCI Express without GART in FB memory\n");
 -                              radeon_do_cleanup_cp(dev);
 -                              return -EINVAL;
 -                      }
 +
                }
  
                if (!drm_ati_pcigart_init(dev, &dev_priv->gart_info)) {
@@@ -1364,10 -1237,8 +1359,10 @@@ static int radeon_do_cleanup_cp(struct 
  
                if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB)
                {
 -                      drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev);
 -                      dev_priv->gart_info.addr = 0;
 +                      if (dev_priv->pcigart_offset_set == 1) {
 +                              drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev);
 +                              dev_priv->gart_info.addr = NULL;
 +                      }
                }
        }
        /* only clear to the start of flags */
@@@ -1409,6 -1280,7 +1404,7 @@@ static int radeon_do_resume_cp(struct d
        radeon_cp_init_ring_buffer(dev, dev_priv);
  
        radeon_do_engine_reset(dev);
+       radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);
  
        DRM_DEBUG("radeon_do_resume_cp() complete\n");
  
  int radeon_cp_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
  {
        drm_radeon_init_t *init = data;
 +      
 +      /* on a modesetting driver ignore this stuff */
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              return 0;
  
        LOCK_TEST_WITH_RETURN(dev, file_priv);
  
        case RADEON_INIT_CP:
        case RADEON_INIT_R200_CP:
        case RADEON_INIT_R300_CP:
 -              return radeon_do_init_cp(dev, init);
 +              return radeon_do_init_cp(dev, init, file_priv);
        case RADEON_CLEANUP_CP:
                return radeon_do_cleanup_cp(dev);
        }
@@@ -1445,9 -1313,6 +1441,9 @@@ int radeon_cp_start(struct drm_device *
        drm_radeon_private_t *dev_priv = dev->dev_private;
        DRM_DEBUG("\n");
  
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              return 0;
 +
        LOCK_TEST_WITH_RETURN(dev, file_priv);
  
        if (dev_priv->cp_running) {
@@@ -1475,9 -1340,6 +1471,9 @@@ int radeon_cp_stop(struct drm_device *d
        int ret;
        DRM_DEBUG("\n");
  
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              return 0;
 +
        LOCK_TEST_WITH_RETURN(dev, file_priv);
  
        if (!dev_priv->cp_running)
@@@ -1516,9 -1378,6 +1512,9 @@@ void radeon_do_release(struct drm_devic
        drm_radeon_private_t *dev_priv = dev->dev_private;
        int i, ret;
  
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) 
 +              return;
 +              
        if (dev_priv) {
                if (dev_priv->cp_running) {
                        /* Stop the cp */
                radeon_mem_takedown(&(dev_priv->gart_heap));
                radeon_mem_takedown(&(dev_priv->fb_heap));
  
 +
 +              radeon_gem_mm_fini(dev);
 +
                /* deallocate kernel resources */
                radeon_do_cleanup_cp(dev);
        }
@@@ -1572,9 -1428,6 +1568,9 @@@ int radeon_cp_reset(struct drm_device *
        drm_radeon_private_t *dev_priv = dev->dev_private;
        DRM_DEBUG("\n");
  
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) 
 +              return 0;
 +
        LOCK_TEST_WITH_RETURN(dev, file_priv);
  
        if (!dev_priv) {
@@@ -1595,9 -1448,7 +1591,9 @@@ int radeon_cp_idle(struct drm_device *d
        drm_radeon_private_t *dev_priv = dev->dev_private;
        DRM_DEBUG("\n");
  
 -      LOCK_TEST_WITH_RETURN(dev, file_priv);
 +      
 +      if (!drm_core_check_feature(dev, DRIVER_MODESET))
 +              LOCK_TEST_WITH_RETURN(dev, file_priv);
  
        return radeon_do_cp_idle(dev_priv);
  }
  int radeon_cp_resume(struct drm_device *dev, void *data, struct drm_file *file_priv)
  {
  
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) 
 +              return 0;
 +
        return radeon_do_resume_cp(dev);
  }
  
@@@ -1617,9 -1465,6 +1613,9 @@@ int radeon_engine_reset(struct drm_devi
  {
        DRM_DEBUG("\n");
  
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) 
 +              return 0;
 +
        LOCK_TEST_WITH_RETURN(dev, file_priv);
  
        return radeon_do_engine_reset(dev);
@@@ -1842,541 -1687,6 +1838,541 @@@ int radeon_cp_buffers(struct drm_devic
        return ret;
  }
  
 +static void radeon_get_vram_type(struct drm_device *dev)
 +{
 +      struct drm_radeon_private *dev_priv = dev->dev_private;
 +      uint32_t tmp;
 +
 +      if (dev_priv->flags & RADEON_IS_IGP || (dev_priv->chip_family >= CHIP_R300))
 +              dev_priv->is_ddr = true;
 +      else if (RADEON_READ(RADEON_MEM_SDRAM_MODE_REG) & RADEON_MEM_CFG_TYPE_DDR)
 +              dev_priv->is_ddr = true;
 +      else
 +              dev_priv->is_ddr = false;
 +
 +      if ((dev_priv->chip_family >= CHIP_R600) &&
 +          (dev_priv->chip_family <= CHIP_RV635)) {
 +              int chansize;
 +              
 +              tmp = RADEON_READ(R600_RAMCFG);
 +              if (tmp & R600_CHANSIZE_OVERRIDE)
 +                      chansize = 16;
 +              else if (tmp & R600_CHANSIZE)
 +                      chansize = 64;
 +              else
 +                      chansize = 32;
 +
 +              if (dev_priv->chip_family == CHIP_R600)
 +                      dev_priv->ram_width = 8 * chansize;
 +              else if (dev_priv->chip_family == CHIP_RV670)
 +                      dev_priv->ram_width = 4 * chansize;
 +              else if ((dev_priv->chip_family == CHIP_RV610) ||
 +                       (dev_priv->chip_family == CHIP_RV620))
 +                      dev_priv->ram_width = chansize;
 +              else if ((dev_priv->chip_family == CHIP_RV630) ||
 +                       (dev_priv->chip_family == CHIP_RV635))
 +                      dev_priv->ram_width = 2 * chansize;
 +      } else if (dev_priv->chip_family == CHIP_RV515) {
 +              tmp = radeon_read_mc_reg(dev_priv, RV515_MC_CNTL);
 +              tmp &= RV515_MEM_NUM_CHANNELS_MASK;
 +              switch (tmp) {
 +              case 0: dev_priv->ram_width = 64; break;
 +              case 1: dev_priv->ram_width = 128; break;
 +              default: dev_priv->ram_width = 128; break;
 +              }
 +      } else if ((dev_priv->chip_family >= CHIP_R520) &&
 +                 (dev_priv->chip_family <= CHIP_RV570)) {
 +              tmp = radeon_read_mc_reg(dev_priv, R520_MC_CNTL0);
 +              switch ((tmp & R520_MEM_NUM_CHANNELS_MASK) >> R520_MEM_NUM_CHANNELS_SHIFT) {
 +              case 0: dev_priv->ram_width = 32; break;
 +              case 1: dev_priv->ram_width = 64; break;
 +              case 2: dev_priv->ram_width = 128; break;
 +              case 3: dev_priv->ram_width = 256; break;
 +              default: dev_priv->ram_width = 128; break;
 +              }
 +      } else if ((dev_priv->chip_family == CHIP_RV100) ||
 +                 (dev_priv->chip_family == CHIP_RS100) ||
 +                 (dev_priv->chip_family == CHIP_RS200)) {
 +              tmp = RADEON_READ(RADEON_MEM_CNTL);
 +              if (tmp & RV100_HALF_MODE)
 +                      dev_priv->ram_width = 32;
 +              else
 +                      dev_priv->ram_width = 64;
 +
 +              if (dev_priv->flags & RADEON_SINGLE_CRTC) {
 +                      dev_priv->ram_width /= 4;
 +                      dev_priv->is_ddr = true;
 +              }
 +      } else if (dev_priv->chip_family <= CHIP_RV280) {
 +              tmp = RADEON_READ(RADEON_MEM_CNTL);
 +              if (tmp & RADEON_MEM_NUM_CHANNELS_MASK)
 +                      dev_priv->ram_width = 128;
 +              else
 +                      dev_priv->ram_width = 64;
 +      } else {
 +              /* newer IGPs */
 +              dev_priv->ram_width = 128;
 +      }
 +      DRM_DEBUG("RAM width %d bits %cDR\n", dev_priv->ram_width, dev_priv->is_ddr ? 'D' : 'S');
 +}   
 +
 +static void radeon_force_some_clocks(struct drm_device *dev)
 +{
 +      struct drm_radeon_private *dev_priv = dev->dev_private;
 +      uint32_t tmp;
 +
 +      tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_CNTL);
 +      tmp |= RADEON_SCLK_FORCE_CP | RADEON_SCLK_FORCE_VIP;
 +      RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_CNTL, tmp);
 +}
 +
 +static void radeon_set_dynamic_clock(struct drm_device *dev, int mode)
 +{
 +      struct drm_radeon_private *dev_priv = dev->dev_private;
 +      uint32_t tmp;
 +
 +      switch(mode) {
 +      case 0:
 +              if (dev_priv->flags & RADEON_SINGLE_CRTC) {
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_CNTL);
 +                      tmp |= (RADEON_SCLK_FORCE_CP   | RADEON_SCLK_FORCE_HDP |
 +                              RADEON_SCLK_FORCE_DISP1 | RADEON_SCLK_FORCE_TOP |
 +                              RADEON_SCLK_FORCE_E2   | RADEON_SCLK_FORCE_SE  |
 +                              RADEON_SCLK_FORCE_IDCT | RADEON_SCLK_FORCE_VIP |
 +                              RADEON_SCLK_FORCE_RE   | RADEON_SCLK_FORCE_PB  |
 +                              RADEON_SCLK_FORCE_TAM  | RADEON_SCLK_FORCE_TDM |
 +                              RADEON_SCLK_FORCE_RB);
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_CNTL, tmp);
 +              } else if (dev_priv->chip_family == CHIP_RV350) {
 +                      /* for RV350/M10, no delays are required. */
 +                      tmp = RADEON_READ_PLL(dev_priv, R300_SCLK_CNTL2);
 +                      tmp |= (R300_SCLK_FORCE_TCL |
 +                              R300_SCLK_FORCE_GA |
 +                              R300_SCLK_FORCE_CBA);
 +                      RADEON_WRITE_PLL(dev_priv, R300_SCLK_CNTL2, tmp);
 +
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_CNTL);
 +                      tmp &= ~(RADEON_SCLK_FORCE_DISP2 | RADEON_SCLK_FORCE_CP      |
 +                               RADEON_SCLK_FORCE_HDP   | RADEON_SCLK_FORCE_DISP1   |
 +                               RADEON_SCLK_FORCE_TOP   | RADEON_SCLK_FORCE_E2      |
 +                               R300_SCLK_FORCE_VAP     | RADEON_SCLK_FORCE_IDCT    |
 +                               RADEON_SCLK_FORCE_VIP   | R300_SCLK_FORCE_SR        |
 +                               R300_SCLK_FORCE_PX      | R300_SCLK_FORCE_TX        |
 +                               R300_SCLK_FORCE_US      | RADEON_SCLK_FORCE_TV_SCLK |
 +                               R300_SCLK_FORCE_SU      | RADEON_SCLK_FORCE_OV0);
 +                      tmp |=  RADEON_DYN_STOP_LAT_MASK;
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_CNTL, tmp);
 +
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_MORE_CNTL);
 +                      tmp &= ~RADEON_SCLK_MORE_FORCEON;
 +                      tmp |= RADEON_SCLK_MORE_MAX_DYN_STOP_LAT;
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_MORE_CNTL, tmp);
 +
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_VCLK_ECP_CNTL);
 +                      tmp |= (RADEON_PIXCLK_ALWAYS_ONb |
 +                              RADEON_PIXCLK_DAC_ALWAYS_ONb);
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_VCLK_ECP_CNTL, tmp);
 +
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_PIXCLKS_CNTL);
 +                      tmp |= (RADEON_PIX2CLK_ALWAYS_ONb         |
 +                              RADEON_PIX2CLK_DAC_ALWAYS_ONb     |
 +                              RADEON_DISP_TVOUT_PIXCLK_TV_ALWAYS_ONb |
 +                              R300_DVOCLK_ALWAYS_ONb            |   
 +                              RADEON_PIXCLK_BLEND_ALWAYS_ONb    |
 +                              RADEON_PIXCLK_GV_ALWAYS_ONb       |
 +                              R300_PIXCLK_DVO_ALWAYS_ONb        | 
 +                              RADEON_PIXCLK_LVDS_ALWAYS_ONb     |
 +                              RADEON_PIXCLK_TMDS_ALWAYS_ONb     |
 +                              R300_PIXCLK_TRANS_ALWAYS_ONb      |
 +                              R300_PIXCLK_TVO_ALWAYS_ONb        |
 +                              R300_P2G2CLK_ALWAYS_ONb           |
 +                              R300_P2G2CLK_ALWAYS_ONb);
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_PIXCLKS_CNTL, tmp);
 +              } else {
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_CNTL);
 +                      tmp |= (RADEON_SCLK_FORCE_CP | RADEON_SCLK_FORCE_E2);
 +                      tmp |= RADEON_SCLK_FORCE_SE;
 +
 +                      if ( dev_priv->flags & RADEON_SINGLE_CRTC ) {
 +                              tmp |= ( RADEON_SCLK_FORCE_RB    |
 +                                       RADEON_SCLK_FORCE_TDM   |
 +                                       RADEON_SCLK_FORCE_TAM   |
 +                                       RADEON_SCLK_FORCE_PB    |
 +                                       RADEON_SCLK_FORCE_RE    |
 +                                       RADEON_SCLK_FORCE_VIP   |
 +                                       RADEON_SCLK_FORCE_IDCT  |
 +                                       RADEON_SCLK_FORCE_TOP   |
 +                                       RADEON_SCLK_FORCE_DISP1 |
 +                                       RADEON_SCLK_FORCE_DISP2 |
 +                                       RADEON_SCLK_FORCE_HDP    );
 +                      } else if ((dev_priv->chip_family == CHIP_R300) ||
 +                                 (dev_priv->chip_family == CHIP_R350)) {
 +                              tmp |= ( RADEON_SCLK_FORCE_HDP   |
 +                                       RADEON_SCLK_FORCE_DISP1 |
 +                                       RADEON_SCLK_FORCE_DISP2 |
 +                                       RADEON_SCLK_FORCE_TOP   |
 +                                       RADEON_SCLK_FORCE_IDCT  |
 +                                       RADEON_SCLK_FORCE_VIP);
 +                      }
 +
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_CNTL, tmp);
 +
 +                      udelay(16000);
 +                      
 +                      if ((dev_priv->chip_family == CHIP_R300) ||
 +                          (dev_priv->chip_family == CHIP_R350)) {
 +                              tmp = RADEON_READ_PLL(dev_priv, R300_SCLK_CNTL2);
 +                              tmp |= ( R300_SCLK_FORCE_TCL |
 +                                       R300_SCLK_FORCE_GA  |
 +                                       R300_SCLK_FORCE_CBA);
 +                              RADEON_WRITE_PLL(dev_priv, R300_SCLK_CNTL2, tmp);
 +                              udelay(16000);
 +                      }
 +                      
 +                      if (dev_priv->flags & RADEON_IS_IGP) {
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_MCLK_CNTL);
 +                              tmp &= ~(RADEON_FORCEON_MCLKA |
 +                                       RADEON_FORCEON_YCLKA);
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_MCLK_CNTL, tmp);
 +                              udelay(16000);
 +                      }
 +                      
 +                      if ((dev_priv->chip_family == CHIP_RV200) ||
 +                          (dev_priv->chip_family == CHIP_RV250) ||
 +                          (dev_priv->chip_family == CHIP_RV280)) {
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_MORE_CNTL);
 +                              tmp |= RADEON_SCLK_MORE_FORCEON;
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_MORE_CNTL, tmp);
 +                              udelay(16000);
 +                      }
 +                      
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_PIXCLKS_CNTL);
 +                      tmp &= ~(RADEON_PIX2CLK_ALWAYS_ONb         |
 +                               RADEON_PIX2CLK_DAC_ALWAYS_ONb     |
 +                               RADEON_PIXCLK_BLEND_ALWAYS_ONb    |
 +                               RADEON_PIXCLK_GV_ALWAYS_ONb       |
 +                               RADEON_PIXCLK_DIG_TMDS_ALWAYS_ONb |
 +                               RADEON_PIXCLK_LVDS_ALWAYS_ONb     |
 +                               RADEON_PIXCLK_TMDS_ALWAYS_ONb);
 +                      
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_PIXCLKS_CNTL, tmp);
 +                      udelay(16000);
 +                      
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_VCLK_ECP_CNTL);
 +                      tmp &= ~(RADEON_PIXCLK_ALWAYS_ONb  |
 +                               RADEON_PIXCLK_DAC_ALWAYS_ONb); 
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_VCLK_ECP_CNTL, tmp);
 +              }
 +              DRM_DEBUG("Dynamic Clock Scaling Disabled\n");
 +              break;
 +        case 1:
 +              if (dev_priv->flags & RADEON_SINGLE_CRTC) {
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_CNTL);
 +                      if ((RADEON_READ(RADEON_CONFIG_CNTL) & RADEON_CFG_ATI_REV_ID_MASK) >
 +                          RADEON_CFG_ATI_REV_A13) { 
 +                              tmp &= ~(RADEON_SCLK_FORCE_CP | RADEON_SCLK_FORCE_RB);
 +                      }
 +                      tmp &= ~(RADEON_SCLK_FORCE_HDP  | RADEON_SCLK_FORCE_DISP1 |
 +                               RADEON_SCLK_FORCE_TOP  | RADEON_SCLK_FORCE_SE   |
 +                               RADEON_SCLK_FORCE_IDCT | RADEON_SCLK_FORCE_RE   |
 +                               RADEON_SCLK_FORCE_PB   | RADEON_SCLK_FORCE_TAM  |
 +                               RADEON_SCLK_FORCE_TDM);
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_CNTL, tmp);
 +              } else if ((dev_priv->chip_family == CHIP_R300) ||
 +                         (dev_priv->chip_family == CHIP_R350) ||
 +                         (dev_priv->chip_family == CHIP_RV350)) {
 +                      if (dev_priv->chip_family == CHIP_RV350) {
 +                              tmp = RADEON_READ_PLL(dev_priv, R300_SCLK_CNTL2);
 +                              tmp &= ~(R300_SCLK_FORCE_TCL |
 +                                       R300_SCLK_FORCE_GA  |
 +                                       R300_SCLK_FORCE_CBA);
 +                              tmp |=  (R300_SCLK_TCL_MAX_DYN_STOP_LAT |
 +                                       R300_SCLK_GA_MAX_DYN_STOP_LAT  |
 +                                       R300_SCLK_CBA_MAX_DYN_STOP_LAT);
 +                              RADEON_WRITE_PLL(dev_priv, R300_SCLK_CNTL2, tmp);
 +                              
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_CNTL);
 +                              tmp &= ~(RADEON_SCLK_FORCE_DISP2 | RADEON_SCLK_FORCE_CP      |
 +                                       RADEON_SCLK_FORCE_HDP   | RADEON_SCLK_FORCE_DISP1   |
 +                                       RADEON_SCLK_FORCE_TOP   | RADEON_SCLK_FORCE_E2      |
 +                                       R300_SCLK_FORCE_VAP     | RADEON_SCLK_FORCE_IDCT    |
 +                                       RADEON_SCLK_FORCE_VIP   | R300_SCLK_FORCE_SR        |
 +                                       R300_SCLK_FORCE_PX      | R300_SCLK_FORCE_TX        |
 +                                       R300_SCLK_FORCE_US      | RADEON_SCLK_FORCE_TV_SCLK |
 +                                       R300_SCLK_FORCE_SU      | RADEON_SCLK_FORCE_OV0);
 +                              tmp |=  RADEON_DYN_STOP_LAT_MASK;
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_CNTL, tmp);
 +
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_MORE_CNTL);
 +                              tmp &= ~RADEON_SCLK_MORE_FORCEON;
 +                              tmp |=  RADEON_SCLK_MORE_MAX_DYN_STOP_LAT;
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_MORE_CNTL, tmp);
 +                              
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_VCLK_ECP_CNTL);
 +                              tmp |= (RADEON_PIXCLK_ALWAYS_ONb |
 +                                      RADEON_PIXCLK_DAC_ALWAYS_ONb);   
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_VCLK_ECP_CNTL, tmp);
 +
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_PIXCLKS_CNTL);
 +                              tmp |= (RADEON_PIX2CLK_ALWAYS_ONb         |
 +                                      RADEON_PIX2CLK_DAC_ALWAYS_ONb     |
 +                                      RADEON_DISP_TVOUT_PIXCLK_TV_ALWAYS_ONb |
 +                                      R300_DVOCLK_ALWAYS_ONb            |   
 +                                      RADEON_PIXCLK_BLEND_ALWAYS_ONb    |
 +                                      RADEON_PIXCLK_GV_ALWAYS_ONb       |
 +                                      R300_PIXCLK_DVO_ALWAYS_ONb        | 
 +                                      RADEON_PIXCLK_LVDS_ALWAYS_ONb     |
 +                                      RADEON_PIXCLK_TMDS_ALWAYS_ONb     |
 +                                      R300_PIXCLK_TRANS_ALWAYS_ONb      |
 +                                      R300_PIXCLK_TVO_ALWAYS_ONb        |
 +                                      R300_P2G2CLK_ALWAYS_ONb           |
 +                                      R300_P2G2CLK_ALWAYS_ONb);
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_PIXCLKS_CNTL, tmp);
 +
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_MCLK_MISC);
 +                              tmp |= (RADEON_MC_MCLK_DYN_ENABLE |
 +                                      RADEON_IO_MCLK_DYN_ENABLE);
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_MCLK_MISC, tmp);
 +
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_MCLK_CNTL);
 +                              tmp |= (RADEON_FORCEON_MCLKA |
 +                                      RADEON_FORCEON_MCLKB);
 +
 +                              tmp &= ~(RADEON_FORCEON_YCLKA  |
 +                                       RADEON_FORCEON_YCLKB  |
 +                                       RADEON_FORCEON_MC);
 +
 +                              /* Some releases of vbios have set DISABLE_MC_MCLKA
 +                                 and DISABLE_MC_MCLKB bits in the vbios table.  Setting these
 +                                 bits will cause H/W hang when reading video memory with dynamic clocking
 +                                 enabled. */
 +                              if ((tmp & R300_DISABLE_MC_MCLKA) &&
 +                                  (tmp & R300_DISABLE_MC_MCLKB)) {
 +                                      /* If both bits are set, then check the active channels */
 +                                      tmp = RADEON_READ_PLL(dev_priv, RADEON_MCLK_CNTL);
 +                                      if (dev_priv->ram_width == 64) {
 +                                              if (RADEON_READ(RADEON_MEM_CNTL) & R300_MEM_USE_CD_CH_ONLY)
 +                                                      tmp &= ~R300_DISABLE_MC_MCLKB;
 +                                              else
 +                                                      tmp &= ~R300_DISABLE_MC_MCLKA;
 +                                      } else {
 +                                              tmp &= ~(R300_DISABLE_MC_MCLKA |
 +                                                       R300_DISABLE_MC_MCLKB);
 +                                      }
 +                              }
 +                              
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_MCLK_CNTL, tmp);
 +                      } else {
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_CNTL);
 +                              tmp &= ~(R300_SCLK_FORCE_VAP);
 +                              tmp |= RADEON_SCLK_FORCE_CP;
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_CNTL, tmp);
 +                              udelay(15000);
 +                              
 +                              tmp = RADEON_READ_PLL(dev_priv, R300_SCLK_CNTL2);
 +                              tmp &= ~(R300_SCLK_FORCE_TCL |
 +                                       R300_SCLK_FORCE_GA  |
 +                                       R300_SCLK_FORCE_CBA);
 +                              RADEON_WRITE_PLL(dev_priv, R300_SCLK_CNTL2, tmp);
 +                      }
 +              } else {
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_CLK_PWRMGT_CNTL);
 +                      tmp &= ~(RADEON_ACTIVE_HILO_LAT_MASK     | 
 +                               RADEON_DISP_DYN_STOP_LAT_MASK   | 
 +                               RADEON_DYN_STOP_MODE_MASK); 
 +                      
 +                      tmp |= (RADEON_ENGIN_DYNCLK_MODE |
 +                              (0x01 << RADEON_ACTIVE_HILO_LAT_SHIFT));
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_CLK_PWRMGT_CNTL, tmp);
 +                      udelay(15000);
 +
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_CLK_PIN_CNTL);
 +                      tmp |= RADEON_SCLK_DYN_START_CNTL; 
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_CLK_PIN_CNTL, tmp);
 +                      udelay(15000);
 +
 +                      /* When DRI is enabled, setting DYN_STOP_LAT to zero can cause some R200 
 +                         to lockup randomly, leave them as set by BIOS.
 +                      */
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_CNTL);
 +                      /*tmp &= RADEON_SCLK_SRC_SEL_MASK;*/
 +                      tmp &= ~RADEON_SCLK_FORCEON_MASK;
 +
 +                      /*RAGE_6::A11 A12 A12N1 A13, RV250::A11 A12, R300*/
 +                      if (((dev_priv->chip_family == CHIP_RV250) &&
 +                           ((RADEON_READ(RADEON_CONFIG_CNTL) & RADEON_CFG_ATI_REV_ID_MASK) <
 +                            RADEON_CFG_ATI_REV_A13)) || 
 +                          ((dev_priv->chip_family == CHIP_RV100) &&
 +                           ((RADEON_READ(RADEON_CONFIG_CNTL) & RADEON_CFG_ATI_REV_ID_MASK) <=
 +                            RADEON_CFG_ATI_REV_A13))){
 +                              tmp |= RADEON_SCLK_FORCE_CP;
 +                              tmp |= RADEON_SCLK_FORCE_VIP;
 +                      }
 +                      
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_CNTL, tmp);
 +
 +                      if ((dev_priv->chip_family == CHIP_RV200) ||
 +                          (dev_priv->chip_family == CHIP_RV250) ||
 +                          (dev_priv->chip_family == CHIP_RV280)) {
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_SCLK_MORE_CNTL);
 +                              tmp &= ~RADEON_SCLK_MORE_FORCEON;
 +
 +                              /* RV200::A11 A12 RV250::A11 A12 */
 +                              if (((dev_priv->chip_family == CHIP_RV200) ||
 +                                   (dev_priv->chip_family == CHIP_RV250)) &&
 +                                  ((RADEON_READ(RADEON_CONFIG_CNTL) & RADEON_CFG_ATI_REV_ID_MASK) <
 +                                   RADEON_CFG_ATI_REV_A13)) {
 +                                      tmp |= RADEON_SCLK_MORE_FORCEON;
 +                              }
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_SCLK_MORE_CNTL, tmp);
 +                              udelay(15000);
 +                      }
 +                      
 +                      /* RV200::A11 A12, RV250::A11 A12 */
 +                      if (((dev_priv->chip_family == CHIP_RV200) ||
 +                           (dev_priv->chip_family == CHIP_RV250)) &&
 +                          ((RADEON_READ(RADEON_CONFIG_CNTL) & RADEON_CFG_ATI_REV_ID_MASK) <
 +                           RADEON_CFG_ATI_REV_A13)) {
 +                              tmp = RADEON_READ_PLL(dev_priv, RADEON_PLL_PWRMGT_CNTL);
 +                              tmp |= RADEON_TCL_BYPASS_DISABLE;
 +                              RADEON_WRITE_PLL(dev_priv, RADEON_PLL_PWRMGT_CNTL, tmp);
 +                      }
 +                      udelay(15000);
 +                      
 +                      /*enable dynamic mode for display clocks (PIXCLK and PIX2CLK)*/
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_PIXCLKS_CNTL);
 +                      tmp |=  (RADEON_PIX2CLK_ALWAYS_ONb         |
 +                               RADEON_PIX2CLK_DAC_ALWAYS_ONb     |
 +                               RADEON_PIXCLK_BLEND_ALWAYS_ONb    |
 +                               RADEON_PIXCLK_GV_ALWAYS_ONb       |
 +                               RADEON_PIXCLK_DIG_TMDS_ALWAYS_ONb |
 +                               RADEON_PIXCLK_LVDS_ALWAYS_ONb     |
 +                               RADEON_PIXCLK_TMDS_ALWAYS_ONb);
 +                      
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_PIXCLKS_CNTL, tmp);
 +                      udelay(15000);
 +                      
 +                      tmp = RADEON_READ_PLL(dev_priv, RADEON_VCLK_ECP_CNTL);
 +                      tmp |= (RADEON_PIXCLK_ALWAYS_ONb  |
 +                              RADEON_PIXCLK_DAC_ALWAYS_ONb); 
 +                      
 +                      RADEON_WRITE_PLL(dev_priv, RADEON_VCLK_ECP_CNTL, tmp);
 +                      udelay(15000);
 +              }    
 +              DRM_DEBUG("Dynamic Clock Scaling Enabled\n");
 +              break;
 +        default:
 +              break;
 +      }
 +      
 +}
 +
 +int radeon_modeset_cp_init(struct drm_device *dev)
 +{
 +      drm_radeon_private_t *dev_priv = dev->dev_private;
 +
 +      /* allocate a ring and ring rptr bits from GART space */
 +      /* these are allocated in GEM files */
 +      
 +      dev_priv->usec_timeout = RADEON_DEFAULT_CP_TIMEOUT;
 +      dev_priv->ring.size = RADEON_DEFAULT_RING_SIZE;
 +      dev_priv->cp_mode = RADEON_CSQ_PRIBM_INDBM;
 +
 +      dev_priv->ring.start = (u32 *)(void *)(unsigned long)dev_priv->mm.ring_map.virtual;
 +      dev_priv->ring.end = (u32 *)(void *)(unsigned long)dev_priv->mm.ring_map.virtual +
 +              dev_priv->ring.size / sizeof(u32);
 +      dev_priv->ring.size_l2qw = drm_order(dev_priv->ring.size / 8);
 +      dev_priv->ring.rptr_update = 4096;
 +      dev_priv->ring.rptr_update_l2qw = drm_order(4096 / 8);
 +      dev_priv->ring.fetch_size = 32;
 +      dev_priv->ring.fetch_size_l2ow = drm_order(32 / 16);
 +      dev_priv->ring.tail_mask = (dev_priv->ring.size / sizeof(u32)) - 1;
 +      dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK;
 +
 +      dev_priv->new_memmap = 1;
 +
 +      radeon_cp_load_microcode(dev_priv);
 +      
 +      DRM_DEBUG("ring offset is %x %x\n", dev_priv->mm.ring->offset, dev_priv->mm.ring_read_ptr->offset);
 +
 +      radeon_cp_init_ring_buffer(dev, dev_priv);
 +
 +      radeon_do_engine_reset(dev);
 +      radeon_test_writeback(dev_priv);
 +
 +      radeon_do_cp_start(dev_priv);
 +      return 0;
 +}
 +
 +static bool radeon_get_bios(struct drm_device *dev)
 +{
 +      drm_radeon_private_t *dev_priv = dev->dev_private;
 +      u8 __iomem *bios;
 +      size_t size;
 +      uint16_t tmp;
 +
 +      bios = pci_map_rom(dev->pdev, &size);
 +      if (!bios)
 +              return -1;
 +
 +      dev_priv->bios = kmalloc(size, GFP_KERNEL);
 +      if (!dev_priv->bios) {
 +              pci_unmap_rom(dev->pdev, bios);
 +              return -1;
 +      }
 +
 +      memcpy(dev_priv->bios, bios, size);
 +
 +      pci_unmap_rom(dev->pdev, bios);
 +
 +      if (dev_priv->bios[0] != 0x55 || dev_priv->bios[1] != 0xaa)
 +              goto free_bios;
 +
 +      dev_priv->bios_header_start = radeon_bios16(dev_priv, 0x48);
 +
 +      if (!dev_priv->bios_header_start)
 +              goto free_bios;
 +
 +      tmp = dev_priv->bios_header_start + 4;
 +
 +      if (!memcmp(dev_priv->bios + tmp, "ATOM", 4) ||
 +          !memcmp(dev_priv->bios + tmp, "MOTA", 4))
 +              dev_priv->is_atom_bios = true;
 +      else
 +              dev_priv->is_atom_bios = false;
 +
 +      DRM_DEBUG("%sBIOS detected\n", dev_priv->is_atom_bios ? "ATOM" : "COM");
 +      return true;
 +free_bios:
 +      kfree(dev_priv->bios);
 +      dev_priv->bios = NULL;
 +      return false;
 +}
 +
 +int radeon_modeset_preinit(struct drm_device *dev)
 +{
 +      drm_radeon_private_t *dev_priv = dev->dev_private;
 +      static struct card_info card;
 +      int ret;
 +
 +      card.dev = dev;
 +      card.reg_read = cail_reg_read;
 +      card.reg_write = cail_reg_write;
 +      card.mc_read = cail_mc_read;
 +      card.mc_write = cail_mc_write;
 +
 +      ret = radeon_get_bios(dev);
 +      if (!ret)
 +              return -1;
 +
 +      if (dev_priv->is_atom_bios) {
 +              dev_priv->mode_info.atom_context = atom_parse(&card, dev_priv->bios);
 +              radeon_get_clock_info(dev);
 +      }
 +      return 0;
 +}
 +
 +
  int radeon_driver_load(struct drm_device *dev, unsigned long flags)
  {
        drm_radeon_private_t *dev_priv;
        else
                dev_priv->flags |= RADEON_IS_PCI;
  
 +
 +          
        DRM_DEBUG("%s card detected\n",
                  ((dev_priv->flags & RADEON_IS_AGP) ? "AGP" : (((dev_priv->flags & RADEON_IS_PCIE) ? "PCIE" : "PCI"))));
 +
 +      ret = drm_addmap(dev, drm_get_resource_start(dev, 2),
 +                       drm_get_resource_len(dev, 2), _DRM_REGISTERS,
 +                       _DRM_DRIVER | _DRM_READ_ONLY, &dev_priv->mmio);
 +      if (ret != 0)
 +              return ret;
 +
 +      if (drm_core_check_feature(dev, DRIVER_MODESET))
 +              radeon_modeset_preinit(dev);
 +
 +
 +      radeon_get_vram_type(dev);
 +
 +      dev_priv->pll_errata = 0;
 +
 +      if (dev_priv->chip_family == CHIP_R300 &&
 +          (RADEON_READ(RADEON_CONFIG_CNTL) & RADEON_CFG_ATI_REV_ID_MASK) == RADEON_CFG_ATI_REV_A11)
 +              dev_priv->pll_errata |= CHIP_ERRATA_R300_CG;
 +              
 +      if (dev_priv->chip_family == CHIP_RV200 ||
 +          dev_priv->chip_family == CHIP_RS200)
 +              dev_priv->pll_errata |= CHIP_ERRATA_PLL_DUMMYREADS;
 +
 +
 +      if (dev_priv->chip_family == CHIP_RV100 ||
 +          dev_priv->chip_family == CHIP_RS100 ||
 +          dev_priv->chip_family == CHIP_RS200)
 +              dev_priv->pll_errata |= CHIP_ERRATA_PLL_DELAY;
 +
 +
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +              if ((dev_priv->flags & RADEON_IS_MOBILITY) && !radeon_is_avivo(dev_priv)) {
 +                      radeon_set_dynamic_clock(dev, radeon_dynclks);
 +              } else if (radeon_is_avivo(dev_priv)) {
 +                      if (radeon_dynclks) {
 +                              radeon_atom_static_pwrmgt_setup(dev, 1);
 +                              radeon_atom_dyn_clk_setup(dev, 1);
 +                      }
 +              }
 +              radeon_force_some_clocks(dev);
 +      }
 +              
 +      /* init memory manager - start with all of VRAM and a 32MB GART aperture for now */
 +      dev_priv->fb_aper_offset = drm_get_resource_start(dev, 0);
 +
 +      drm_bo_driver_init(dev);
 +
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +      
 +              dev_priv->fb_location = (radeon_read_fb_location(dev_priv) & 0xffff) << 16;
 +              dev_priv->fb_size =
 +                      ((radeon_read_fb_location(dev_priv) & 0xffff0000u) + 0x10000)
 +                      - dev_priv->fb_location;
 +              radeon_gem_mm_init(dev);
 +              radeon_modeset_init(dev);
 +
 +              radeon_modeset_cp_init(dev);
 +              dev->devname = kstrdup(DRIVER_NAME, GFP_KERNEL);
 +
 +              drm_irq_install(dev);
 +      }
 +
 +
        return ret;
  }
  
 +
 +int radeon_master_create(struct drm_device *dev, struct drm_master *master)
 +{
 +      struct drm_radeon_master_private *master_priv;
 +      unsigned long sareapage;
 +      int ret;
 +
 +      master_priv = drm_calloc(1, sizeof(*master_priv), DRM_MEM_DRIVER);
 +      if (!master_priv)
 +              return -ENOMEM;
 +
 +      /* prebuild the SAREA */
 +      sareapage = max(SAREA_MAX, PAGE_SIZE);
 +      ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK|_DRM_DRIVER,
 +                       &master_priv->sarea);
 +      if (ret) {
 +              DRM_ERROR("SAREA setup failed\n");
 +              return ret;
 +      }
 +      master_priv->sarea_priv = master_priv->sarea->handle + sizeof(struct drm_sarea);
 +      master_priv->sarea_priv->pfCurrentPage = 0;
 +
 +      master->driver_priv = master_priv;
 +      return 0;
 +}
 +
 +void radeon_master_destroy(struct drm_device *dev, struct drm_master *master)
 +{
 +      struct drm_radeon_master_private *master_priv = master->driver_priv;
 +      struct drm_radeon_private *dev_priv = dev->dev_private;
 +
 +      if (!master_priv)
 +              return;
 +
 +      if (master_priv->sarea_priv &&
 +          master_priv->sarea_priv->pfCurrentPage != 0)
 +              radeon_cp_dispatch_flip(dev, master);
 +
 +      master_priv->sarea_priv = NULL;
 +      if (master_priv->sarea)
 +              drm_rmmap(dev, master_priv->sarea);
 +              
 +      drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER);
 +
 +      master->driver_priv = NULL;
 +}
  /* Create mappings for registers and framebuffer so userland doesn't necessarily
   * have to find them.
   */
@@@ -2544,9 -1743,13 +2540,9 @@@ int radeon_driver_firstopen(struct drm_
  
        dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
  
 -      ret = drm_addmap(dev, drm_get_resource_start(dev, 2),
 -                       drm_get_resource_len(dev, 2), _DRM_REGISTERS,
 -                       _DRM_READ_ONLY, &dev_priv->mmio);
 -      if (ret != 0)
 -              return ret;
 +      if (!drm_core_check_feature(dev, DRIVER_MODESET))
 +              radeon_gem_mm_init(dev);
  
 -      dev_priv->fb_aper_offset = drm_get_resource_start(dev, 0);
        ret = drm_addmap(dev, dev_priv->fb_aper_offset,
                         drm_get_resource_len(dev, 0), _DRM_FRAME_BUFFER,
                         _DRM_WRITE_COMBINING, &map);
@@@ -2560,40 -1763,9 +2556,40 @@@ int radeon_driver_unload(struct drm_dev
  {
        drm_radeon_private_t *dev_priv = dev->dev_private;
  
 +      if (drm_core_check_feature(dev, DRIVER_MODESET)) {
 +              drm_irq_uninstall(dev);
 +              radeon_modeset_cleanup(dev);
 +              radeon_gem_mm_fini(dev);
 +      }
 +
 +      drm_bo_driver_finish(dev);
 +      drm_rmmap(dev, dev_priv->mmio);
 +
        DRM_DEBUG("\n");
        drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
  
        dev->dev_private = NULL;
        return 0;
  }
 +
 +void radeon_gart_flush(struct drm_device *dev)
 +{
 +        drm_radeon_private_t *dev_priv = dev->dev_private;
 +        
 +        if (dev_priv->flags & RADEON_IS_IGPGART) {
 +                IGP_READ_MCIND(dev_priv, RS480_GART_CACHE_CNTRL);
 +                IGP_WRITE_MCIND(RS480_GART_CACHE_CNTRL, RS480_GART_CACHE_INVALIDATE);
 +                IGP_READ_MCIND(dev_priv, RS480_GART_CACHE_CNTRL);
 +                IGP_WRITE_MCIND(RS480_GART_CACHE_CNTRL, 0);
 +        } else if (dev_priv->flags & RADEON_IS_PCIE) {
 +                u32 tmp = RADEON_READ_PCIE(dev_priv, RADEON_PCIE_TX_GART_CNTL);
 +                tmp |= RADEON_PCIE_TX_GART_INVALIDATE_TLB;
 +                RADEON_WRITE_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp);
 +                tmp &= ~RADEON_PCIE_TX_GART_INVALIDATE_TLB;
 +                RADEON_WRITE_PCIE(RADEON_PCIE_TX_GART_CNTL, tmp);
 +        } else {
 +
 +
 +      }
 +      
 +}
diff --combined shared-core/radeon_drv.h
@@@ -31,7 -31,6 +31,7 @@@
  #ifndef __RADEON_DRV_H__
  #define __RADEON_DRV_H__
  
 +#include "atom.h"
  /* General customization:
   */
  
@@@ -39,7 -38,7 +39,7 @@@
  
  #define DRIVER_NAME           "radeon"
  #define DRIVER_DESC           "ATI Radeon"
- #define DRIVER_DATE           "20080528"
+ #define DRIVER_DATE           "20080613"
  
  /* Interface history:
   *
   * 1.25- Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL,
   *       new packet type)
   * 1.26- Add support for variable size PCI(E) gart aperture
 - * 1.27- Add support for IGP GART
 + * 1.27- Add support for IGPGART
   * 1.28- Add support for VBL on CRTC2
   * 1.29- R500 3D cmd buffer support
   */
  
  #define DRIVER_MAJOR          1
 -#define DRIVER_MINOR          29
 +#define DRIVER_MINOR          30
  #define DRIVER_PATCHLEVEL     0
  
  /*
@@@ -127,24 -126,13 +127,24 @@@ enum radeon_family 
        CHIP_RV410,
        CHIP_RS400,
        CHIP_RS480,
 +      CHIP_RS600,
        CHIP_RS690,
 +      CHIP_RS740,
        CHIP_RV515,
        CHIP_R520,
        CHIP_RV530,
        CHIP_RV560,
        CHIP_RV570,
        CHIP_R580,
 +      CHIP_R600,
 +      CHIP_R630,
 +      CHIP_RV610,
 +      CHIP_RV630,
 +      CHIP_RV670,
 +      CHIP_RV620,
 +      CHIP_RV635,
 +      CHIP_RS780,
 +      CHIP_RV770,
        CHIP_LAST,
  };
  
@@@ -165,42 -153,9 +165,42 @@@ enum radeon_chip_flags 
        RADEON_IS_IGPGART = 0x01000000UL,
  };
  
 +/*
 + * Errata workarounds
 + */
 +enum radeon_pll_errata {
 +      CHIP_ERRATA_R300_CG             = 0x00000001,
 +      CHIP_ERRATA_PLL_DUMMYREADS      = 0x00000002,
 +      CHIP_ERRATA_PLL_DELAY           = 0x00000004
 +};
 +
 +enum radeon_ext_tmds_chip {
 +      RADEON_DVOCHIP_NONE,
 +      RADEON_SIL_164,
 +      RADEON_SIL_1178
 +};
 +
 +#if defined(__powerpc__)
 +enum radeon_mac_model {
 +      RADEON_MAC_NONE,
 +      RADEON_MAC_IBOOK,
 +      RADEON_MAC_POWERBOOK_EXTERNAL,
 +      RADEON_MAC_POWERBOOK_INTERNAL,
 +      RADEON_MAC_POWERBOOK_VGA,
 +      RADEON_MAC_MINI_EXTERNAL,
 +      RADEON_MAC_MINI_INTERNAL,
 +      RADEON_MAC_IMAC_G5_ISIGHT
 +};
 +#endif
 +
 +
  #define GET_RING_HEAD(dev_priv)       (dev_priv->writeback_works ? \
 -        DRM_READ32(  (dev_priv)->ring_rptr, 0 ) : RADEON_READ(RADEON_CP_RB_RPTR))
 -#define SET_RING_HEAD(dev_priv,val)   DRM_WRITE32( (dev_priv)->ring_rptr, 0, (val) )
 +                               (dev_priv->mm.ring_read_ptr ? readl(dev_priv->mm.ring_read_ptr_map.virtual + 0) : DRM_READ32((dev_priv)->ring_rptr, 0 )) : \
 +                               RADEON_READ(RADEON_CP_RB_RPTR))
 +
 +#define SET_RING_HEAD(dev_priv,val) (dev_priv->mm.ring_read_ptr ? \
 +                                   writel((val), dev_priv->mm.ring_read_ptr_map.virtual) : \
 +                                   DRM_WRITE32((dev_priv)->ring_rptr, 0, (val)))
  
  typedef struct drm_radeon_freelist {
        unsigned int age;
@@@ -261,35 -216,16 +261,38 @@@ struct radeon_virt_surface 
        struct drm_file *file_priv;
  };
  
 +struct radeon_mm_info {
 +      uint64_t vram_offset; // Offset into GPU space
 +      uint64_t vram_size;
 +      uint64_t vram_visible;
 +      
 +      uint64_t gart_start;
 +      uint64_t gart_size;
 +
 +      struct drm_buffer_object *pcie_table;
 +      struct drm_bo_kmap_obj pcie_table_map;
 +
 +      struct drm_buffer_object *ring;
 +      struct drm_bo_kmap_obj ring_map;
 +
 +      struct drm_buffer_object *ring_read_ptr;
 +      struct drm_bo_kmap_obj ring_read_ptr_map;
 +};
 +
 +#include "radeon_mode.h"
 +
 +struct drm_radeon_master_private {
 +      drm_local_map_t *sarea;
 +      drm_radeon_sarea_t *sarea_priv;
 +};
 +
+ #define RADEON_FLUSH_EMITED   (1 < 0)
+ #define RADEON_PURGE_EMITED   (1 < 1)
  typedef struct drm_radeon_private {
  
        drm_radeon_ring_buffer_t ring;
 -      drm_radeon_sarea_t *sarea_priv;
  
 -      u32 fb_location;
 -      u32 fb_size;
        int new_memmap;
  
        int gart_size;
        unsigned long buffers_offset;
        unsigned long gart_textures_offset;
  
 -      drm_local_map_t *sarea;
 -      drm_local_map_t *mmio;
        drm_local_map_t *cp_ring;
        drm_local_map_t *ring_rptr;
        drm_local_map_t *gart_textures;
        struct mem_block *fb_heap;
  
        /* SW interrupt */
 +      int counter;
        wait_queue_head_t swi_queue;
 -      atomic_t swi_emitted;
        int vblank_crtc;
        uint32_t irq_enable_reg;
        int irq_enabled;
        struct radeon_surface surfaces[RADEON_MAX_SURFACES];
        struct radeon_virt_surface virt_surfaces[2 * RADEON_MAX_SURFACES];
  
 -      unsigned long pcigart_offset;
 -      unsigned int pcigart_offset_set;
 -      struct drm_ati_pcigart_info gart_info;
--
        u32 scratch_ages[5];
  
        unsigned int crtc_last_cnt;
        uint32_t flags;         /* see radeon_chip_flags */
        unsigned long fb_aper_offset;
  
-       int num_gb_pipes;
 +      struct radeon_mm_info mm;
 +      drm_local_map_t *mmio;
 +
-       uint32_t chip_family;
 +
 +      unsigned long pcigart_offset;
 +      unsigned int pcigart_offset_set;
 +      struct drm_ati_pcigart_info gart_info;
 +
 +      struct radeon_mode_info mode_info;
 +
 +      uint8_t *bios; /* copy of the BIOS image */
 +      bool is_atom_bios;
 +      uint16_t bios_header_start;
 +      u32 fb_location;
 +      u32 fb_size;
 +      bool is_ddr;
 +      u32 ram_width;
 +
 +      enum radeon_pll_errata pll_errata;
 +      
+       int num_gb_pipes;
+       int track_flush;
+       uint32_t chip_family; /* extract from flags */
  } drm_radeon_private_t;
  
  typedef struct drm_radeon_buf_priv {
@@@ -407,7 -328,6 +409,7 @@@ typedef struct drm_radeon_kcmd_buffer 
  } drm_radeon_kcmd_buffer_t;
  
  extern int radeon_no_wb;
 +extern int radeon_dynclks;
  extern struct drm_ioctl_desc radeon_ioctls[];
  extern int radeon_max_ioctl;
  
@@@ -453,6 -373,7 +455,7 @@@ extern void radeon_mem_release(struct d
                               struct mem_block *heap);
  
                                /* radeon_irq.c */
+ extern void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state);
  extern int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_priv);
  extern int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_priv);
  
@@@ -495,14 -416,9 +498,14 @@@ extern int r300_do_cp_cmdbuf(struct drm
  #define RADEON_BOX_WAIT_IDLE     0x8
  #define RADEON_BOX_TEXTURE_LOAD  0x10
  
 +#define R600_CONFIG_MEMSIZE                                     0x5428
 +#define R600_CONFIG_APER_SIZE                                   0x5430
  /* Register definitions, register access macros and drmAddMap constants
   * for Radeon kernel driver.
   */
 +
 +#include "radeon_reg.h"
 +
  #define RADEON_AGP_COMMAND            0x0f60
  #define RADEON_AGP_COMMAND_PCI_CONFIG 0x0060  /* offset in PCI config */
  #       define RADEON_AGP_ENABLE            (1<<8)
  #define R520_MC_IND_WR_EN (1 << 24)
  #define R520_MC_IND_DATA  0x74
  
 -#define RV515_MC_FB_LOCATION 0x01
 -#define RV515_MC_AGP_LOCATION 0x02
 -#define RV515_MC_AGP_BASE     0x03
 -#define RV515_MC_AGP_BASE_2   0x04
 -
 -#define R520_MC_FB_LOCATION 0x04
 -#define R520_MC_AGP_LOCATION 0x05
 -#define R520_MC_AGP_BASE     0x06
 -#define R520_MC_AGP_BASE_2   0x07
 -
  #define RADEON_MPP_TB_CONFIG          0x01c0
  #define RADEON_MEM_CNTL                       0x0140
  #define RADEON_MEM_SDRAM_MODE_REG     0x0158
  
  #define RADEON_SCRATCHOFF( x )                (RADEON_SCRATCH_REG_OFFSET + 4*(x))
  
 -#define GET_SCRATCH( x )      (dev_priv->writeback_works                      \
 -                              ? DRM_READ32( dev_priv->ring_rptr, RADEON_SCRATCHOFF(x) ) \
 -                              : RADEON_READ( RADEON_SCRATCH_REG0 + 4*(x) ) )
 +#define GET_SCRATCH( x )      (dev_priv->writeback_works ?                    \
 +                               (dev_priv->mm.ring_read_ptr ? \
 +                                readl(dev_priv->mm.ring_read_ptr_map.virtual + RADEON_SCRATCHOFF(0)) : \
 +                                DRM_READ32(dev_priv->ring_rptr, RADEON_SCRATCHOFF(x))) : \
 +                               RADEON_READ( RADEON_SCRATCH_REG0 + 4*(x)))
  
  #define RADEON_CRTC_CRNT_FRAME 0x0214
  #define RADEON_CRTC2_CRNT_FRAME 0x0314
  #     define RADEON_SW_INT_FIRE               (1 << 26)
  #       define R500_DISPLAY_INT_STATUS          (1 << 0)
  
 +#define RADEON_HOST_PATH_CNTL               0x0130
 +#       define RADEON_HDP_SOFT_RESET        (1 << 26)
 +#       define RADEON_HDP_APER_CNTL         (1 << 23)
  
 -#define RADEON_HOST_PATH_CNTL         0x0130
 -#     define RADEON_HDP_SOFT_RESET            (1 << 26)
 -#     define RADEON_HDP_WC_TIMEOUT_MASK       (7 << 28)
 -#     define RADEON_HDP_WC_TIMEOUT_28BCLK     (7 << 28)
 +#define RADEON_NB_TOM                       0x15c
  
  #define RADEON_ISYNC_CNTL             0x1724
  #     define RADEON_ISYNC_ANY2D_IDLE3D        (1 << 0)
  #define RADEON_PP_TXFILTER_1          0x1c6c
  #define RADEON_PP_TXFILTER_2          0x1c84
  
- #define RADEON_RB2D_DSTCACHE_CTLSTAT  0x342c
- #     define RADEON_RB2D_DC_FLUSH             (3 << 0)
- #     define RADEON_RB2D_DC_FREE              (3 << 2)
- #     define RADEON_RB2D_DC_FLUSH_ALL         0xf
- #     define RADEON_RB2D_DC_BUSY              (1 << 31)
 -#define R300_RB2D_DSTCACHE_CTLSTAT    0x342c /* use R300_DSTCACHE_CTLSTAT */
 -#define R300_DSTCACHE_CTLSTAT         0x1714
 -#     define R300_RB2D_DC_FLUSH               (3 << 0)
 -#     define R300_RB2D_DC_FREE                (3 << 2)
 -#     define R300_RB2D_DC_FLUSH_ALL           0xf
 -#     define R300_RB2D_DC_BUSY                (1 << 31)
  #define RADEON_RB3D_CNTL              0x1c3c
  #     define RADEON_ALPHA_BLEND_ENABLE        (1 << 0)
  #     define RADEON_PLANE_MASK_ENABLE         (1 << 1)
  #define R300_ZB_ZCACHE_CTLSTAT                  0x4f18
  #     define R300_ZC_FLUSH                    (1 << 0)
  #     define R300_ZC_FREE                     (1 << 1)
- #     define R300_ZC_FLUSH_ALL                0x3
  #     define R300_ZC_BUSY                     (1 << 31)
 -#define RADEON_RB3D_DSTCACHE_CTLSTAT            0x325c
 -#     define RADEON_RB3D_DC_FLUSH             (3 << 0)
 -#     define RADEON_RB3D_DC_FREE              (3 << 2)
 -#     define RADEON_RB3D_DC_FLUSH_ALL         0xf
 -#     define RADEON_RB3D_DC_BUSY              (1 << 31)
  #define R300_RB3D_DSTCACHE_CTLSTAT              0x4e4c
+ #     define R300_RB3D_DC_FLUSH               (2 << 0)
+ #     define R300_RB3D_DC_FREE                (2 << 2)
  #     define R300_RB3D_DC_FINISH              (1 << 4)
  #define RADEON_RB3D_ZSTENCILCNTL      0x1c2c
  #     define RADEON_Z_TEST_MASK               (7 << 4)
  #define RADEON_NUM_VERTICES_SHIFT             16
  
  #define RADEON_COLOR_FORMAT_CI8               2
 -#define RADEON_COLOR_FORMAT_ARGB1555  3
 -#define RADEON_COLOR_FORMAT_RGB565    4
 -#define RADEON_COLOR_FORMAT_ARGB8888  6
 -#define RADEON_COLOR_FORMAT_RGB332    7
 -#define RADEON_COLOR_FORMAT_RGB8      9
 -#define RADEON_COLOR_FORMAT_ARGB4444  15
 -
 -#define RADEON_TXFORMAT_I8            0
 -#define RADEON_TXFORMAT_AI88          1
 -#define RADEON_TXFORMAT_RGB332                2
 -#define RADEON_TXFORMAT_ARGB1555      3
 -#define RADEON_TXFORMAT_RGB565                4
 -#define RADEON_TXFORMAT_ARGB4444      5
 -#define RADEON_TXFORMAT_ARGB8888      6
 -#define RADEON_TXFORMAT_RGBA8888      7
 -#define RADEON_TXFORMAT_Y8            8
 -#define RADEON_TXFORMAT_VYUY422         10
 -#define RADEON_TXFORMAT_YVYU422         11
 -#define RADEON_TXFORMAT_DXT1            12
 -#define RADEON_TXFORMAT_DXT23           14
 -#define RADEON_TXFORMAT_DXT45           15
  
  #define R200_PP_TXCBLEND_0                0x2f00
  #define R200_PP_TXCBLEND_1                0x2f10
  #define RADEON_RING_HIGH_MARK         128
  
  #define RADEON_PCIGART_TABLE_SIZE      (32*1024)
 +#define RADEON_DEFAULT_RING_SIZE       (1024*1024)
 +#define RADEON_DEFAULT_CP_TIMEOUT     100000  /* usecs */
  
  #define RADEON_READ(reg)    DRM_READ32(  dev_priv->mmio, (reg) )
  #define RADEON_WRITE(reg,val)  DRM_WRITE32( dev_priv->mmio, (reg), (val) )
  #define RADEON_READ8(reg)     DRM_READ8(  dev_priv->mmio, (reg) )
  #define RADEON_WRITE8(reg,val)        DRM_WRITE8( dev_priv->mmio, (reg), (val) )
  
 -#define RADEON_WRITE_PLL( addr, val )                                 \
 -do {                                                                  \
 -      RADEON_WRITE8( RADEON_CLOCK_CNTL_INDEX,                         \
 -                     ((addr) & 0x1f) | RADEON_PLL_WR_EN );            \
 -      RADEON_WRITE( RADEON_CLOCK_CNTL_DATA, (val) );                  \
 -} while (0)
 +extern int RADEON_READ_PLL(struct drm_radeon_private *dev_priv, int addr);
 +extern void RADEON_WRITE_PLL(struct drm_radeon_private *dev_priv, int addr, uint32_t data);
  
  #define RADEON_WRITE_PCIE( addr, val )                                        \
  do {                                                                  \
@@@ -1325,21 -1279,21 +1324,21 @@@ do {                                                                 
  
  #define RADEON_FLUSH_CACHE() do {                                     \
        if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) {     \
-               OUT_RING( CP_PACKET0( RADEON_RB3D_DSTCACHE_CTLSTAT, 0 ) ); \
-               OUT_RING( RADEON_RB3D_DC_FLUSH );                       \
+               OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0));  \
+               OUT_RING(RADEON_RB3D_DC_FLUSH);                         \
        } else {                                                        \
-               OUT_RING( CP_PACKET0( R300_RB3D_DSTCACHE_CTLSTAT, 0 ) ); \
-               OUT_RING( RADEON_RB3D_DC_FLUSH );                       \
+               OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));    \
+               OUT_RING(R300_RB3D_DC_FLUSH);                           \
          }                                                               \
  } while (0)
  
  #define RADEON_PURGE_CACHE() do {                                     \
        if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) {     \
-               OUT_RING( CP_PACKET0( RADEON_RB3D_DSTCACHE_CTLSTAT, 0 ) ); \
-               OUT_RING( RADEON_RB3D_DC_FLUSH_ALL );                   \
+               OUT_RING(CP_PACKET0( RADEON_RB3D_DSTCACHE_CTLSTAT, 0)); \
+               OUT_RING(RADEON_RB3D_DC_FLUSH | RADEON_RB3D_DC_FREE);   \
        } else {                                                        \
-               OUT_RING( CP_PACKET0( R300_RB3D_DSTCACHE_CTLSTAT, 0 ) ); \
-               OUT_RING( RADEON_RB3D_DC_FLUSH_ALL );                   \
+               OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));    \
+               OUT_RING(R300_RB3D_DC_FLUSH | R300_RB3D_DC_FREE );      \
          }                                                               \
  } while (0)
  
  
  #define RADEON_PURGE_ZCACHE() do {                                    \
        if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) {     \
-               OUT_RING( CP_PACKET0( RADEON_RB3D_ZCACHE_CTLSTAT, 0 ) ); \
-               OUT_RING( RADEON_RB3D_ZC_FLUSH_ALL );                   \
+               OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0));    \
+               OUT_RING(RADEON_RB3D_ZC_FLUSH | RADEON_RB3D_ZC_FREE);   \
        } else {                                                        \
-               OUT_RING( CP_PACKET0( R300_RB3D_ZCACHE_CTLSTAT, 0 ) ); \
-               OUT_RING( R300_ZC_FLUSH_ALL );                          \
+               OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0));        \
+               OUT_RING(R300_ZC_FLUSH | R300_ZC_FREE);                 \
          }                                                               \
  } while (0)
  
@@@ -1380,8 -1334,7 +1379,8 @@@ do {                                                                    
  
  #define VB_AGE_TEST_WITH_RETURN( dev_priv )                           \
  do {                                                                  \
 -      drm_radeon_sarea_t *sarea_priv = dev_priv->sarea_priv;          \
 +      struct drm_radeon_master_private *master_priv = file_priv->master->driver_priv;         \
 +      drm_radeon_sarea_t *sarea_priv = master_priv->sarea_priv;               \
        if ( sarea_priv->last_dispatch >= RADEON_MAX_VB_AGE ) {         \
                int __ret = radeon_do_cp_idle( dev_priv );              \
                if ( __ret ) return __ret;                              \
        write &= mask;                                          \
  } while (0)
  
 +/* radeon GEM->TTM munger */
 +struct drm_radeon_gem_object {
 +      /* wrap a TTM bo */
 +      struct drm_buffer_object *bo;
 +      struct drm_fence_object *fence;
 +      struct drm_gem_object *obj;
 +      
 +};
 +
 +extern int radeon_gem_info_ioctl(struct drm_device *dev, void *data,
 +                               struct drm_file *file_priv);
 +
 +extern int radeon_gem_create_ioctl(struct drm_device *dev, void *data,
 +                                 struct drm_file *file_priv);
 +
 +extern int radeon_gem_pwrite_ioctl(struct drm_device *dev, void *data,
 +                                 struct drm_file *file_priv);
 +
 +extern int radeon_gem_mmap_ioctl(struct drm_device *dev, void *data,
 +                               struct drm_file *file_priv);
 +extern int radeon_gem_pread_ioctl(struct drm_device *dev, void *data,
 +                                 struct drm_file *file_priv);
 +
 +extern void radeon_fence_handler(struct drm_device *dev);
 +extern int radeon_fence_emit_sequence(struct drm_device *dev, uint32_t class,
 +                                    uint32_t flags, uint32_t *sequence, 
 +                                  uint32_t *native_type);
 +extern void radeon_poke_flush(struct drm_device *dev, uint32_t class);
 +extern int radeon_fence_has_irq(struct drm_device *dev, uint32_t class, uint32_t flags);
 +
 +/* radeon_buffer.c */
 +extern struct drm_ttm_backend *radeon_create_ttm_backend_entry(struct drm_device *dev);
 +extern int radeon_fence_types(struct drm_buffer_object *bo, uint32_t *class, uint32_t *type);
 +extern int radeon_invalidate_caches(struct drm_device *dev, uint64_t buffer_flags);
 +extern int radeon_init_mem_type(struct drm_device * dev, uint32_t type,
 +                              struct drm_mem_type_manager * man);
 +extern int radeon_move(struct drm_buffer_object * bo,
 +                     int evict, int no_wait, struct drm_bo_mem_reg * new_mem);
 +
 +extern void radeon_gart_flush(struct drm_device *dev);
 +extern uint64_t radeon_evict_flags(struct drm_buffer_object *bo);
 +
 +#define BREADCRUMB_BITS 31
 +#define BREADCRUMB_MASK ((1U << BREADCRUMB_BITS) - 1)
 +
 +/* Breadcrumb - swi irq */
 +#define READ_BREADCRUMB(dev_priv) RADEON_READ(RADEON_LAST_SWI_REG)
 +
 +static inline int radeon_update_breadcrumb(struct drm_device *dev)
 +{
 +      struct drm_radeon_private *dev_priv = dev->dev_private;
 +      struct drm_radeon_master_private *master_priv;
 +
 +      ++dev_priv->counter;
 +      if (dev_priv->counter > BREADCRUMB_MASK)
 +              dev_priv->counter = 1;
 +
 +      if (dev->primary->master) {
 +              master_priv = dev->primary->master->driver_priv;
 +                     
 +              if (master_priv->sarea_priv)
 +                      master_priv->sarea_priv->last_fence = dev_priv->counter;
 +      }
 +      return dev_priv->counter;
 +}
 +
 +#define radeon_is_avivo(dev_priv) ((dev_priv->chip_family >= CHIP_RS600))
 +
 +#define radeon_is_dce3(dev_priv) ((dev_priv->chip_family >= CHIP_RV620))
 +
 +#define radeon_bios8(dev_priv, v) (dev_priv->bios[v])
 +#define radeon_bios16(dev_priv, v) (dev_priv->bios[v] | (dev_priv->bios[(v) + 1] << 8))
 +#define radeon_bios32(dev_priv, v) ((dev_priv->bios[v]) | \
 +                                  (dev_priv->bios[(v) + 1] << 8) | \
 +                                  (dev_priv->bios[(v) + 2] << 16) | \
 +                                  (dev_priv->bios[(v) + 3] << 24))
 +
 +extern int radeon_emit_irq(struct drm_device * dev);
 +
 +extern void radeon_gem_free_object(struct drm_gem_object *obj);
 +extern int radeon_gem_init_object(struct drm_gem_object *obj);
 +extern int radeon_gem_mm_init(struct drm_device *dev);
 +extern void radeon_gem_mm_fini(struct drm_device *dev);
 +extern int radeon_gem_pin_ioctl(struct drm_device *dev, void *data,
 +                              struct drm_file *file_priv);
 +extern int radeon_gem_unpin_ioctl(struct drm_device *dev, void *data,
 +                                struct drm_file *file_priv);
 +int radeon_gem_object_pin(struct drm_gem_object *obj,
 +                        uint32_t alignment);
 +int radeon_gem_indirect_ioctl(struct drm_device *dev, void *data,
 +                            struct drm_file *file_priv);
 +int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data,
 +                              struct drm_file *file_priv);
 +struct drm_gem_object *radeon_gem_object_alloc(struct drm_device *dev, int size, int alignment,
 +                                             int initial_domain);
 +int radeon_modeset_init(struct drm_device *dev);
 +void radeon_modeset_cleanup(struct drm_device *dev);
 +extern u32 radeon_read_mc_reg(drm_radeon_private_t *dev_priv, int addr);
 +extern void radeon_write_mc_reg(drm_radeon_private_t *dev_priv, u32 addr, u32 val);
 +
 +extern void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on);
 +#define RADEONFB_CONN_LIMIT 4
 +
 +extern int radeon_master_create(struct drm_device *dev, struct drm_master *master);
 +extern void radeon_master_destroy(struct drm_device *dev, struct drm_master *master);
 +extern void radeon_cp_dispatch_flip(struct drm_device * dev, struct drm_master *master);
  #endif                                /* __RADEON_DRV_H__ */
diff --combined shared-core/radeon_irq.c
@@@ -35,7 -35,7 +35,7 @@@
  #include "radeon_drm.h"
  #include "radeon_drv.h"
  
static void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state)
+ void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state)
  {
        drm_radeon_private_t *dev_priv = dev->dev_private;
  
@@@ -198,10 -198,8 +198,10 @@@ irqreturn_t radeon_driver_irq_handler(D
        stat &= dev_priv->irq_enable_reg;
  
        /* SW interrupt */
 -      if (stat & RADEON_SW_INT_TEST)
 +      if (stat & RADEON_SW_INT_TEST) {
                DRM_WAKEUP(&dev_priv->swi_queue);
 +              radeon_fence_handler(dev);
 +      }
  
        /* VBLANK interrupt */
        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) {
        return IRQ_HANDLED;
  }
  
 -static int radeon_emit_irq(struct drm_device * dev)
 +int radeon_emit_irq(struct drm_device * dev)
  {
        drm_radeon_private_t *dev_priv = dev->dev_private;
        unsigned int ret;
        RING_LOCALS;
  
 -      atomic_inc(&dev_priv->swi_emitted);
 -      ret = atomic_read(&dev_priv->swi_emitted);
 +      ret = radeon_update_breadcrumb(dev);
  
        BEGIN_RING(4);
        OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
@@@ -241,13 -240,13 +241,13 @@@ static int radeon_wait_irq(struct drm_d
            (drm_radeon_private_t *) dev->dev_private;
        int ret = 0;
  
 -      if (RADEON_READ(RADEON_LAST_SWI_REG) >= swi_nr)
 +      if (READ_BREADCRUMB(dev_priv) >= swi_nr)
                return 0;
  
        dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
  
        DRM_WAIT_ON(ret, dev_priv->swi_queue, 3 * DRM_HZ,
 -                  RADEON_READ(RADEON_LAST_SWI_REG) >= swi_nr);
 +                  READ_BREADCRUMB(dev_priv) >= swi_nr);
  
        return ret;
  }
  u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc)
  {
        drm_radeon_private_t *dev_priv = dev->dev_private;
-       u32 crtc_cnt_reg, crtc_status_reg;
  
        if (!dev_priv) {
                DRM_ERROR("called with no initialization\n");
                return -EINVAL;
        }
  
+       if (crtc < 0 || crtc > 1) {
+               DRM_ERROR("Invalid crtc %d\n", crtc);
+               return -EINVAL;
+       }
        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) {
-               if (crtc == 0) {
-                       crtc_cnt_reg = R500_D1CRTC_FRAME_COUNT;
-                       crtc_status_reg = R500_D1CRTC_STATUS;
-               } else if (crtc == 1) {
-                       crtc_cnt_reg = R500_D2CRTC_FRAME_COUNT;
-                       crtc_status_reg = R500_D2CRTC_STATUS;
-               } else
-                       return -EINVAL;
-               return RADEON_READ(crtc_cnt_reg) + (RADEON_READ(crtc_status_reg) & 1);
-                       
+               if (crtc == 0)
+                       return RADEON_READ(R500_D1CRTC_FRAME_COUNT);
+               else
+                       return RADEON_READ(R500_D2CRTC_FRAME_COUNT);
        } else {
-               if (crtc == 0) {
-                       crtc_cnt_reg = RADEON_CRTC_CRNT_FRAME;
-                       crtc_status_reg = RADEON_CRTC_STATUS;
-               } else if (crtc == 1) {
-                       crtc_cnt_reg = RADEON_CRTC2_CRNT_FRAME;
-                       crtc_status_reg = RADEON_CRTC2_STATUS;
-               } else {
-                       return -EINVAL;
-               }
-               return RADEON_READ(crtc_cnt_reg) + (RADEON_READ(crtc_status_reg) & 1);
+               if (crtc == 0)
+                       return RADEON_READ(RADEON_CRTC_CRNT_FRAME);
+               else
+                       return RADEON_READ(RADEON_CRTC2_CRNT_FRAME);
        }
  }
  
@@@ -350,6 -341,7 +342,6 @@@ int radeon_driver_irq_postinstall(struc
            (drm_radeon_private_t *) dev->dev_private;
        int ret;
  
 -      atomic_set(&dev_priv->swi_emitted, 0);
        DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
  
        ret = drm_vblank_init(dev, 2);
@@@ -382,27 -374,8 +374,8 @@@ void radeon_driver_irq_uninstall(struc
  int radeon_vblank_crtc_get(struct drm_device *dev)
  {
        drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private;
-       u32 flag;
-       u32 value;
  
-       if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) {
-               flag = RADEON_READ(R500_DxMODE_INT_MASK);
-               value = 0;
-               if (flag & R500_D1MODE_INT_MASK)
-                       value |= DRM_RADEON_VBLANK_CRTC1;
-               if (flag & R500_D2MODE_INT_MASK)
-                       value |= DRM_RADEON_VBLANK_CRTC2;
-       } else {
-               flag = RADEON_READ(RADEON_GEN_INT_CNTL);
-               value = 0;
-               if (flag & RADEON_CRTC_VBLANK_MASK)
-                       value |= DRM_RADEON_VBLANK_CRTC1;
-               if (flag & RADEON_CRTC2_VBLANK_MASK)
-                       value |= DRM_RADEON_VBLANK_CRTC2;
-       }
-       return value;
+       return dev_priv->vblank_crtc;
  }
  
  int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value)