drm/qxl: Remove release_lock stupidity

The locking of release_lock was stupid; t should have been be called with
fence_lock_irq if it was legitimately used. Unfortunately it never protected
anything except the fence implementation correctly.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>

diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index a4a63fd848037c3a605d24100c955e83fccee1c1..6911b8c444928fdaa04f2f2d82b1180def5aba09 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -57,7 +57,6 @@ qxl_debugfs_buffers_info(struct seq_file *m, void *data)
        struct qxl_device *qdev = node->minor->dev->dev_private;
        struct qxl_bo *bo;
 
-       spin_lock(&qdev->release_lock);
        list_for_each_entry(bo, &qdev->gem.objects, list) {
                struct reservation_object_list *fobj;
                int rel;
@@ -71,7 +70,6 @@ qxl_debugfs_buffers_info(struct seq_file *m, void *data)
                           (unsigned long)bo->gem_base.size,
                           bo->pin_count, rel);
        }
-       spin_unlock(&qdev->release_lock);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index 15158c5a5b3ae766fb49c69dd25fd475e7135562..828d47e90dce69e1174903dde6ec39f209c1e7bf 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -71,7 +71,7 @@ static long qxl_fence_wait(struct fence *fence, bool intr, signed long timeout)
 retry:
        sc++;
 
-       if (fence_is_signaled_locked(fence))
+       if (fence_is_signaled(fence))
                goto signaled;
 
        qxl_io_notify_oom(qdev);
@@ -80,11 +80,11 @@ retry:
                if (!qxl_queue_garbage_collect(qdev, true))
                        break;
 
-               if (fence_is_signaled_locked(fence))
+               if (fence_is_signaled(fence))
                        goto signaled;
        }
 
-       if (fence_is_signaled_locked(fence))
+       if (fence_is_signaled(fence))
                goto signaled;
 
        if (have_drawable_releases || sc < 4) {
@@ -457,8 +457,6 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release)
        glob = bo->glob;
 
        spin_lock(&glob->lru_lock);
-       /* acquire release_lock to protect bo->resv->fence and its contents */
-       spin_lock(&qdev->release_lock);
 
        list_for_each_entry(entry, &release->bos, head) {
                bo = entry->bo;
@@ -468,7 +466,6 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release)
                ttm_bo_add_to_lru(bo);
                __ttm_bo_unreserve(bo);
        }
-       spin_unlock(&qdev->release_lock);
        spin_unlock(&glob->lru_lock);
        ww_acquire_fini(&release->ticket);
 }