Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da6b51d0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Revert "drm/gem: Warn on illegal use of the dumb buffer interface v2" 



This reverts commit 355a7018.

This had some bad side effects under normal operation, and should
have been dropped earlier.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 0d83b72a

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1586,7 +1586,7 @@ static struct drm_driver driver = { 
	.gem_prime_import = i915_gem_prime_import,

	.gem_prime_import = i915_gem_prime_import,





	.dumb_create = i915_gem_dumb_create,

	.dumb_create = i915_gem_dumb_create,

	.dumb_map_offset = i915_gem_dumb_map_offset,

	.dumb_map_offset = i915_gem_mmap_gtt,

	.dumb_destroy = drm_gem_dumb_destroy,

	.dumb_destroy = drm_gem_dumb_destroy,

	.ioctls = i915_ioctls,

	.ioctls = i915_ioctls,

	.fops = &i915_driver_fops,

	.fops = &i915_driver_fops,

drivers/gpu/drm/i915/i915_drv.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -2501,9 +2501,8 @@ void i915_vma_move_to_active(struct i915_vma *vma, 
int i915_gem_dumb_create(struct drm_file *file_priv,

int i915_gem_dumb_create(struct drm_file *file_priv,

			 struct drm_device *dev,

			 struct drm_device *dev,

			 struct drm_mode_create_dumb *args);

			 struct drm_mode_create_dumb *args);

int i915_gem_dumb_map_offset(struct drm_file *file_priv,

int i915_gem_mmap_gtt(struct drm_file *file_priv, struct drm_device *dev,

			     struct drm_device *dev, uint32_t handle,

		      uint32_t handle, uint64_t *offset);

			     uint64_t *offset);

/**

/**

 * Returns true if seq1 is later than seq2.

 * Returns true if seq1 is later than seq2.

 */

 */

drivers/gpu/drm/i915/i915_gem.c

+5 −23
Original line number Original line Diff line number Diff line
@@ -401,7 +401,6 @@ static int 
i915_gem_create(struct drm_file *file,

i915_gem_create(struct drm_file *file,

		struct drm_device *dev,

		struct drm_device *dev,

		uint64_t size,

		uint64_t size,

		bool dumb,

		uint32_t *handle_p)

		uint32_t *handle_p)

{

{

	struct drm_i915_gem_object *obj;

	struct drm_i915_gem_object *obj;
@@ -417,7 +416,6 @@ i915_gem_create(struct drm_file *file, 
	if (obj == NULL)

	if (obj == NULL)

		return -ENOMEM;

		return -ENOMEM;





	obj->base.dumb = dumb;

	ret = drm_gem_handle_create(file, &obj->base, &handle);

	ret = drm_gem_handle_create(file, &obj->base, &handle);

	/* drop reference from allocate - handle holds it now */

	/* drop reference from allocate - handle holds it now */

	drm_gem_object_unreference_unlocked(&obj->base);

	drm_gem_object_unreference_unlocked(&obj->base);
@@ -437,7 +435,7 @@ i915_gem_dumb_create(struct drm_file *file, 
	args->pitch = ALIGN(args->width * DIV_ROUND_UP(args->bpp, 8), 64);

	args->pitch = ALIGN(args->width * DIV_ROUND_UP(args->bpp, 8), 64);

	args->size = args->pitch * args->height;

	args->size = args->pitch * args->height;

	return i915_gem_create(file, dev,

	return i915_gem_create(file, dev,

			       args->size, true, &args->handle);

			       args->size, &args->handle);

}

}





/**

/**
@@ -450,7 +448,7 @@ i915_gem_create_ioctl(struct drm_device *dev, void *data, 
	struct drm_i915_gem_create *args = data;

	struct drm_i915_gem_create *args = data;





	return i915_gem_create(file, dev,

	return i915_gem_create(file, dev,

			       args->size, false, &args->handle);

			       args->size, &args->handle);

}

}





static inline int

static inline int
@@ -1840,10 +1838,10 @@ static void i915_gem_object_free_mmap_offset(struct drm_i915_gem_object *obj) 
	drm_gem_free_mmap_offset(&obj->base);

	drm_gem_free_mmap_offset(&obj->base);

}

}





static int

int

i915_gem_mmap_gtt(struct drm_file *file,

i915_gem_mmap_gtt(struct drm_file *file,

		  struct drm_device *dev,

		  struct drm_device *dev,

		  uint32_t handle, bool dumb,

		  uint32_t handle,

		  uint64_t *offset)

		  uint64_t *offset)

{

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1860,13 +1858,6 @@ i915_gem_mmap_gtt(struct drm_file *file, 
		goto unlock;

		goto unlock;

	}

	}





	/*

	 * We don't allow dumb mmaps on objects created using another

	 * interface.

	 */

	WARN_ONCE(dumb && !(obj->base.dumb || obj->base.import_attach),

		  "Illegal dumb map of accelerated buffer.\n");



	if (obj->base.size > dev_priv->gtt.mappable_end) {

	if (obj->base.size > dev_priv->gtt.mappable_end) {

		ret = -E2BIG;

		ret = -E2BIG;

		goto out;

		goto out;
@@ -1891,15 +1882,6 @@ i915_gem_mmap_gtt(struct drm_file *file, 
	return ret;

	return ret;

}

}





int

i915_gem_dumb_map_offset(struct drm_file *file,

			 struct drm_device *dev,

			 uint32_t handle,

			 uint64_t *offset)

{

	return i915_gem_mmap_gtt(file, dev, handle, true, offset);

}



/**

/**

 * i915_gem_mmap_gtt_ioctl - prepare an object for GTT mmap'ing

 * i915_gem_mmap_gtt_ioctl - prepare an object for GTT mmap'ing

 * @dev: DRM device

 * @dev: DRM device
@@ -1921,7 +1903,7 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, 
{

{

	struct drm_i915_gem_mmap_gtt *args = data;

	struct drm_i915_gem_mmap_gtt *args = data;





	return i915_gem_mmap_gtt(file, dev, args->handle, false, &args->offset);

	return i915_gem_mmap_gtt(file, dev, args->handle, &args->offset);

}

}





static inline int

static inline int

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -121,9 +121,6 @@ eb_lookup_vmas(struct eb_vmas *eb, 
			goto err;

			goto err;

		}

		}





		WARN_ONCE(obj->base.dumb,

			  "GPU use of dumb buffer is illegal.\n");



		drm_gem_object_reference(&obj->base);

		drm_gem_object_reference(&obj->base);

		list_add_tail(&obj->obj_exec_link, &objects);

		list_add_tail(&obj->obj_exec_link, &objects);

	}

	}

drivers/gpu/drm/nouveau/nouveau_display.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -876,7 +876,6 @@ nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev, 
	if (ret)

	if (ret)

		return ret;

		return ret;





	bo->gem.dumb = true;

	ret = drm_gem_handle_create(file_priv, &bo->gem, &args->handle);

	ret = drm_gem_handle_create(file_priv, &bo->gem, &args->handle);

	drm_gem_object_unreference_unlocked(&bo->gem);

	drm_gem_object_unreference_unlocked(&bo->gem);

	return ret;

	return ret;
@@ -892,14 +891,6 @@ nouveau_display_dumb_map_offset(struct drm_file *file_priv, 
	gem = drm_gem_object_lookup(dev, file_priv, handle);

	gem = drm_gem_object_lookup(dev, file_priv, handle);

	if (gem) {

	if (gem) {

		struct nouveau_bo *bo = nouveau_gem_object(gem);

		struct nouveau_bo *bo = nouveau_gem_object(gem);



		/*

		 * We don't allow dumb mmaps on objects created using another

		 * interface.

		 */

		WARN_ONCE(!(gem->dumb || gem->import_attach),

			  "Illegal dumb map of accelerated buffer.\n");



		*poffset = drm_vma_node_offset_addr(&bo->bo.vma_node);

		*poffset = drm_vma_node_offset_addr(&bo->bo.vma_node);

		drm_gem_object_unreference_unlocked(gem);

		drm_gem_object_unreference_unlocked(gem);

		return 0;

		return 0;