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

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

diff --git a/drivers/gpu/drm/radeon/radeon_benchmark.c b/drivers/gpu/drm/radeon/radeon_benchmark.c
index 7ce5064a59f6380a7661345978d3ad185f65de02..1ea50ce16312487ee653e9b8ac8b584dd0df596d 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_benchmark.c
+++ b/drivers/gpu/drm/radeon/radeon_benchmark.c
@@ -122,7 +122,7 @@ static void radeon_benchmark_move(struct radeon_device *rdev, unsigned size,
        if (rdev->asic->copy.dma) {
                time = radeon_benchmark_do_move(rdev, size, saddr, daddr,
                                                RADEON_BENCHMARK_COPY_DMA, n,
-                                               dobj->tbo.resv);
+                                               dobj->tbo.base.resv);
                if (time < 0)
                        goto out_cleanup;
                if (time > 0)
@@ -133,7 +133,7 @@ static void radeon_benchmark_move(struct radeon_device *rdev, unsigned size,
        if (rdev->asic->copy.blit) {
                time = radeon_benchmark_do_move(rdev, size, saddr, daddr,
                                                RADEON_BENCHMARK_COPY_BLIT, n,
-                                               dobj->tbo.resv);
+                                               dobj->tbo.base.resv);
                if (time < 0)
                        goto out_cleanup;
                if (time > 0)

diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index d206654b31ad21d19a4d029528390fd4221583c1..7e5254a34e84c9ff3d8dba4268ed21ea7b26d498 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -257,7 +257,7 @@ static int radeon_cs_sync_rings(struct radeon_cs_parser *p)
        list_for_each_entry(reloc, &p->validated, tv.head) {
                struct reservation_object *resv;
 
-               resv = reloc->robj->tbo.resv;
+               resv = reloc->robj->tbo.base.resv;
                r = radeon_sync_resv(p->rdev, &p->ib.sync, resv,
                                     reloc->tv.num_shared);
                if (r)

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index ea6b752dd3a478180ced8d5da59a435232fa0d69..7bf73230ac0b06de8681ba92a6456a32340d6de2 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -533,7 +533,7 @@ static int radeon_crtc_page_flip_target(struct drm_crtc *crtc,
                DRM_ERROR("failed to pin new rbo buffer before flip\n");
                goto cleanup;
        }
-       work->fence = dma_fence_get(reservation_object_get_excl(new_rbo->tbo.resv));
+       work->fence = dma_fence_get(reservation_object_get_excl(new_rbo->tbo.base.resv));
        radeon_bo_get_tiling_flags(new_rbo, &tiling_flags, NULL);
        radeon_bo_unreserve(new_rbo);
 

diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
index 7238007f5aa42d08869e127c99a25bda489d1e2f..03873f21a734c41b078a564fb6f2cbc6b0d55aac 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -114,7 +114,7 @@ static int radeon_gem_set_domain(struct drm_gem_object *gobj,
        }
        if (domain == RADEON_GEM_DOMAIN_CPU) {
                /* Asking for cpu access wait for object idle */
-               r = reservation_object_wait_timeout_rcu(robj->tbo.resv, true, true, 30 * HZ);
+               r = reservation_object_wait_timeout_rcu(robj->tbo.base.resv, true, true, 30 * HZ);
                if (!r)
                        r = -EBUSY;
 
@@ -449,7 +449,7 @@ int radeon_gem_busy_ioctl(struct drm_device *dev, void *data,
        }
        robj = gem_to_radeon_bo(gobj);
 
-       r = reservation_object_test_signaled_rcu(robj->tbo.resv, true);
+       r = reservation_object_test_signaled_rcu(robj->tbo.base.resv, true);
        if (r == 0)
                r = -EBUSY;
        else
@@ -478,7 +478,7 @@ int radeon_gem_wait_idle_ioctl(struct drm_device *dev, void *data,
        }
        robj = gem_to_radeon_bo(gobj);
 
-       ret = reservation_object_wait_timeout_rcu(robj->tbo.resv, true, true, 30 * HZ);
+       ret = reservation_object_wait_timeout_rcu(robj->tbo.base.resv, true, true, 30 * HZ);
        if (ret == 0)
                r = -EBUSY;
        else if (ret < 0)

diff --git a/drivers/gpu/drm/radeon/radeon_mn.c b/drivers/gpu/drm/radeon/radeon_mn.c
index 8c3871ed23a9f0f3d6da25ea52038125c33b67a1..0d64ace0e6c12a47a165f829577e61ac22e538a8 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_mn.c
+++ b/drivers/gpu/drm/radeon/radeon_mn.c
@@ -163,7 +163,7 @@ static int radeon_mn_invalidate_range_start(struct mmu_notifier *mn,
                                continue;
                        }
 
-                       r = reservation_object_wait_timeout_rcu(bo->tbo.resv,
+                       r = reservation_object_wait_timeout_rcu(bo->tbo.base.resv,
                                true, false, MAX_SCHEDULE_TIMEOUT);
                        if (r <= 0)
                                DRM_ERROR("(%ld) failed to wait for user bo\n", r);

diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index a319afc814081eedc57ef1c23276107e3ef48d06..9db8ba29ef686c83732ce3cb41f1218c22ca8b95 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -262,7 +262,6 @@ int radeon_bo_create(struct radeon_device *rdev,
        r = ttm_bo_init(&rdev->mman.bdev, &bo->tbo, size, type,
                        &bo->placement, page_align, !kernel, acc_size,
                        sg, resv, &radeon_ttm_bo_destroy);
-       bo->tbo.base.resv = bo->tbo.resv;
        up_read(&rdev->pm.mclk_lock);
        if (unlikely(r != 0)) {
                return r;
@@ -611,7 +610,7 @@ int radeon_bo_get_surface_reg(struct radeon_bo *bo)
        int steal;
        int i;
 
-       reservation_object_assert_held(bo->tbo.resv);
+       reservation_object_assert_held(bo->tbo.base.resv);
 
        if (!bo->tiling_flags)
                return 0;
@@ -737,7 +736,7 @@ void radeon_bo_get_tiling_flags(struct radeon_bo *bo,
                                uint32_t *tiling_flags,
                                uint32_t *pitch)
 {
-       reservation_object_assert_held(bo->tbo.resv);
+       reservation_object_assert_held(bo->tbo.base.resv);
 
        if (tiling_flags)
                *tiling_flags = bo->tiling_flags;
@@ -749,7 +748,7 @@ int radeon_bo_check_tiling(struct radeon_bo *bo, bool has_moved,
                                bool force_drop)
 {
        if (!force_drop)
-               reservation_object_assert_held(bo->tbo.resv);
+               reservation_object_assert_held(bo->tbo.base.resv);
 
        if (!(bo->tiling_flags & RADEON_TILING_SURFACE))
                return 0;
@@ -871,7 +870,7 @@ int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, bool no_wait)
 void radeon_bo_fence(struct radeon_bo *bo, struct radeon_fence *fence,
                     bool shared)
 {
-       struct reservation_object *resv = bo->tbo.resv;
+       struct reservation_object *resv = bo->tbo.base.resv;
 
        if (shared)
                reservation_object_add_shared_fence(resv, &fence->base);

diff --git a/drivers/gpu/drm/radeon/radeon_test.c b/drivers/gpu/drm/radeon/radeon_test.c
index 0f6ba81a16691bacc7afa2cca3147e860cac7af8..a5e1d2139e802bfa7c2f6e5694d965634f95ff11 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_test.c
+++ b/drivers/gpu/drm/radeon/radeon_test.c
@@ -120,11 +120,11 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag)
                if (ring == R600_RING_TYPE_DMA_INDEX)
                        fence = radeon_copy_dma(rdev, gtt_addr, vram_addr,
                                                size / RADEON_GPU_PAGE_SIZE,
-                                               vram_obj->tbo.resv);
+                                               vram_obj->tbo.base.resv);
                else
                        fence = radeon_copy_blit(rdev, gtt_addr, vram_addr,
                                                 size / RADEON_GPU_PAGE_SIZE,
-                                                vram_obj->tbo.resv);
+                                                vram_obj->tbo.base.resv);
                if (IS_ERR(fence)) {
                        DRM_ERROR("Failed GTT->VRAM copy %d\n", i);
                        r = PTR_ERR(fence);
@@ -171,11 +171,11 @@ static void radeon_do_test_moves(struct radeon_device *rdev, int flag)
                if (ring == R600_RING_TYPE_DMA_INDEX)
                        fence = radeon_copy_dma(rdev, vram_addr, gtt_addr,
                                                size / RADEON_GPU_PAGE_SIZE,
-                                               vram_obj->tbo.resv);
+                                               vram_obj->tbo.base.resv);
                else
                        fence = radeon_copy_blit(rdev, vram_addr, gtt_addr,
                                                 size / RADEON_GPU_PAGE_SIZE,
-                                                vram_obj->tbo.resv);
+                                                vram_obj->tbo.base.resv);
                if (IS_ERR(fence)) {
                        DRM_ERROR("Failed VRAM->GTT copy %d\n", i);
                        r = PTR_ERR(fence);

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index f43ff0e0641d92aa8e768d8cb37cb5d523d2782a..35ac75a11d3878cbb0f617b84abf8f3e97ff1d79 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -244,7 +244,7 @@ static int radeon_move_blit(struct ttm_buffer_object *bo,
        BUILD_BUG_ON((PAGE_SIZE % RADEON_GPU_PAGE_SIZE) != 0);
 
        num_pages = new_mem->num_pages * (PAGE_SIZE / RADEON_GPU_PAGE_SIZE);
-       fence = radeon_copy(rdev, old_start, new_start, num_pages, bo->resv);
+       fence = radeon_copy(rdev, old_start, new_start, num_pages, bo->base.resv);
        if (IS_ERR(fence))
                return PTR_ERR(fence);
 

diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c
index ff4f794d1c869cef9c7ff3a3d04f177104c2e7b2..311e69c2ed7f8b6b78cc79d1fb0295ecd1728bcd 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_uvd.c
+++ b/drivers/gpu/drm/radeon/radeon_uvd.c
@@ -477,7 +477,7 @@ static int radeon_uvd_cs_msg(struct radeon_cs_parser *p, struct radeon_bo *bo,
                return -EINVAL;
        }
 
-       f = reservation_object_get_excl(bo->tbo.resv);
+       f = reservation_object_get_excl(bo->tbo.base.resv);
        if (f) {
                r = radeon_fence_wait((struct radeon_fence *)f, false);
                if (r) {

diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
index 8512b02e9583423c7c8006a396f116dd395086f4..e48a0553312659b54531e98f3edf4d3e32caea2a 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_vm.c
+++ b/drivers/gpu/drm/radeon/radeon_vm.c
@@ -702,7 +702,7 @@ int radeon_vm_update_page_directory(struct radeon_device *rdev,
        if (ib.length_dw != 0) {
                radeon_asic_vm_pad_ib(rdev, &ib);
 
-               radeon_sync_resv(rdev, &ib.sync, pd->tbo.resv, true);
+               radeon_sync_resv(rdev, &ib.sync, pd->tbo.base.resv, true);
                WARN_ON(ib.length_dw > ndw);
                r = radeon_ib_schedule(rdev, &ib, NULL, false);
                if (r) {
@@ -830,8 +830,8 @@ static int radeon_vm_update_ptes(struct radeon_device *rdev,
                uint64_t pte;
                int r;
 
-               radeon_sync_resv(rdev, &ib->sync, pt->tbo.resv, true);
-               r = reservation_object_reserve_shared(pt->tbo.resv, 1);
+               radeon_sync_resv(rdev, &ib->sync, pt->tbo.base.resv, true);
+               r = reservation_object_reserve_shared(pt->tbo.base.resv, 1);
                if (r)
                        return r;