WebSVN – Kolibri OS – Diff – /drivers/video/drm/drm_gem.c

  */
 #include
 #include
+#include
+#include
 #include
 #include
 #include
 #include
 #include
  */
 int
 drm_gem_init(struct drm_device *dev)
 {
-	struct drm_gem_mm *mm;
+	struct drm_vma_offset_manager *vma_offset_manager;
 	mutex_init(&dev->object_name_lock);
 	idr_init(&dev->object_name_idr);
-	mm = kzalloc(sizeof(struct drm_gem_mm), GFP_KERNEL);
+	vma_offset_manager = kzalloc(sizeof(*vma_offset_manager), GFP_KERNEL);
-	if (!mm) {
+	if (!vma_offset_manager) {
 		DRM_ERROR("out of memory\n");
 		return -ENOMEM;
+	}
-	dev->mm_private = mm;
+	dev->vma_offset_manager = vma_offset_manager;
-	drm_vma_offset_manager_init(&mm->vma_manager,
+	drm_vma_offset_manager_init(vma_offset_manager,
 				    DRM_FILE_PAGE_OFFSET_START,
 		    DRM_FILE_PAGE_OFFSET_SIZE);
-	return 0;
-}
+	return 0;
+}
-void
-drm_gem_destroy(struct drm_device *dev)
+void
 drm_gem_destroy(struct drm_device *dev)
 	struct drm_gem_mm *mm = dev->mm_private;
 int drm_gem_object_init(struct drm_device *dev,
 			struct drm_gem_object *obj, size_t size)
+{
 	struct file *filp;
+	drm_gem_private_object_init(dev, obj, size);
 	filp = shmem_file_setup("drm mm object", size, VM_NORESERVE);
 	if (IS_ERR(filp))
-		return PTR_ERR(filp);
 		return PTR_ERR(filp);
 	drm_gem_private_object_init(dev, obj, size);
 	obj->filp = filp;
 	drm_vma_node_reset(&obj->vma_node);
+}
 EXPORT_SYMBOL(drm_gem_private_object_init);
-/**
- * Allocate a GEM object of the specified size with shmfs backing store
- */
-struct drm_gem_object *
-drm_gem_object_alloc(struct drm_device *dev, size_t size)
-{
-	struct drm_gem_object *obj;
-	obj = kzalloc(sizeof(*obj), GFP_KERNEL);
-	if (!obj)
-		goto free;
-	if (drm_gem_object_init(dev, obj, size) != 0)
-		goto free;
-	if (dev->driver->gem_init_object != NULL &&
-	    dev->driver->gem_init_object(obj) != 0) {
-		goto fput;
-	}
-	return obj;
-fput:
-	/* Object_init mangles the global counters - readjust them. */
-	free(obj->filp);
-free:
-	kfree(obj);
-	return NULL;
-}
-EXPORT_SYMBOL(drm_gem_object_alloc);
-static void drm_gem_object_ref_bug(struct kref *list_kref)
-{
-	BUG();
-}
 /**
  * Called after the last handle to the object has been closed
+ *
  * Removes any name for the object. Note that this must be
  * called before drm_gem_object_free or we'll be touching
 	/* Remove any name for this object */
 	if (obj->name) {
 		idr_remove(&dev->object_name_idr, obj->name);
-		obj->name = 0;
-		/*
-		 * The object name held a reference to this object, drop
-		 * that now.
-		*
-		* This cannot be the last reference, since the handle holds one too.
-		 */
-		kref_put(&obj->refcount, drm_gem_object_ref_bug);
+		obj->name = 0;
+	}
+}
 	/* Release reference and decrement refcount. */
 	idr_remove(&filp->object_idr, handle);
+	spin_unlock(&filp->table_lock);
 	spin_unlock(&filp->table_lock);
 //	drm_vma_node_revoke(&obj->vma_node, filp->filp);
 	if (dev->driver->gem_close_object)
 		dev->driver->gem_close_object(obj, filp);
 	drm_gem_object_handle_unreference_unlocked(obj);
 	return 0;
