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

Commit 2a1a6e7a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm regression fix from Dave Airlie:
 "This one fixes a sleep while locked regression that was introduced
  earlier in 3.8."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/ttm: fix fence locking in ttm_buffer_object_transfer, 2nd try
parents 124b69b6 ff7c60c5

drivers/gpu/drm/ttm/ttm_bo_util.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -429,7 +429,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, 
	struct ttm_bo_device *bdev = bo->bdev;

	struct ttm_bo_device *bdev = bo->bdev;

	struct ttm_bo_driver *driver = bdev->driver;

	struct ttm_bo_driver *driver = bdev->driver;





	fbo = kzalloc(sizeof(*fbo), GFP_KERNEL);

	fbo = kmalloc(sizeof(*fbo), GFP_KERNEL);

	if (!fbo)

	if (!fbo)

		return -ENOMEM;

		return -ENOMEM;
@@ -448,7 +448,12 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, 
	fbo->vm_node = NULL;

	fbo->vm_node = NULL;

	atomic_set(&fbo->cpu_writers, 0);

	atomic_set(&fbo->cpu_writers, 0);





	spin_lock(&bdev->fence_lock);

	if (bo->sync_obj)

		fbo->sync_obj = driver->sync_obj_ref(bo->sync_obj);

		fbo->sync_obj = driver->sync_obj_ref(bo->sync_obj);

	else

		fbo->sync_obj = NULL;

	spin_unlock(&bdev->fence_lock);

	kref_init(&fbo->list_kref);

	kref_init(&fbo->list_kref);

	kref_init(&fbo->kref);

	kref_init(&fbo->kref);

	fbo->destroy = &ttm_transfered_destroy;

	fbo->destroy = &ttm_transfered_destroy;
@@ -661,13 +666,11 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, 
		 */

		 */





		set_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags);

		set_bit(TTM_BO_PRIV_FLAG_MOVING, &bo->priv_flags);



		/* ttm_buffer_object_transfer accesses bo->sync_obj */

		ret = ttm_buffer_object_transfer(bo, &ghost_obj);

		spin_unlock(&bdev->fence_lock);

		spin_unlock(&bdev->fence_lock);

		if (tmp_obj)

		if (tmp_obj)

			driver->sync_obj_unref(&tmp_obj);

			driver->sync_obj_unref(&tmp_obj);





		ret = ttm_buffer_object_transfer(bo, &ghost_obj);

		if (ret)

		if (ret)

			return ret;

			return ret;