drm: update mga driver for new bootstrap code

The MGA driver needs to use the full AGP interface.

From: Ian Romanick <idr@us.ibm.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

diff --git a/drivers/char/drm/mga_dma.c b/drivers/char/drm/mga_dma.c
index 9b09d786b1582345dafd83e9f8d4777df4fe7a58..c2a4bac14521f2b50d9257544ae45066e44620b4 100644 (file)
--- a/drivers/char/drm/mga_dma.c
+++ b/drivers/char/drm/mga_dma.c
@@ -44,7 +44,9 @@
 #define MGA_DEFAULT_USEC_TIMEOUT       10000
 #define MGA_FREELIST_DEBUG             0
 
-static int mga_do_cleanup_dma(drm_device_t * dev);
+#define MINIMAL_CLEANUP 0
+#define FULL_CLEANUP 1
+static int mga_do_cleanup_dma(drm_device_t *dev, int full_cleanup);
 
 /* ================================================================
  * Engine control
@@ -446,17 +448,19 @@ static int mga_do_agp_dma_bootstrap(drm_device_t * dev,
        drm_buf_desc_t req;
        drm_agp_mode_t mode;
        drm_agp_info_t info;
+       drm_agp_buffer_t agp_req;
+       drm_agp_binding_t bind_req;
 
        /* Acquire AGP. */
        err = drm_agp_acquire(dev);
        if (err) {
-               DRM_ERROR("Unable to acquire AGP\n");
+               DRM_ERROR("Unable to acquire AGP: %d\n", err);
                return err;
        }
 
        err = drm_agp_info(dev, &info);
        if (err) {
-               DRM_ERROR("Unable to get AGP info\n");
+               DRM_ERROR("Unable to get AGP info: %d\n", err);
                return err;
        }
 
@@ -480,18 +484,24 @@ static int mga_do_agp_dma_bootstrap(drm_device_t * dev,
        }
 
        /* Allocate and bind AGP memory. */