+}
-}
+EXPORT_SYMBOL(drm_gem_handle_delete);
-EXPORT_SYMBOL(drm_gem_handle_delete);
+/**
+ * drm_gem_dumb_destroy - dumb fb callback helper for gem based drivers
+ *
+ * This implements the ->dumb_destroy kms driver callback for drivers which use
+ * gem to manage their backing storage.
+ */
+int drm_gem_dumb_destroy(struct drm_file *file,
+			 struct drm_device *dev,
+			 uint32_t handle)
+{
-/**
+	return drm_gem_handle_delete(file, handle);
  * Create a handle for this object. This adds a handle reference
- * to the object, which includes a regular reference count. Callers
+EXPORT_SYMBOL(drm_gem_dumb_destroy);
  * will likely want to dereference the object afterwards.
 		drm_gem_object_handle_unreference_unlocked(obj);
 		return ret;
+	}
 	*handlep = ret;
+//	ret = drm_vma_node_allow(&obj->vma_node, file_priv->filp);
+//	if (ret) {
+//		drm_gem_handle_delete(file_priv, *handlep);
+//		return ret;
+//	}
 	if (dev->driver->gem_open_object) {
 		ret = dev->driver->gem_open_object(obj, file_priv);
 		if (ret) {
 			drm_gem_handle_delete(file_priv, *handlep);
 	return drm_gem_handle_create_tail(file_priv, obj, handlep);
+}
 EXPORT_SYMBOL(drm_gem_handle_create);
 #if 0
 /**
  * drm_gem_free_mmap_offset - release a fake mmap offset for an object
  * @obj: obj in question
+ *
- * This routine frees fake offsets allocated by drm_gem_create_mmap_offset().
- */
+ * This routine frees fake offsets allocated by drm_gem_create_mmap_offset().
-#if 0
+ */
 void
 drm_gem_free_mmap_offset(struct drm_gem_object *obj)
-{
-	struct drm_device *dev = obj->dev;
+{
-	struct drm_gem_mm *mm = dev->mm_private;
+	struct drm_device *dev = obj->dev;
-	drm_vma_offset_remove(&mm->vma_manager, &obj->vma_node);
+	drm_vma_offset_remove(dev->vma_offset_manager, &obj->vma_node);
+}
  */
 int
 drm_gem_create_mmap_offset_size(struct drm_gem_object *obj, size_t size)
+{
 	struct drm_device *dev = obj->dev;
-	struct drm_gem_mm *mm = dev->mm_private;
+	return drm_vma_offset_add(dev->vma_offset_manager, &obj->vma_node,
+				  size / PAGE_SIZE);
+}
+EXPORT_SYMBOL(drm_gem_create_mmap_offset_size);
+/**
-	/* Set the object up for mmap'ing */
+ * drm_gem_create_mmap_offset - create a fake mmap offset for an object
+ * @obj: obj in question
+ *
+ * GEM memory mapping works by handing back to userspace a fake mmap offset
+ * it can use in a subsequent mmap(2) call.  The DRM core code then looks
+ * up the object based on the offset and sets up the various memory mapping
+ * structures.
+ *
+ * This routine allocates and attaches a fake offset for @obj.
-	list = &obj->map_list;
+ */
+int drm_gem_create_mmap_offset(struct drm_gem_object *obj)
+{
+	return drm_gem_create_mmap_offset_size(obj, obj->size);
+}
+EXPORT_SYMBOL(drm_gem_create_mmap_offset);
+/**
-	list->map = kzalloc(sizeof(struct drm_map_list), GFP_KERNEL);
+ * drm_gem_get_pages - helper to allocate backing pages for a GEM object
+ * from shmem
+ * @obj: obj in question
+ * @gfpmask: gfp mask of requested pages
+ */
+struct page **drm_gem_get_pages(struct drm_gem_object *obj, gfp_t gfpmask)
+{
+	struct inode *inode;
+	struct address_space *mapping;
-	if (!list->map)
+	struct page *p, **pages;
+	int i, npages;
+	/* This is the shared memory object that backs the GEM resource */
+	inode = file_inode(obj->filp);
+	mapping = inode->i_mapping;
+	/* We already BUG_ON() for non-page-aligned sizes in
+	 * drm_gem_object_init(), so we should never hit this unless
+	 * driver author is doing something really wrong:
+	 */
-		return -ENOMEM;
+	WARN_ON((obj->size & (PAGE_SIZE - 1)) != 0);
+	npages = obj->size >> PAGE_SHIFT;
-	map = list->map;
-	map->type = _DRM_GEM;
+	pages = drm_malloc_ab(npages, sizeof(struct page *));
-	map->size = obj->size;
+	if (pages == NULL)
-	map->handle = obj;
-	/* Get a DRM GEM mmap offset allocated... */
+		return ERR_PTR(-ENOMEM);
-	list->file_offset_node = drm_mm_search_free(&mm->offset_manager,
-			obj->size / PAGE_SIZE, 0, false);
+	gfpmask |= mapping_gfp_mask(mapping);
-	if (!list->file_offset_node) {
+	for (i = 0; i < npages; i++) {
-		DRM_ERROR("failed to allocate offset for bo %d\n", obj->name);
+		p = shmem_read_mapping_page_gfp(mapping, i, gfpmask);
-		ret = -ENOSPC;
+		if (IS_ERR(p))
-		goto out_free_list;
+			goto fail;
+		pages[i] = p;
+		/* There is a hypothetical issue w/ drivers that require
+		 * buffer memory in the low 4GB.. if the pages are un-
+		 * pinned, and swapped out, they can end up swapped back
+		 * in above 4GB.  If pages are already in memory, then
+		 * shmem_read_mapping_page_gfp will ignore the gfpmask,
-	}
+		 * even if the already in-memory page disobeys the mask.
+		 *
+		 * It is only a theoretical issue today, because none of
+		 * the devices with this limitation can be populated with
+		 * enough memory to trigger the issue.  But this BUG_ON()
-	list->file_offset_node = drm_mm_get_block(list->file_offset_node,
+		 * is here as a reminder in case the problem with
+		 * shmem_read_mapping_page_gfp() isn't solved by the time
+		 * it does become a real issue.
-			obj->size / PAGE_SIZE, 0);
+		 *
+		 * See this thread: http://lkml.org/lkml/2011/7/11/238
-	if (!list->file_offset_node) {
+		 */
-		ret = -ENOMEM;
+		BUG_ON((gfpmask & __GFP_DMA32) &&
-		goto out_free_list;
+				(page_to_pfn(p) >= 0x00100000UL));
-	}
+	}
+	return pages;
-	list->hash.key = list->file_offset_node->start;
+fail:
+	while (i--)
-	ret = drm_ht_insert_item(&mm->offset_hash, &list->hash);
+		page_cache_release(pages[i]);
 	if (ret) {
+	drm_free_large(pages);
+	return ERR_CAST(p);
+}
+EXPORT_SYMBOL(drm_gem_get_pages);
+/**
+ * drm_gem_put_pages - helper to free backing pages for a GEM object
+ * @obj: obj in question
+ * @pages: pages to free
+ * @dirty: if true, pages will be marked as dirty
+ * @accessed: if true, the pages will be marked as accessed
-		DRM_ERROR("failed to add to map hash\n");
+ */
-		goto out_free_mm;
+void drm_gem_put_pages(struct drm_gem_object *obj, struct page **pages,
-	}
+		bool dirty, bool accessed)
+{
-	return 0;
+	int i, npages;
+	/* We already BUG_ON() for non-page-aligned sizes in
+	 * drm_gem_object_init(), so we should never hit this unless
+	 * driver author is doing something really wrong:
-out_free_mm:
+	 */
+	WARN_ON((obj->size & (PAGE_SIZE - 1)) != 0);
+	npages = obj->size >> PAGE_SHIFT;
+	for (i = 0; i < npages; i++) {
+		if (dirty)
+			set_page_dirty(pages[i]);
 	drm_mm_put_block(list->file_offset_node);
+		if (accessed)
+			mark_page_accessed(pages[i]);
-out_free_list:
+		/* Undo the reference we took when populating the table */
-	kfree(list->map);
+		page_cache_release(pages[i]);
 	list->map = NULL;
-	return ret;
+	drm_free_large(pages);
 		ret = idr_alloc(&dev->object_name_idr, obj, 1, 0, GFP_NOWAIT);
 		if (ret < 0)
 			goto err;
-		obj->name = ret;
-		/* Allocate a reference for the name table.  */
-		drm_gem_object_reference(obj);
+		obj->name = ret;
+	}
+{
 	struct drm_file *file_priv = data;
 	struct drm_gem_object *obj = ptr;
 	struct drm_device *dev = obj->dev;
 	drm_gem_remove_prime_handles(obj, file_priv);
 	drm_vma_node_revoke(&obj->vma_node, file_priv->filp);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_gem.c – Rev 4539 → 4560