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

Commit 294adf7d authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm/vmwgfx: Use a per-device semaphore for reservation protection 



Don't use a per-master semaphore (ttm lock) for reservation protection, but
rather a per-device semaphore. This is needed since clients connecting using
render nodes aren't master aware.

The ttm lock used should probably be replaced with a reader-write semaphore
once the function down_xx_interruptible() is available.

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarBrian Paul <brianp@vmware.com>
parent 4beb6d9f

drivers/gpu/drm/vmwgfx/vmwgfx_context.c

+2 −3
Original line number Diff line number Diff line
@@ -462,7 +462,6 @@ int vmw_context_define_ioctl(struct drm_device *dev, void *data, 
	struct vmw_resource *tmp;

	struct drm_vmw_context_arg *arg = (struct drm_vmw_context_arg *)data;

	struct ttm_object_file *tfile = vmw_fpriv(file_priv)->tfile;

	struct vmw_master *vmaster = vmw_master(file_priv->master);

	int ret;
@@ -474,7 +473,7 @@ int vmw_context_define_ioctl(struct drm_device *dev, void *data, 
	if (unlikely(vmw_user_context_size == 0))

		vmw_user_context_size = ttm_round_pot(sizeof(*ctx)) + 128;



	ret = ttm_read_lock(&vmaster->lock, true);

	ret = ttm_read_lock(&dev_priv->reservation_sem, true);

	if (unlikely(ret != 0))

		return ret;
@@ -521,7 +520,7 @@ int vmw_context_define_ioctl(struct drm_device *dev, void *data, 
out_err:

	vmw_resource_unreference(&res);

out_unlock:

	ttm_read_unlock(&vmaster->lock);

	ttm_read_unlock(&dev_priv->reservation_sem);

	return ret;



}

drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c

+6 −9
Original line number Diff line number Diff line
@@ -52,11 +52,10 @@ int vmw_dmabuf_to_placement(struct vmw_private *dev_priv, 
			    struct ttm_placement *placement,

			    bool interruptible)

{

	struct vmw_master *vmaster = dev_priv->active_master;

	struct ttm_buffer_object *bo = &buf->base;

	int ret;



	ret = ttm_write_lock(&vmaster->lock, interruptible);

	ret = ttm_write_lock(&dev_priv->reservation_sem, interruptible);

	if (unlikely(ret != 0))

		return ret;
@@ -71,7 +70,7 @@ int vmw_dmabuf_to_placement(struct vmw_private *dev_priv, 
	ttm_bo_unreserve(bo);



err:

	ttm_write_unlock(&vmaster->lock);

	ttm_write_unlock(&dev_priv->reservation_sem);

	return ret;

}
@@ -95,12 +94,11 @@ int vmw_dmabuf_to_vram_or_gmr(struct vmw_private *dev_priv, 
			      struct vmw_dma_buffer *buf,

			      bool pin, bool interruptible)

{

	struct vmw_master *vmaster = dev_priv->active_master;

	struct ttm_buffer_object *bo = &buf->base;

	struct ttm_placement *placement;

	int ret;



	ret = ttm_write_lock(&vmaster->lock, interruptible);

	ret = ttm_write_lock(&dev_priv->reservation_sem, interruptible);

	if (unlikely(ret != 0))

		return ret;
@@ -143,7 +141,7 @@ int vmw_dmabuf_to_vram_or_gmr(struct vmw_private *dev_priv, 
err_unreserve:

	ttm_bo_unreserve(bo);

err:

	ttm_write_unlock(&vmaster->lock);

	ttm_write_unlock(&dev_priv->reservation_sem);

	return ret;

}
@@ -198,7 +196,6 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *dev_priv, 
				struct vmw_dma_buffer *buf,

				bool pin, bool interruptible)

{

	struct vmw_master *vmaster = dev_priv->active_master;

	struct ttm_buffer_object *bo = &buf->base;

	struct ttm_placement placement;

	int ret = 0;
@@ -209,7 +206,7 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *dev_priv, 
		placement = vmw_vram_placement;

	placement.lpfn = bo->num_pages;



	ret = ttm_write_lock(&vmaster->lock, interruptible);

	ret = ttm_write_lock(&dev_priv->reservation_sem, interruptible);

	if (unlikely(ret != 0))

		return ret;
@@ -232,7 +229,7 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *dev_priv, 


	ttm_bo_unreserve(bo);

err_unlock:

	ttm_write_unlock(&vmaster->lock);

	ttm_write_unlock(&dev_priv->reservation_sem);



	return ret;

}

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -606,6 +606,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) 
	mutex_init(&dev_priv->release_mutex);

	mutex_init(&dev_priv->binding_mutex);

	rwlock_init(&dev_priv->resource_lock);

	ttm_lock_init(&dev_priv->reservation_sem);



	for (i = vmw_res_context; i < vmw_res_max; ++i) {

		idr_init(&dev_priv->res_idr[i]);
@@ -1175,12 +1176,11 @@ static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val, 
{

	struct vmw_private *dev_priv =

		container_of(nb, struct vmw_private, pm_nb);

	struct vmw_master *vmaster = dev_priv->active_master;



	switch (val) {

	case PM_HIBERNATION_PREPARE:

	case PM_SUSPEND_PREPARE:

		ttm_suspend_lock(&vmaster->lock);

		ttm_suspend_lock(&dev_priv->reservation_sem);



		/**

		 * This empties VRAM and unbinds all GMR bindings.
@@ -1194,7 +1194,7 @@ static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val, 
	case PM_POST_HIBERNATION:

	case PM_POST_SUSPEND:

	case PM_POST_RESTORE:

		ttm_suspend_unlock(&vmaster->lock);

		ttm_suspend_unlock(&dev_priv->reservation_sem);



		break;

	case PM_RESTORE_PREPARE:

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+5 −0
Original line number Diff line number Diff line
@@ -486,6 +486,11 @@ struct vmw_private { 
	struct mutex release_mutex;

	uint32_t num_3d_resources;



	/*

	 * Replace this with an rwsem as soon as we have down_xx_interruptible()

	 */

	struct ttm_lock reservation_sem;



	/*

	 * Query processing. These members

	 * are protected by the cmdbuf mutex.

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+2 −3
Original line number Diff line number Diff line
@@ -2712,7 +2712,6 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, 
{

	struct vmw_private *dev_priv = vmw_priv(dev);

	struct drm_vmw_execbuf_arg *arg = (struct drm_vmw_execbuf_arg *)data;

	struct vmw_master *vmaster = vmw_master(file_priv->master);

	int ret;



	/*
@@ -2729,7 +2728,7 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, 
		return -EINVAL;

	}



	ret = ttm_read_lock(&vmaster->lock, true);

	ret = ttm_read_lock(&dev_priv->reservation_sem, true);

	if (unlikely(ret != 0))

		return ret;
@@ -2745,6 +2744,6 @@ int vmw_execbuf_ioctl(struct drm_device *dev, void *data, 
	vmw_kms_cursor_post_execbuf(dev_priv);



out_unlock:

	ttm_read_unlock(&vmaster->lock);

	ttm_read_unlock(&dev_priv->reservation_sem);

	return ret;

}