Attachment 32097 Details for Bug 25567 – possible fix

[patch] possible fix

0001-drm-radeon-kms-make-sure-mc-is-initialized-before-m.patch (text/plain), 2.11 KB, created by Alex Deucher on 2009-12-15 14:31:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2009-12-15 14:31:39 UTC

Size: 2.11 KB

patch

obsolete

>From 6d5e15387d2207c715924dae5916ef7a5a04dd18 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexdeucher@gmail.com>
>Date: Tue, 15 Dec 2009 17:15:07 -0500
>Subject: [PATCH] drm/radeon/kms: make sure mc is initialized before mapping blit bo
>
>We need to make sure the the MC is intialized before we map the
>blit shader object on r6xx+.
>
>Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
>---
> drivers/gpu/drm/radeon/r600.c  |   14 ++++++++------
> drivers/gpu/drm/radeon/rv770.c |   14 ++++++++------
> 2 files changed, 16 insertions(+), 12 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index 5e28467..5c6058c 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -1863,6 +1863,14 @@ int r600_startup(struct radeon_device *rdev)
> 	}
> 	r600_gpu_init(rdev);
> 
>+	if (!rdev->r600_blit.shader_obj) {
>+		r = r600_blit_init(rdev);
>+		if (r) {
>+			DRM_ERROR("radeon: failed blitter (%d).\n", r);
>+			return r;
>+		}
>+	}
>+
> 	r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
> 	if (unlikely(r != 0))
> 		return r;
>@@ -2038,12 +2046,6 @@ int r600_init(struct radeon_device *rdev)
> 	if (r)
> 		return r;
> 
>-	r = r600_blit_init(rdev);
>-	if (r) {
>-		DRM_ERROR("radeon: failed blitter (%d).\n", r);
>-		return r;
>-	}
>-
> 	rdev->accel_working = true;
> 	r = r600_startup(rdev);
> 	if (r) {
>diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
>index 2d124bb..f58dc67 100644
>--- a/drivers/gpu/drm/radeon/rv770.c
>+++ b/drivers/gpu/drm/radeon/rv770.c
>@@ -892,6 +892,14 @@ static int rv770_startup(struct radeon_device *rdev)
> 	}
> 	rv770_gpu_init(rdev);
> 
>+	if (!rdev->r600_blit.shader_obj) {
>+		r = r600_blit_init(rdev);
>+		if (r) {
>+			DRM_ERROR("radeon: failed blitter (%d).\n", r);
>+			return r;
>+		}
>+	}
>+
> 	r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
> 	if (unlikely(r != 0))
> 		return r;
>@@ -1051,12 +1059,6 @@ int rv770_init(struct radeon_device *rdev)
> 	if (r)
> 		return r;
> 
>-	r = r600_blit_init(rdev);
>-	if (r) {
>-		DRM_ERROR("radeon: failed blitter (%d).\n", r);
>-		return r;
>-	}
>-
> 	rdev->accel_working = true;
> 	r = rv770_startup(rdev);
> 	if (r) {
>-- 
>1.5.6.3
>

Actions: View | Splinter Review

Attachments on bug 25567: 31949 | 31950 | 31951 | 31952 | 32097

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.