radeon: add userspace mm enable switch

diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index b69fadb..430f549 100644 (file)
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -1364,8 +1364,7 @@ static int radeon_do_cleanup_cp(struct drm_device * dev)
                if (dev_priv->gart_info.bus_addr) {
                        /* Turn off PCI GART */
                        radeon_set_pcigart(dev_priv, 0);
-                       if (!drm_ati_pcigart_cleanup(dev, &dev_priv->gart_info))
-                               DRM_ERROR("failed to cleanup PCI GART!\n");
+                       drm_ati_pcigart_cleanup(dev, &dev_priv->gart_info);
                }
 
                if (dev_priv->gart_info.gart_table_location == DRM_ATI_GART_FB)
@@ -1373,6 +1372,7 @@ static int radeon_do_cleanup_cp(struct drm_device * dev)
                        if (dev_priv->pcigart_offset_set == 1) {
                                drm_core_ioremapfree(&dev_priv->gart_info.mapping, dev);
                                dev_priv->gart_info.addr = NULL;
+                               dev_priv->pcigart_offset_set = 0;
                        }
                }
        }
@@ -1563,8 +1563,10 @@ void radeon_do_release(struct drm_device * dev)
                radeon_mem_takedown(&(dev_priv->gart_heap));
                radeon_mem_takedown(&(dev_priv->fb_heap));
 
-
-               radeon_gem_mm_fini(dev);
+               if (dev_priv->user_mm_enable) {
+                       radeon_gem_mm_fini(dev);
+                       dev_priv->user_mm_enable = false;
+               }
 
                /* deallocate kernel resources */
                radeon_do_cleanup_cp(dev);

diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h
index 8ee1baa..8bb5d87 100644 (file)
--- a/shared-core/radeon_drm.h
+++ b/shared-core/radeon_drm.h
@@ -768,6 +768,7 @@ typedef struct drm_radeon_setparam {
 #define RADEON_SETPARAM_NEW_MEMMAP 4           /* Use new memory map */
 #define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5    /* PCI GART Table Size */
 #define RADEON_SETPARAM_VBLANK_CRTC 6           /* VBLANK CRTC */
+#define RADEON_SETPARAM_MM_INIT 7              /* Initialise the mm */
 /* 1.14: Clients can allocate/free a surface
  */
 typedef struct drm_radeon_surface_alloc {

diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index e55a969..0363dfd 100644 (file)
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -314,6 +314,8 @@ typedef struct drm_radeon_private {
 
        int new_memmap;
 
+       bool user_mm_enable;
+
        int gart_size;
        u32 gart_vm_start;
        unsigned long gart_buffers_offset;

diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c
index 00160fb..ca10db4 100644 (file)
--- a/shared-core/radeon_state.c
+++ b/shared-core/radeon_state.c
@@ -3182,6 +3182,9 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
        case RADEON_SETPARAM_VBLANK_CRTC:
                return radeon_vblank_crtc_set(dev, sp->value);
                break;
+       case RADEON_SETPARAM_MM_INIT:
+               dev_priv->user_mm_enable = true;
+               return radeon_gem_mm_init(dev);
        default:
                DRM_DEBUG("Invalid parameter %d\n", sp->param);
                return -EINVAL;