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

 	obj->size = size;
 	drm_vma_node_reset(&obj->vma_node);
+}
 EXPORT_SYMBOL(drm_gem_private_object_init);
+static void
+drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp)
+{
+	/*
+	 * Note: obj->dma_buf can't disappear as long as we still hold a
+	 * handle reference in obj->handle_count.
+	 */
+}
 /**
  * drm_gem_object_handle_free - release resources bound to userspace handles
  * @obj: GEM object to clean up.
+ *
 static void
+drm_gem_object_handle_unreference_unlocked(struct drm_gem_object *obj)
+{
+	struct drm_device *dev = obj->dev;
-drm_gem_object_handle_unreference_unlocked(struct drm_gem_object *obj)
+	bool final = false;
 	if (WARN_ON(obj->handle_count == 0))
 		return;
 	/*
 	* Must bump handle count first as this may be the last
 	* ref, in which case the object would disappear before we
 	* checked for a name
 	*/
 	mutex_lock(&dev->object_name_lock);
-	mutex_lock(&obj->dev->object_name_lock);
+	if (--obj->handle_count == 0) {
+		drm_gem_object_handle_free(obj);
-	if (--obj->handle_count == 0) {
+		final = true;
 		drm_gem_object_handle_free(obj);
+	mutex_unlock(&dev->object_name_lock);
+	if (final)
+	drm_gem_object_unreference_unlocked(obj);
+}
+/*
+ * Called at device or object close to release the file's
+ * handle references on objects.
+ */
+static int
+drm_gem_object_release_handle(int id, void *ptr, void *data)
+{
+	struct drm_file *file_priv = data;
+	struct drm_gem_object *obj = ptr;
+	struct drm_device *dev = obj->dev;
+	if (drm_core_check_feature(dev, DRIVER_PRIME))
+		drm_gem_remove_prime_handles(obj, file_priv);
+//	drm_vma_node_revoke(&obj->vma_node, file_priv->filp);
+	if (dev->driver->gem_close_object)
+		dev->driver->gem_close_object(obj, file_priv);
-	mutex_unlock(&obj->dev->object_name_lock);
+	drm_gem_object_handle_unreference_unlocked(obj);
-	drm_gem_object_unreference_unlocked(obj);
+	return 0;
+}
+/**
-/**
+ * drm_gem_handle_delete - deletes the given file-private handle
- * drm_gem_handle_delete - deletes the given file-private handle
+ * @filp: drm file-private structure to use for the handle look up
- * @filp: drm file-private structure to use for the handle look up
+ * @handle: userspace handle to delete
  * @handle: userspace handle to delete
  * Removes the GEM handle from the @filp lookup table which has been added with
- * Removes the GEM handle from the @filp lookup table and if this is the last
+ * drm_gem_handle_create(). If this is the last handle also cleans up linked
 	/* Release reference and decrement refcount. */
 	idr_remove(&filp->object_idr, handle);
-	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);
+	spin_unlock(&filp->table_lock);
-	drm_gem_object_handle_unreference_unlocked(obj);
+	drm_gem_object_release_handle(handle, obj, filp);
 	return 0;
+}
  * @handlep: pointer to return the created handle to the caller
+ *
  * This expects the dev->object_name_lock to be held already and will drop it
  * before returning. Used to avoid races in establishing new handles when
  * importing an object from either an flink name or a dma-buf.
+ *
+ * Handles must be release again through drm_gem_handle_delete(). This is done
+ * when userspace closes @file_priv for all attached handles, or through the
+ * GEM_CLOSE ioctl for individual handles.
  */
 int
 drm_gem_handle_create_tail(struct drm_file *file_priv,
 			   struct drm_gem_object *obj,
 			   u32 *handlep)
