1 files changed, 29 insertions, 25 deletions

diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 68338389d836..af5790f8fd53 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -36,7 +36,7 @@
 
 #define RADEON_FIFO_DEBUG       0
 
-static int radeon_do_cleanup_cp(drm_device_t * dev);
+static int radeon_do_cleanup_cp(struct drm_device * dev);
 
 /* CP microcode (from ATI) */
 static const u32 R200_cp_microcode[][2] = {
@@ -816,7 +816,7 @@ static const u32 R300_cp_microcode[][2] = {
         {0000000000, 0000000000},
 };
 
-static int RADEON_READ_PLL(drm_device_t * dev, int addr)
+static int RADEON_READ_PLL(struct drm_device * dev, int addr)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
 
@@ -1066,7 +1066,7 @@ static void radeon_do_cp_stop(drm_radeon_private_t * dev_priv)
 
 /* Reset the engine.  This will stop the CP if it is running.
  */
-static int radeon_do_engine_reset(drm_device_t * dev)
+static int radeon_do_engine_reset(struct drm_device * dev)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         u32 clock_cntl_index, mclk_cntl, rbbm_soft_reset;
@@ -1122,7 +1122,7 @@ static int radeon_do_engine_reset(drm_device_t * dev)
         return 0;
 }
 
-static void radeon_cp_init_ring_buffer(drm_device_t * dev,
+static void radeon_cp_init_ring_buffer(struct drm_device * dev,
                                        drm_radeon_private_t * dev_priv)
 {
         u32 ring_start, cur_read_ptr;
@@ -1174,7 +1174,7 @@ static void radeon_cp_init_ring_buffer(drm_device_t * dev,
         } else
 #endif
         {
-                drm_sg_mem_t *entry = dev->sg;
+                struct drm_sg_mem *entry = dev->sg;
                 unsigned long tmp_ofs, page_ofs;
 
                 tmp_ofs = dev_priv->ring_rptr->offset -
@@ -1384,7 +1384,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
         }
 }
 
-static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
+static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
 
@@ -1420,6 +1420,10 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
                 return DRM_ERR(EINVAL);
         }
 
+        /* Enable vblank on CRTC1 for older X servers
+         */
+        dev_priv->vblank_crtc = DRM_RADEON_VBLANK_CRTC1;
+
         switch(init->func) {
         case RADEON_INIT_R200_CP:
                 dev_priv->microcode_version = UCODE_R200;
@@ -1501,13 +1505,13 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
                                          RADEON_ROUND_MODE_TRUNC |
                                          RADEON_ROUND_PREC_8TH_PIX);
 
-        DRM_GETSAREA();
 
         dev_priv->ring_offset = init->ring_offset;
         dev_priv->ring_rptr_offset = init->ring_rptr_offset;
         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) {
                 DRM_ERROR("could not find sarea!\n");
                 radeon_do_cleanup_cp(dev);
@@ -1731,7 +1735,7 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
         return 0;
 }
 
-static int radeon_do_cleanup_cp(drm_device_t * dev)
+static int radeon_do_cleanup_cp(struct drm_device * dev)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         DRM_DEBUG("\n");
@@ -1787,7 +1791,7 @@ static int radeon_do_cleanup_cp(drm_device_t * dev)
  *
  * Charl P. Botha <http://cpbotha.net>
  */
-static int radeon_do_resume_cp(drm_device_t * dev)
+static int radeon_do_resume_cp(struct drm_device * dev)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
 
@@ -1914,7 +1918,7 @@ int radeon_cp_stop(DRM_IOCTL_ARGS)
         return 0;
 }
 
-void radeon_do_release(drm_device_t * dev)
+void radeon_do_release(struct drm_device * dev)
 {
         drm_radeon_private_t *dev_priv = dev->dev_private;
         int i, ret;
@@ -2042,12 +2046,12 @@ int radeon_fullscreen(DRM_IOCTL_ARGS)
  * they can't get the lock.
  */
 
-drm_buf_t *radeon_freelist_get(drm_device_t * dev)
+struct drm_buf *radeon_freelist_get(struct drm_device * dev)
 {
-        drm_device_dma_t *dma = dev->dma;
+        struct drm_device_dma *dma = dev->dma;
         drm_radeon_private_t *dev_priv = dev->dev_private;
         drm_radeon_buf_priv_t *buf_priv;
-        drm_buf_t *buf;
+        struct drm_buf *buf;
         int i, t;
         int start;
 
@@ -2082,12 +2086,12 @@ drm_buf_t *radeon_freelist_get(drm_device_t * dev)
 }
 
 #if 0
-drm_buf_t *radeon_freelist_get(drm_device_t * dev)
+struct drm_buf *radeon_freelist_get(struct drm_device * dev)
 {
-        drm_device_dma_t *dma = dev->dma;
+        struct drm_device_dma *dma = dev->dma;
         drm_radeon_private_t *dev_priv = dev->dev_private;
         drm_radeon_buf_priv_t *buf_priv;
-        drm_buf_t *buf;
+        struct drm_buf *buf;
         int i, t;
         int start;
         u32 done_age = DRM_READ32(dev_priv->ring_rptr, RADEON_SCRATCHOFF(1));
@@ -2116,15 +2120,15 @@ drm_buf_t *radeon_freelist_get(drm_device_t * dev)
 }
 #endif
 
-void radeon_freelist_reset(drm_device_t * dev)
+void radeon_freelist_reset(struct drm_device * dev)
 {
-        drm_device_dma_t *dma = dev->dma;
+        struct drm_device_dma *dma = dev->dma;
         drm_radeon_private_t *dev_priv = dev->dev_private;
         int i;
 
         dev_priv->last_buf = 0;
         for (i = 0; i < dma->buf_count; i++) {
-                drm_buf_t *buf = dma->buflist[i];
+                struct drm_buf *buf = dma->buflist[i];
                 drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
                 buf_priv->age = 0;
         }
@@ -2166,11 +2170,11 @@ int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n)
         return DRM_ERR(EBUSY);
 }
 
-static int radeon_cp_get_buffers(DRMFILE filp, drm_device_t * dev,
-                                 drm_dma_t * d)
+static int radeon_cp_get_buffers(DRMFILE filp, struct drm_device * dev,
+                                 struct drm_dma * d)
 {
         int i;
-        drm_buf_t *buf;
+        struct drm_buf *buf;
 
         for (i = d->granted_count; i < d->request_count; i++) {
                 buf = radeon_freelist_get(dev);
@@ -2194,10 +2198,10 @@ static int radeon_cp_get_buffers(DRMFILE filp, drm_device_t * dev,
 int radeon_cp_buffers(DRM_IOCTL_ARGS)
 {
         DRM_DEVICE;
-        drm_device_dma_t *dma = dev->dma;
+        struct drm_device_dma *dma = dev->dma;
         int ret = 0;
-        drm_dma_t __user *argp = (void __user *)data;
-        drm_dma_t d;
+        struct drm_dma __user *argp = (void __user *)data;
+        struct drm_dma d;
 
         LOCK_TEST_WITH_RETURN(dev, filp);