Op 14-01-13 11:03, Daniel Vetter schreef:
This fixes up
commit e8e89622ed361c46bf90ba4828e685a8b603f7e5 Author: Daniel Vetter daniel.vetter@ffwll.ch Date: Tue Dec 18 22:25:11 2012 +0100
drm/ttm: fix fence locking in ttm_buffer_object_transferwhich leaves behind a might_sleep in atomic context, since the fence_lock spinlock is held over a kmalloc(GFP_KERNEL) call. The fix is to revert the above commit and only take the lock where we need it, around the call to ->sync_obj_ref.
Reported-by: Dave Airlie airlied@gmail.com Cc: Jerome Glisse jglisse@redhat.com Cc: Maarten Lankhorst maarten.lankhorst@canonical.com Signed-off-by: Daniel Vetter daniel.vetter@ffwll.ch
drivers/gpu/drm/ttm/ttm_bo_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index d73d6e3..d4bb792 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -441,7 +441,9 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo, fbo->vm_node = NULL; atomic_set(&fbo->cpu_writers, 0);
- spin_unlock(&bdev->fence_lock); fbo->sync_obj = driver->sync_obj_ref(bo->sync_obj);
- spin_lock(&bdev->fence_lock); kref_init(&fbo->list_kref); kref_init(&fbo->kref); fbo->destroy = &ttm_transfered_destroy;
Methinks you messed up spin_lock and spin_unlock here.
@@ -654,13 +656,11 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo, */
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);
ret = ttm_buffer_object_transfer(bo, &ghost_obj);
~Maarten