Attachment 112951 Details for Bug 88786 – possible fix

[patch] possible fix

0001-drm-radeon-don-t-init-gpuvm-if-accel-is-disabled-v2.patch (text/plain), 1.81 KB, created by Alex Deucher on 2015-01-29 15:34:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2015-01-29 15:34:44 UTC

Size: 1.81 KB

patch

obsolete

>From 0573ac07277902d7b629ec6b5375071f8c225139 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Wed, 28 Jan 2015 14:36:26 -0500
>Subject: [PATCH] drm/radeon: don't init gpuvm if accel is disabled (v2)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>If acceleration is disabled, it does not make sense
>to init gpuvm since nothing will use it.  Moreover,
>if radeon_vm_init() gets called it uses accel to try
>and clear the pde tables, etc. which results in a bug.
>
>v2: handle vm_fini as well
>
>Bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=88786
>
>Reviewed-by: Christian KÃ¶nig <christian.koenig@amd.com>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/radeon_kms.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
>index 3cf9c1f..686411e 100644
>--- a/drivers/gpu/drm/radeon/radeon_kms.c
>+++ b/drivers/gpu/drm/radeon/radeon_kms.c
>@@ -605,14 +605,14 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
> 			return -ENOMEM;
> 		}
> 
>-		vm = &fpriv->vm;
>-		r = radeon_vm_init(rdev, vm);
>-		if (r) {
>-			kfree(fpriv);
>-			return r;
>-		}
>-
> 		if (rdev->accel_working) {
>+			vm = &fpriv->vm;
>+			r = radeon_vm_init(rdev, vm);
>+			if (r) {
>+				kfree(fpriv);
>+				return r;
>+			}
>+
> 			r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
> 			if (r) {
> 				radeon_vm_fini(rdev, vm);
>@@ -668,9 +668,9 @@ void radeon_driver_postclose_kms(struct drm_device *dev,
> 					radeon_vm_bo_rmv(rdev, vm->ib_bo_va);
> 				radeon_bo_unreserve(rdev->ring_tmp_bo.bo);
> 			}
>+			radeon_vm_fini(rdev, vm);
> 		}
> 
>-		radeon_vm_fini(rdev, vm);
> 		kfree(fpriv);
> 		file_priv->driver_priv = NULL;
> 	}
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 88786: 112799 | 112800 | 112801 | 112802 | 112805 | 112895 | 112898 | 112919 | 112924 | 112951 | 112957 | 112975 | 112997

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.