OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.18' into drm-next
[android-x86/kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_cs.c
diff --git
a/drivers/gpu/drm/radeon/radeon_cs.c
b/drivers/gpu/drm/radeon/radeon_cs.c
index
9648e28
..
c830863
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_cs.c
+++ b/
drivers/gpu/drm/radeon/radeon_cs.c
@@
-241,7
+241,6
@@
static int radeon_cs_sync_rings(struct radeon_cs_parser *p)
resv = reloc->robj->tbo.resv;
r = radeon_sync_resv(p->rdev, &p->ib.sync, resv,
reloc->tv.shared);
-
if (r)
return r;
}