-       dev_priv->agp_pages = agp_size / PAGE_SIZE;
-       dev_priv->agp_mem = drm_alloc_agp(dev, dev_priv->agp_pages, 0);
-       if (dev_priv->agp_mem == NULL) {
-               dev_priv->agp_pages = 0;
+       agp_req.size = agp_size;
+       agp_req.type = 0;
+       err = drm_agp_alloc(dev, &agp_req);
+       if (err) {
+               dev_priv->agp_size = 0;
                DRM_ERROR("Unable to allocate %uMB AGP memory\n",
                          dma_bs->agp_size);
-               return DRM_ERR(ENOMEM);
+               return err;
        }
+       
+       dev_priv->agp_size = agp_size;
+       dev_priv->agp_handle = agp_req.handle;
 
-       err = drm_bind_agp(dev_priv->agp_mem, 0);
+       bind_req.handle = agp_req.handle;
+       bind_req.offset = 0;
+       err = drm_agp_bind(dev, &bind_req);
        if (err) {
-               DRM_ERROR("Unable to bind AGP memory\n");
+               DRM_ERROR("Unable to bind AGP memory: %d\n", err);
                return err;
        }
 
@@ -505,7 +515,7 @@ static int mga_do_agp_dma_bootstrap(drm_device_t * dev,
        err = drm_addmap(dev, offset, warp_size,
                         _DRM_AGP, _DRM_READ_ONLY, &dev_priv->warp);
        if (err) {
-               DRM_ERROR("Unable to map WARP microcode\n");
+               DRM_ERROR("Unable to map WARP microcode: %d\n", err);
                return err;
        }
 
@@ -513,7 +523,7 @@ static int mga_do_agp_dma_bootstrap(drm_device_t * dev,
        err = drm_addmap(dev, offset, dma_bs->primary_size,
                         _DRM_AGP, _DRM_READ_ONLY, &dev_priv->primary);
        if (err) {
-               DRM_ERROR("Unable to map primary DMA region\n");
+               DRM_ERROR("Unable to map primary DMA region: %d\n", err);
                return err;
        }
 
@@ -521,7 +531,7 @@ static int mga_do_agp_dma_bootstrap(drm_device_t * dev,
        err = drm_addmap(dev, offset, secondary_size,
                         _DRM_AGP, 0, &dev->agp_buffer_map);
        if (err) {
-               DRM_ERROR("Unable to map secondary DMA region\n");
+               DRM_ERROR("Unable to map secondary DMA region: %d\n", err);
                return err;
        }
 
@@ -533,15 +543,29 @@ static int mga_do_agp_dma_bootstrap(drm_device_t * dev,
 
        err = drm_addbufs_agp(dev, &req);
        if (err) {
-               DRM_ERROR("Unable to add secondary DMA buffers\n");
+               DRM_ERROR("Unable to add secondary DMA buffers: %d\n", err);
                return err;
        }
 
+       {
+               drm_map_list_t *_entry;
+               unsigned long agp_token = 0;
+               
+               list_for_each_entry(_entry, &dev->maplist->head, head) {
+                       if (_entry->map == dev->agp_buffer_map)
+                               agp_token = _entry->user_token;
+               }
+               if (!agp_token)
+                       return -EFAULT;
+
+               dev->agp_buffer_token = agp_token;
+       }
+
        offset += secondary_size;
        err = drm_addmap(dev, offset, agp_size - offset,
                         _DRM_AGP, 0, &dev_priv->agp_textures);
        if (err) {
-               DRM_ERROR("Unable to map AGP texture region\n");
+               DRM_ERROR("Unable to map AGP texture region %d\n", err);
                return err;
        }
 
@@ -611,7 +635,8 @@ static int mga_do_pci_dma_bootstrap(drm_device_t * dev,
        err = drm_addmap(dev, 0, warp_size, _DRM_CONSISTENT,
                         _DRM_READ_ONLY, &dev_priv->warp);
        if (err != 0) {
-               DRM_ERROR("Unable to create mapping for WARP microcode\n");
+               DRM_ERROR("Unable to create mapping for WARP microcode: %d\n",
+                         err);
                return err;
        }
 
@@ -630,7 +655,7 @@ static int mga_do_pci_dma_bootstrap(drm_device_t * dev,
        }
 
        if (err != 0) {
-               DRM_ERROR("Unable to allocate primary DMA region\n");
+               DRM_ERROR("Unable to allocate primary DMA region: %d\n", err);
                return DRM_ERR(ENOMEM);
        }
 
@@ -654,7 +679,7 @@ static int mga_do_pci_dma_bootstrap(drm_device_t * dev,
        }
 
        if (bin_count == 0) {
-               DRM_ERROR("Unable to add secondary DMA buffers\n");
+               DRM_ERROR("Unable to add secondary DMA buffers: %d\n", err);
                return err;
        }
 
@@ -690,7 +715,7 @@ static int mga_do_dma_bootstrap(drm_device_t * dev,
        err = drm_addmap(dev, dev_priv->mmio_base, dev_priv->mmio_size,
                         _DRM_REGISTERS, _DRM_READ_ONLY, &dev_priv->mmio);
        if (err) {
-               DRM_ERROR("Unable to map MMIO region\n");
+               DRM_ERROR("Unable to map MMIO region: %d\n", err);
                return err;
        }
 
@@ -698,7 +723,7 @@ static int mga_do_dma_bootstrap(drm_device_t * dev,
                         _DRM_READ_ONLY | _DRM_LOCKED | _DRM_KERNEL,
                         &dev_priv->status);
        if (err) {
-               DRM_ERROR("Unable to map status region\n");
+               DRM_ERROR("Unable to map status region: %d\n", err);
                return err;
        }
 
@@ -716,7 +741,7 @@ static int mga_do_dma_bootstrap(drm_device_t * dev,
         */
 
        if (err) {
-               mga_do_cleanup_dma(dev);
+               mga_do_cleanup_dma(dev, MINIMAL_CLEANUP);
        }
 
        /* Not only do we want to try and initialized PCI cards for PCI DMA,
@@ -739,35 +764,32 @@ int mga_dma_bootstrap(DRM_IOCTL_ARGS)
        DRM_DEVICE;
        drm_mga_dma_bootstrap_t bootstrap;
        int err;
+       static const int modes[] = { 0, 1, 2, 2, 4, 4, 4, 4 };
+       const drm_mga_private_t *const dev_priv =
+               (drm_mga_private_t *) dev->dev_private;
 
        DRM_COPY_FROM_USER_IOCTL(bootstrap,
                                 (drm_mga_dma_bootstrap_t __user *) data,
                                 sizeof(bootstrap));
 
        err = mga_do_dma_bootstrap(dev, &bootstrap);
-       if (!err) {
-               static const int modes[] = { 0, 1, 2, 2, 4, 4, 4, 4 };
-               const drm_mga_private_t *const dev_priv =
-                   (drm_mga_private_t *) dev->dev_private;
-
-               if (dev_priv->agp_textures != NULL) {
-                       bootstrap.texture_handle =
-                           dev_priv->agp_textures->offset;
-                       bootstrap.texture_size = dev_priv->agp_textures->size;
-               } else {
-                       bootstrap.texture_handle = 0;
-                       bootstrap.texture_size = 0;
-               }
+       if (err) {
+               mga_do_cleanup_dma(dev, FULL_CLEANUP);
+               return err;
+       }
 
-               bootstrap.agp_mode = modes[bootstrap.agp_mode & 0x07];
-               if (DRM_COPY_TO_USER((void __user *)data, &bootstrap,
-                                    sizeof(bootstrap))) {
-                       err = DRM_ERR(EFAULT);
-               }
+       if (dev_priv->agp_textures != NULL) {
+               bootstrap.texture_handle = dev_priv->agp_textures->offset;
+               bootstrap.texture_size = dev_priv->agp_textures->size;
        } else {
-               mga_do_cleanup_dma(dev);
+               bootstrap.texture_handle = 0;
+               bootstrap.texture_size = 0;
        }
 
+       bootstrap.agp_mode = modes[bootstrap.agp_mode & 0x07];
+       DRM_COPY_TO_USER_IOCTL((drm_mga_dma_bootstrap_t __user *)data,
+                              bootstrap, sizeof(bootstrap));
+
        return err;
 }
 
@@ -861,13 +883,13 @@ static int mga_do_init_dma(drm_device_t * dev, drm_mga_init_t * init)
 
        ret = mga_warp_install_microcode(dev_priv);
        if (ret < 0) {
-               DRM_ERROR("failed to install WARP ucode!\n");
+               DRM_ERROR("failed to install WARP ucode!: %d\n", ret);
                return ret;
        }
 
        ret = mga_warp_init(dev_priv);
        if (ret < 0) {
-               DRM_ERROR("failed to init WARP engine!\n");
+               DRM_ERROR("failed to init WARP engine!: %d\n", ret);
                return ret;
        }
 
@@ -912,7 +934,7 @@ static int mga_do_init_dma(drm_device_t * dev, drm_mga_init_t * init)
        return 0;
 }
 
-static int mga_do_cleanup_dma(drm_device_t * dev)
+static int mga_do_cleanup_dma(drm_device_t *dev, int full_cleanup)
 {
        int err = 0;
        DRM_DEBUG("\n");
@@ -940,31 +962,39 @@ static int mga_do_cleanup_dma(drm_device_t * dev)
 
                if (dev_priv->used_new_dma_init) {
 #if __OS_HAS_AGP
-                       if (dev_priv->agp_mem != NULL) {
-                               dev_priv->agp_textures = NULL;
-                               drm_unbind_agp(dev_priv->agp_mem);
+                       if (dev_priv->agp_handle != 0) {
+                               drm_agp_binding_t unbind_req;
+                               drm_agp_buffer_t free_req;
 
-                               drm_free_agp(dev_priv->agp_mem,
-                                            dev_priv->agp_pages);
-                               dev_priv->agp_pages = 0;
-                               dev_priv->agp_mem = NULL;
+                               unbind_req.handle = dev_priv->agp_handle;
+                               drm_agp_unbind(dev, &unbind_req);
+
+                               free_req.handle = dev_priv->agp_handle;
+                               drm_agp_free(dev, &free_req);
+       
+                               dev_priv->agp_textures = NULL;
+                               dev_priv->agp_size = 0;
+                               dev_priv->agp_handle = 0;
                        }
 
                        if ((dev->agp != NULL) && dev->agp->acquired) {
                                err = drm_agp_release(dev);
                        }
 #endif
-                       dev_priv->used_new_dma_init = 0;
                }
 
                dev_priv->warp = NULL;
                dev_priv->primary = NULL;
-               dev_priv->mmio = NULL;
-               dev_priv->status = NULL;
                dev_priv->sarea = NULL;
                dev_priv->sarea_priv = NULL;
                dev->agp_buffer_map = NULL;
 
+               if (full_cleanup) {
+                       dev_priv->mmio = NULL;
+                       dev_priv->status = NULL;
+                       dev_priv->used_new_dma_init = 0;
+               }
+
                memset(&dev_priv->prim, 0, sizeof(dev_priv->prim));
                dev_priv->warp_pipe = 0;
                memset(dev_priv->warp_pipe_phys, 0,
@@ -975,7 +1005,7 @@ static int mga_do_cleanup_dma(drm_device_t * dev)
                }
        }
 
-       return err;
+       return 0;
 }
 
 int mga_dma_init(DRM_IOCTL_ARGS)
@@ -993,11 +1023,11 @@ int mga_dma_init(DRM_IOCTL_ARGS)
        case MGA_INIT_DMA:
                err = mga_do_init_dma(dev, &init);
                if (err) {
-                       (void)mga_do_cleanup_dma(dev);
+                       (void)mga_do_cleanup_dma(dev, FULL_CLEANUP);
                }
                return err;
        case MGA_CLEANUP_DMA:
-               return mga_do_cleanup_dma(dev);
+               return mga_do_cleanup_dma(dev, FULL_CLEANUP);
        }
 
        return DRM_ERR(EINVAL);
@@ -1139,7 +1169,7 @@ int mga_driver_unload(drm_device_t * dev)
  */
 void mga_driver_lastclose(drm_device_t * dev)
 {
-       mga_do_cleanup_dma(dev);
+       mga_do_cleanup_dma(dev, FULL_CLEANUP);
 }
 
 int mga_driver_dma_quiescent(drm_device_t * dev)

diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c
index eae2f91994ec2e711a4392a3e5d71d485d6f544d..93f171e634c06c123f29e9ad1b2b55c4700b23a3 100644 (file)
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
@@ -45,7 +45,7 @@ static struct pci_device_id pciidlist[] = {
 
 static struct drm_driver driver = {
        .driver_features =
-           DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR |
+           DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA |
            DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
            DRIVER_IRQ_VBL,
        .load = mga_driver_load,

diff --git a/drivers/char/drm/mga_drv.h b/drivers/char/drm/mga_drv.h
index 137bfdd5e92bfa9bdc33f36ec2216044781ca1bb..6b0c5319350615e9008bda3cd46629aa29f6ebe2 100644 (file)
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/char/drm/mga_drv.h
@@ -38,11 +38,11 @@
 
 #define DRIVER_NAME            "mga"
 #define DRIVER_DESC            "Matrox G200/G400"
-#define DRIVER_DATE            "20050607"
+#define DRIVER_DATE            "20051102"
 
 #define DRIVER_MAJOR           3
 #define DRIVER_MINOR           2
-#define DRIVER_PATCHLEVEL      0
+#define DRIVER_PATCHLEVEL      1
 
 typedef struct drm_mga_primary_buffer {
        u8 *start;
@@ -144,8 +144,8 @@ typedef struct drm_mga_private {
        drm_local_map_t *primary;
        drm_local_map_t *agp_textures;
 
-       DRM_AGP_MEM *agp_mem;
-       unsigned int agp_pages;
+       unsigned long agp_handle;
+       unsigned int agp_size;
 } drm_mga_private_t;
 
 extern drm_ioctl_desc_t mga_ioctls[];