drm/qxl: switch driver from bo->resv to bo->base.resv

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Christian König <christian.koenig@amd.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20190805140119.7337-16-kraxel@redhat.com

diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index bdb5ac0987abfb48f8ba6a6d10a215f64fabc437..94439212a5c5d4904b1c1860f2cb10737542a64d 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -61,7 +61,7 @@ qxl_debugfs_buffers_info(struct seq_file *m, void *data)
                int rel;
 
                rcu_read_lock();
-               fobj = rcu_dereference(bo->tbo.resv->fence);
+               fobj = rcu_dereference(bo->tbo.base.resv->fence);
                rel = fobj ? fobj->shared_count : 0;
                rcu_read_unlock();
 

diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index 0022e31ba9106305dbc17403389e9861071a4e59..df55b83e0a5585b3915df96e601aa31b9a1a968a 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -238,7 +238,7 @@ static int qxl_release_validate_bo(struct qxl_bo *bo)
                        return ret;
        }
 
-       ret = reservation_object_reserve_shared(bo->tbo.resv, 1);
+       ret = reservation_object_reserve_shared(bo->tbo.base.resv, 1);
        if (ret)
                return ret;
 
@@ -458,9 +458,9 @@ void qxl_release_fence_buffer_objects(struct qxl_release *release)
        list_for_each_entry(entry, &release->bos, head) {
                bo = entry->bo;
 
-               reservation_object_add_shared_fence(bo->resv, &release->base);
+               reservation_object_add_shared_fence(bo->base.resv, &release->base);
                ttm_bo_add_to_lru(bo);
-               reservation_object_unlock(bo->resv);
+               reservation_object_unlock(bo->base.resv);
        }
        spin_unlock(&glob->lru_lock);
        ww_acquire_fini(&release->ticket);