[PATCH v3 16/18] drm/qxl: switch driver from bo->resv to bo->base.resv

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
Acked-by: Christian König <christian.koe...@amd.com>
---
 drivers/gpu/drm/qxl/qxl_debugfs.c | 2 +-
 drivers/gpu/drm/qxl/qxl_release.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c 
b/drivers/gpu/drm/qxl/qxl_debugfs.c
index 013b938986c7..f30460782f05 100644
--- 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 32126e8836b3..1b7be82c8e68 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -234,7 +234,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;
 
@@ -454,9 +454,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);
-- 
2.18.1

_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization