|
@@ -577,28 +577,29 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
|
|
|
return r;
|
|
|
}
|
|
|
|
|
|
- r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
|
|
|
- if (r) {
|
|
|
- radeon_vm_fini(rdev, &fpriv->vm);
|
|
|
- kfree(fpriv);
|
|
|
- return r;
|
|
|
- }
|
|
|
+ if (rdev->accel_working) {
|
|
|
+ r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
|
|
|
+ if (r) {
|
|
|
+ radeon_vm_fini(rdev, &fpriv->vm);
|
|
|
+ kfree(fpriv);
|
|
|
+ return r;
|
|
|
+ }
|
|
|
|
|
|
- /* map the ib pool buffer read only into
|
|
|
- * virtual address space */
|
|
|
- bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,
|
|
|
- rdev->ring_tmp_bo.bo);
|
|
|
- r = radeon_vm_bo_set_addr(rdev, bo_va, RADEON_VA_IB_OFFSET,
|
|
|
- RADEON_VM_PAGE_READABLE |
|
|
|
- RADEON_VM_PAGE_SNOOPED);
|
|
|
+ /* map the ib pool buffer read only into
|
|
|
+ * virtual address space */
|
|
|
+ bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,
|
|
|
+ rdev->ring_tmp_bo.bo);
|
|
|
+ r = radeon_vm_bo_set_addr(rdev, bo_va, RADEON_VA_IB_OFFSET,
|
|
|
+ RADEON_VM_PAGE_READABLE |
|
|
|
+ RADEON_VM_PAGE_SNOOPED);
|
|
|
|
|
|
- radeon_bo_unreserve(rdev->ring_tmp_bo.bo);
|
|
|
- if (r) {
|
|
|
- radeon_vm_fini(rdev, &fpriv->vm);
|
|
|
- kfree(fpriv);
|
|
|
- return r;
|
|
|
+ radeon_bo_unreserve(rdev->ring_tmp_bo.bo);
|
|
|
+ if (r) {
|
|
|
+ radeon_vm_fini(rdev, &fpriv->vm);
|
|
|
+ kfree(fpriv);
|
|
|
+ return r;
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
file_priv->driver_priv = fpriv;
|
|
|
}
|
|
|
|
|
@@ -626,13 +627,15 @@ void radeon_driver_postclose_kms(struct drm_device *dev,
|
|
|
struct radeon_bo_va *bo_va;
|
|
|
int r;
|
|
|
|
|
|
- r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
|
|
|
- if (!r) {
|
|
|
- bo_va = radeon_vm_bo_find(&fpriv->vm,
|
|
|
- rdev->ring_tmp_bo.bo);
|
|
|
- if (bo_va)
|
|
|
- radeon_vm_bo_rmv(rdev, bo_va);
|
|
|
- radeon_bo_unreserve(rdev->ring_tmp_bo.bo);
|
|
|
+ if (rdev->accel_working) {
|
|
|
+ r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
|
|
|
+ if (!r) {
|
|
|
+ bo_va = radeon_vm_bo_find(&fpriv->vm,
|
|
|
+ rdev->ring_tmp_bo.bo);
|
|
|
+ if (bo_va)
|
|
|
+ radeon_vm_bo_rmv(rdev, bo_va);
|
|
|
+ radeon_bo_unreserve(rdev->ring_tmp_bo.bo);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
radeon_vm_fini(rdev, &fpriv->vm);
|