Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f5e1b4f authored by Ilija Hadzic's avatar Ilija Hadzic Committed by Alex Deucher
Browse files

drm/radeon: fix the crash in benchmark functions 

radeon_copy_dma and radeon_copy_blit must be called with
a valid reservation object. Otherwise a crash will be provoked.
We borrow the object from destination BO.

bug:
https://bugs.freedesktop.org/show_bug.cgi?id=88464



Cc: stable@vger.kernel.org
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarIlija Hadzic <ihadzic@research.bell-labs.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a124d068

drivers/gpu/drm/radeon/radeon_benchmark.c

+8 −5
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 


static int radeon_benchmark_do_move(struct radeon_device *rdev, unsigned size,

				    uint64_t saddr, uint64_t daddr,

				    int flag, int n)

				    int flag, int n,

				    struct reservation_object *resv)

{

	unsigned long start_jiffies;

	unsigned long end_jiffies;
@@ -47,12 +48,12 @@ static int radeon_benchmark_do_move(struct radeon_device *rdev, unsigned size, 
		case RADEON_BENCHMARK_COPY_DMA:

			fence = radeon_copy_dma(rdev, saddr, daddr,

						size / RADEON_GPU_PAGE_SIZE,

						NULL);

						resv);

			break;

		case RADEON_BENCHMARK_COPY_BLIT:

			fence = radeon_copy_blit(rdev, saddr, daddr,

						 size / RADEON_GPU_PAGE_SIZE,

						 NULL);

						 resv);

			break;

		default:

			DRM_ERROR("Unknown copy method\n");
@@ -120,7 +121,8 @@ 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);

						RADEON_BENCHMARK_COPY_DMA, n,

						dobj->tbo.resv);

		if (time < 0)

			goto out_cleanup;

		if (time > 0)
@@ -130,7 +132,8 @@ 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);

						RADEON_BENCHMARK_COPY_BLIT, n,

						dobj->tbo.resv);

		if (time < 0)

			goto out_cleanup;

		if (time > 0)