drm/radeon: switch driver from bo->resv to bo->base.resv (336ac942) · Commits · 戴 / test

drivers/gpu/drm/radeon/radeon_benchmark.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

+3 −3

Original line number	Diff line number	Diff line
		@@ -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)

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);