projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a08c07
)
drm/radeon/kms: merge conflicted badly
author
Dave Airlie
<airlied@redhat.com>
Thu, 20 Mar 2014 01:08:11 +0000
(11:08 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Thu, 20 Mar 2014 01:09:10 +0000
(11:09 +1000)
Not sure why git didn't flag this, but the result of automerge
from 3.14-rc7 screwed up the radeon init procedure.
Reported-by: Fireburn on #radeon
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_kms.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/gpu/drm/radeon/radeon_kms.c
b/drivers/gpu/drm/radeon/radeon_kms.c
index 6f1dfac1750749d4da74c45e6f5cae7fba90f6ee..3e49342a20e602e50f22c3068c543b7e19e9dab7 100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_kms.c
+++ b/
drivers/gpu/drm/radeon/radeon_kms.c
@@
-575,10
+575,6
@@
int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
if (r)
return r;
- 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,