projects
/
sdk
/
emulator
/
emulator-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0d4605e
)
drm/radeon: fix missing bo reservation
author
Christian König
<christian.koenig@amd.com>
Thu, 20 Feb 2014 17:47:14 +0000
(18:47 +0100)
committer
Jiri Slaby
<jslaby@suse.cz>
Wed, 5 Mar 2014 16:13:56 +0000
(17:13 +0100)
commit
5e386b574cf7e1593e1296e5b0feea4108ed6ad8
upstream.
Otherwise we might get a crash here.
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/gpu/drm/radeon/radeon_kms.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/radeon/radeon_kms.c
b/drivers/gpu/drm/radeon/radeon_kms.c
index 4a3b3c55a568226589fb16ba92124545295eba64..7456ce186f29c1457e93796ffa721b7d4d5dc13e 100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_kms.c
+++ b/
drivers/gpu/drm/radeon/radeon_kms.c
@@
-500,6
+500,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,
@@
-507,6
+511,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);