Attachment 112975 Details for Bug 88786 – possible fix

[patch] possible fix

0001-drm-radeon-don-t-init-gpuvm-if-accel-is-disabled-v3.patch (text/plain), 2.44 KB, created by Alex Deucher on 2015-01-30 14:26:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2015-01-30 14:26:51 UTC

Size: 2.44 KB

patch

obsolete

>From f6a78f627e73b6a9f1ed74f44663a28b6c3b9a3c 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 (v3)
>
>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
>v3: handle bo_open/close as well
>
>Bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=88786
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/radeon_gem.c |  6 ++++--
> drivers/gpu/drm/radeon/radeon_kms.c | 16 ++++++++--------
> 2 files changed, 12 insertions(+), 10 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
>index d0b4f7d..ac3c131 100644
>--- a/drivers/gpu/drm/radeon/radeon_gem.c
>+++ b/drivers/gpu/drm/radeon/radeon_gem.c
>@@ -146,7 +146,8 @@ int radeon_gem_object_open(struct drm_gem_object *obj, struct drm_file *file_pri
> 	struct radeon_bo_va *bo_va;
> 	int r;
> 
>-	if (rdev->family < CHIP_CAYMAN) {
>+	if ((rdev->family < CHIP_CAYMAN) ||
>+	    (!rdev->accel_working)) {
> 		return 0;
> 	}
> 
>@@ -176,7 +177,8 @@ void radeon_gem_object_close(struct drm_gem_object *obj,
> 	struct radeon_bo_va *bo_va;
> 	int r;
> 
>-	if (rdev->family < CHIP_CAYMAN) {
>+	if ((rdev->family < CHIP_CAYMAN) ||
>+	    (!rdev->accel_working)) {
> 		return;
> 	}
> 
>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.