+{
 	struct drm_device *dev = obj->dev;
+	u32 handle;
 	int ret;
+	WARN_ON(!mutex_is_locked(&dev->object_name_lock));
+	if (obj->handle_count++ == 0)
-	WARN_ON(!mutex_is_locked(&dev->object_name_lock));
+		drm_gem_object_reference(obj);
 	/*
 	 * Get the user-visible handle using idr.  Preload and perform
 	 * allocation under our spinlock.
 	 */
 	idr_preload(GFP_KERNEL);
-	spin_lock(&file_priv->table_lock);
+	spin_lock(&file_priv->table_lock);
 	ret = idr_alloc(&file_priv->object_idr, obj, 1, 0, GFP_NOWAIT);
-	drm_gem_object_reference(obj);
+	ret = idr_alloc(&file_priv->object_idr, obj, 1, 0, GFP_NOWAIT);
-	obj->handle_count++;
+	spin_unlock(&file_priv->table_lock);
-	spin_unlock(&file_priv->table_lock);
+	idr_preload_end();
 	idr_preload_end();
 	mutex_unlock(&dev->object_name_lock);
 	if (ret < 0)
 		goto err_unref;
-	*handlep = ret;
+	handle = ret;
 		ret = dev->driver->gem_open_object(obj, file_priv);
 		if (ret)
 			goto err_revoke;
+	}
 	*handlep = handle;
 	return 0;
 err_revoke:
 //	drm_vma_node_revoke(&obj->vma_node, file_priv->filp);
 err_remove:
 	spin_lock(&file_priv->table_lock);
-	idr_remove(&file_priv->object_idr, *handlep);
+	idr_remove(&file_priv->object_idr, handle);
 	spin_unlock(&file_priv->table_lock);
 err_unref:
 	drm_gem_object_handle_unreference_unlocked(obj);
 	drm_free_large(pages);
+}
 EXPORT_SYMBOL(drm_gem_put_pages);
 #endif
+/**
+ * drm_gem_object_lookup - look up a GEM object from it's handle
+ * @dev: DRM device
+ * @filp: DRM file private date
+ * @handle: userspace handle
+ *
+ * Returns:
+ *
+ * A reference to the object named by the handle if such exists on @filp, NULL
+ * otherwise.
-/** Returns a reference to the object named by the handle. */
+ */
 struct drm_gem_object *
 drm_gem_object_lookup(struct drm_device *dev, struct drm_file *filp,
 		      u32 handle)
+{
 	obj = drm_gem_object_lookup(dev, file_priv, args->handle);
 	if (obj == NULL)
 		return -ENOENT;
-	mutex_lock(&dev->object_name_lock);
-	idr_preload(GFP_KERNEL);
+	mutex_lock(&dev->object_name_lock);
 	/* prevent races with concurrent gem_close. */
 	if (obj->handle_count == 0) {
 		ret = -ENOENT;
 		goto err;
+	}
 	if (!obj->name) {
-		ret = idr_alloc(&dev->object_name_idr, obj, 1, 0, GFP_NOWAIT);
+		ret = idr_alloc(&dev->object_name_idr, obj, 1, 0, GFP_KERNEL);
 		if (ret < 0)
 			goto err;
 		obj->name = ret;
+	}
 	args->name = (uint64_t) obj->name;
-	ret = 0;
+	args->name = (uint64_t) obj->name;
+	ret = 0;
+err:
+	mutex_unlock(&dev->object_name_lock);
 	drm_gem_object_unreference_unlocked(obj);
 err:
-	idr_preload_end();
+//    printf("%s object %p name %d refcount %d\n",
-	mutex_unlock(&dev->object_name_lock);
+//           __FUNCTION__, obj, obj->name, obj->refcount.refcount);
 		return ret;
 	args->handle = handle;
+	args->size = obj->size;
+//    printf("%s object %p handle %d refcount %d\n",
-	args->size = obj->size;
+//           __FUNCTION__, obj, handle, obj->refcount.refcount);
 	return 0;
+}
+{
 	idr_init(&file_private->object_idr);
 	spin_lock_init(&file_private->table_lock);
+}
-/*
- * Called at device close to release the file's
- * handle references on objects.
- */
-static int
-drm_gem_object_release_handle(int id, void *ptr, void *data)
-{
-	struct drm_file *file_priv = data;
-	struct drm_gem_object *obj = ptr;
-	struct drm_device *dev = obj->dev;
-	drm_vma_node_revoke(&obj->vma_node, file_priv->filp);
-	if (dev->driver->gem_close_object)
-		dev->driver->gem_close_object(obj, file_priv);
-	drm_gem_object_handle_unreference_unlocked(obj);
-	return 0;
-}
 /**
  * drm_gem_release - release file-private GEM resources
  * @dev: drm_device which is being closed by userspace
  * @file_private: drm file-private structure to clean up

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/drm_gem.c – Rev 6935 → 6937