summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_kms.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2014-02-20 17:34:06 +0100
committerChristian König <christian.koenig@amd.com>2014-03-03 11:03:29 +0100
commitf1e3dc708aaadb960b15ee40029f611475f14027 (patch)
tree1405b605a69554742d207a973c9a3dd1c0af9a0f /drivers/gpu/drm/radeon/radeon_kms.c
parent19dff56a5f4ba1f3a6e28282415a95a48c27bccf (diff)
downloadtalos-obmc-linux-f1e3dc708aaadb960b15ee40029f611475f14027.tar.gz
talos-obmc-linux-f1e3dc708aaadb960b15ee40029f611475f14027.zip
drm/radeon: fix missing bo reservation
Signed-off-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_kms.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_kms.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 806506c03a79..7a810d0796a0 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -561,6 +561,10 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
radeon_vm_init(rdev, &fpriv->vm);
+ r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
+ if (r)
+ return r;
+
/* map the ib pool buffer read only into
* virtual address space */
bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,
@@ -568,6 +572,8 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
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);
OpenPOWER on IntegriCloud