WebSVN – Kolibri OS – Diff – /drivers/video/drm/ttm/ttm_bo.c

 				~TTM_PL_MASK_MEMTYPE);
 		if (mem_type == TTM_PL_SYSTEM)
 			break;
-			ret = (*man->func->get_node)(man, bo, place, mem);
+		ret = (*man->func->get_node)(man, bo, place, mem);
-			if (unlikely(ret))
+		if (unlikely(ret))
-				return ret;
+			return ret;
 		ttm_bo_mem_put(bo, &mem);
 	return ret;
+}
 bool ttm_bo_mem_compat(struct ttm_placement *placement,
-			      struct ttm_mem_reg *mem,
+		       struct ttm_mem_reg *mem,
-			      uint32_t *new_flags)
+		       uint32_t *new_flags)
+{
 	int i;
 			return true;
+	}
 	return false;
+}
 EXPORT_SYMBOL(ttm_bo_mem_compat);
 int ttm_bo_validate(struct ttm_buffer_object *bo,
 			struct ttm_placement *placement,
 	return 0;
+}
 EXPORT_SYMBOL(ttm_bo_validate);
 int ttm_bo_init(struct ttm_bo_device *bdev,
-        struct ttm_buffer_object *bo,
+		struct ttm_buffer_object *bo,
-        unsigned long size,
+		unsigned long size,
-        enum ttm_bo_type type,
+		enum ttm_bo_type type,
-        struct ttm_placement *placement,
+		struct ttm_placement *placement,
-        uint32_t page_alignment,
+		uint32_t page_alignment,
-        bool interruptible,
+		bool interruptible,
-        struct file *persistent_swap_storage,
+		struct file *persistent_swap_storage,
-        size_t acc_size,
+		size_t acc_size,
-        struct sg_table *sg,
+		struct sg_table *sg,
 		struct reservation_object *resv,
-        void (*destroy) (struct ttm_buffer_object *))
+		void (*destroy) (struct ttm_buffer_object *))
+{
     int ret = 0;
     unsigned long num_pages;
             kfree(bo);
         return -EINVAL;
+    }
     bo->destroy = destroy;
-    kref_init(&bo->kref);
+	kref_init(&bo->kref);
-    kref_init(&bo->list_kref);
+	kref_init(&bo->list_kref);
 	atomic_set(&bo->cpu_writers, 0);
-    INIT_LIST_HEAD(&bo->lru);
+	INIT_LIST_HEAD(&bo->lru);
-    INIT_LIST_HEAD(&bo->ddestroy);
+	INIT_LIST_HEAD(&bo->ddestroy);
-    INIT_LIST_HEAD(&bo->swap);
+	INIT_LIST_HEAD(&bo->swap);
-    INIT_LIST_HEAD(&bo->io_reserve_lru);
+	INIT_LIST_HEAD(&bo->io_reserve_lru);
-    mutex_init(&bo->wu_mutex);
+	mutex_init(&bo->wu_mutex);
-    bo->bdev = bdev;
+	bo->bdev = bdev;
-    bo->glob = bdev->glob;
+	bo->glob = bdev->glob;
-    bo->type = type;
+	bo->type = type;
-    bo->num_pages = num_pages;
+	bo->num_pages = num_pages;
-    bo->mem.size = num_pages << PAGE_SHIFT;
+	bo->mem.size = num_pages << PAGE_SHIFT;
-    bo->mem.mem_type = TTM_PL_SYSTEM;
+	bo->mem.mem_type = TTM_PL_SYSTEM;
-    bo->mem.num_pages = bo->num_pages;
+	bo->mem.num_pages = bo->num_pages;
-    bo->mem.mm_node = NULL;
+	bo->mem.mm_node = NULL;
-    bo->mem.page_alignment = page_alignment;
+	bo->mem.page_alignment = page_alignment;
-    bo->mem.bus.io_reserved_vm = false;
+	bo->mem.bus.io_reserved_vm = false;
-    bo->mem.bus.io_reserved_count = 0;
+	bo->mem.bus.io_reserved_count = 0;
-    bo->priv_flags = 0;
+	bo->priv_flags = 0;
-    bo->mem.placement = (TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED);
+	bo->mem.placement = (TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED);
-    bo->persistent_swap_storage = persistent_swap_storage;
+	bo->persistent_swap_storage = persistent_swap_storage;
-    bo->acc_size = acc_size;
+	bo->acc_size = acc_size;
-    bo->sg = sg;
+	bo->sg = sg;
 	if (resv) {
 		bo->resv = resv;
 		lockdep_assert_held(&bo->resv->lock.base);
 	} else {
 		bo->resv = &bo->ttm_resv;
 		reservation_object_init(&bo->ttm_resv);
+	}
 	atomic_inc(&bo->glob->bo_count);
