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

Commit 544143f9 authored by Alex Deucher's avatar Alex Deucher
Browse files

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: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 72edd83c

drivers/gpu/drm/radeon/radeon_gem.c

+4 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/gpu/drm/radeon/radeon_kms.c

+8 −8
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
			return -ENOMEM;

		}



		if (rdev->accel_working) {

			vm = &fpriv->vm;

			r = radeon_vm_init(rdev, vm);

			if (r) {
@@ -612,7 +613,6 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv) 
				return r;

			}



		if (rdev->accel_working) {

			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;

	}