Add new buffer object type for kernel allocations that don't initially have a user...

diff --git a/linux-core/drm_bo.c b/linux-core/drm_bo.c
index 2107a3a..a379c74 100644 (file)
--- a/linux-core/drm_bo.c
+++ b/linux-core/drm_bo.c
@@ -89,6 +89,9 @@ static int drm_bo_vm_pre_move(drm_buffer_object_t * bo, int old_is_pci)
 #ifdef DRM_ODD_MM_COMPAT
        int ret;
 
+       if (!bo->map_list.map)
+               return 0;
+
        ret = drm_bo_lock_kmm(bo);
        if (ret)
                return ret;
@@ -96,6 +99,9 @@ static int drm_bo_vm_pre_move(drm_buffer_object_t * bo, int old_is_pci)
        if (old_is_pci)
                drm_bo_finish_unmap(bo);
 #else
+       if (!bo->map_list.map)
+               return 0;
+
        drm_bo_unmap_virtual(bo);
 #endif
        return 0;
@@ -106,6 +112,9 @@ static void drm_bo_vm_post_move(drm_buffer_object_t * bo)
 #ifdef DRM_ODD_MM_COMPAT
        int ret;
 
+       if (!bo->map_list.map)
+               return;
+
        ret = drm_bo_remap_bound(bo);
        if (ret) {
                DRM_ERROR("Failed to remap a bound buffer object.\n"
@@ -131,6 +140,11 @@ static int drm_bo_add_ttm(drm_buffer_object_t * bo)
                if (!bo->ttm)
                        ret = -ENOMEM;
                break;
+       case drm_bo_type_kernel:
+               bo->ttm = drm_ttm_init(dev, bo->mem.num_pages << PAGE_SHIFT);
+               if (!bo->ttm)
+                       ret = -ENOMEM;
+               break;
        case drm_bo_type_user:
        case drm_bo_type_fake:
                break;
@@ -2302,9 +2316,6 @@ void drm_bo_unmap_virtual(drm_buffer_object_t * bo)
        loff_t offset = ((loff_t) bo->map_list.hash.key) << PAGE_SHIFT;
        loff_t holelen = ((loff_t) bo->mem.num_pages) << PAGE_SHIFT;
 
-       if (!dev->dev_mapping)
-               return;
-
        unmap_mapping_range(dev->dev_mapping, offset, holelen, 1);
 }
 

diff --git a/shared-core/drm.h b/shared-core/drm.h
index 621b201..698f851 100644 (file)
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -795,6 +795,7 @@ typedef struct drm_fence_arg {
 
 typedef enum {
        drm_bo_type_dc,
+       drm_bo_type_kernel, /* for initial kernel allocations */
        drm_bo_type_user,
        drm_bo_type_fake
 }drm_bo_type_t;