-    drm_vma_node_reset(&bo->vma_node);
+	drm_vma_node_reset(&bo->vma_node);
-    /*
+	/*
-     * For ttm_bo_type_device buffers, allocate
+	 * For ttm_bo_type_device buffers, allocate
-     * address space from the device.
+	 * address space from the device.
-     */
+	 */
 	if (bo->type == ttm_bo_type_device ||
 	    bo->type == ttm_bo_type_sg)
+	}
 	if (likely(!ret))
 		ret = ttm_bo_validate(bo, placement, interruptible, false);
+	if (!resv) {
+		ttm_bo_unreserve(bo);
+	} else if (!(bo->mem.placement & TTM_PL_FLAG_NO_EVICT)) {
+		spin_lock(&bo->glob->lru_lock);
+		ttm_bo_add_to_lru(bo);
-	if (!resv)
+		spin_unlock(&bo->glob->lru_lock);
 		ttm_bo_unreserve(bo);
 	if (unlikely(ret))
 		ttm_bo_unref(&bo);
-    return ret;
+	return ret;
+}
 EXPORT_SYMBOL(ttm_bo_global_release);
 int ttm_bo_global_init(struct drm_global_reference *ref)
 {
-    struct ttm_bo_global_ref *bo_ref =
+	struct ttm_bo_global_ref *bo_ref =
-        container_of(ref, struct ttm_bo_global_ref, ref);
+		container_of(ref, struct ttm_bo_global_ref, ref);
-    struct ttm_bo_global *glob = ref->object;
+	struct ttm_bo_global *glob = ref->object;
-    int ret;
+	int ret;
-    mutex_init(&glob->device_list_mutex);
+	mutex_init(&glob->device_list_mutex);
-    spin_lock_init(&glob->lru_lock);
+	spin_lock_init(&glob->lru_lock);
-    glob->mem_glob = bo_ref->mem_glob;
+	glob->mem_glob = bo_ref->mem_glob;
 	glob->dummy_read_page = alloc_page(__GFP_ZERO | GFP_DMA32);
-    if (unlikely(glob->dummy_read_page == NULL)) {
+	if (unlikely(glob->dummy_read_page == NULL)) {
-        ret = -ENOMEM;
+		ret = -ENOMEM;
-        goto out_no_drp;
+		goto out_no_drp;
-    }
+	}
-    INIT_LIST_HEAD(&glob->swap_lru);
+	INIT_LIST_HEAD(&glob->swap_lru);
-    INIT_LIST_HEAD(&glob->device_list);
+	INIT_LIST_HEAD(&glob->device_list);
     atomic_set(&glob->bo_count, 0);
     return 0;
 out_no_drp:
 				return -EBUSY;
 			timeout = fence_wait_timeout(fence,
 						     interruptible, timeout);
 		}
+	}
 	if (timeout < 0)
 		return timeout;
 	if (timeout == 0)
-			return -EBUSY;
+		return -EBUSY;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/ttm/ttm_bo.c @ 5271 – Rev 6938 → 7146