Attachment 76410 Details for Bug 62239 – possible fix

[patch] possible fix

0001-drm-radeon-benchmark-make-sure-bo-blit-copy-exists-b.patch (text/plain), 1.45 KB, created by Alex Deucher on 2013-03-12 16:58:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2013-03-12 16:58:55 UTC

Size: 1.45 KB

patch

obsolete

>From 7b3e3690120af085ef58f4f9b3ec13b94b586129 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Tue, 12 Mar 2013 12:53:13 -0400
>Subject: [PATCH] drm/radeon/benchmark: make sure bo blit copy exists before
> using it
>
>Fixes a segfault on asics without a blit callback.
>
>Fixes:
>https://bugs.freedesktop.org/show_bug.cgi?id=62239
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/radeon_benchmark.c |   16 +++++++++-------
> 1 files changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_benchmark.c b/drivers/gpu/drm/radeon/radeon_benchmark.c
>index bedda9c..a2f0c24 100644
>--- a/drivers/gpu/drm/radeon/radeon_benchmark.c
>+++ b/drivers/gpu/drm/radeon/radeon_benchmark.c
>@@ -135,13 +135,15 @@ static void radeon_benchmark_move(struct radeon_device *rdev, unsigned size,
> 						     sdomain, ddomain, "dma");
> 	}
> 
>-	time = radeon_benchmark_do_move(rdev, size, saddr, daddr,
>-					RADEON_BENCHMARK_COPY_BLIT, n);
>-	if (time < 0)
>-		goto out_cleanup;
>-	if (time > 0)
>-		radeon_benchmark_log_results(n, size, time,
>-					     sdomain, ddomain, "blit");
>+	if (rdev->asic->copy.blit) {
>+		time = radeon_benchmark_do_move(rdev, size, saddr, daddr,
>+						RADEON_BENCHMARK_COPY_BLIT, n);
>+		if (time < 0)
>+			goto out_cleanup;
>+		if (time > 0)
>+			radeon_benchmark_log_results(n, size, time,
>+						     sdomain, ddomain, "blit");
>+	}
> 
> out_cleanup:
> 	if (sobj) {
>-- 
>1.7.7.5
>

Actions: View | Splinter Review

Attachments on bug 62239: 76410

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.