projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next
[platform/kernel/linux-rpi.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu_cs.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index
1907022
..
a25fb59
100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@
-57,7
+57,7
@@
static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p,
/* One for TTM and one for the CS job */
p->uf_entry.tv.num_shared = 2;
- drm_gem_object_put
_unlocked
(gobj);
+ drm_gem_object_put(gobj);
size = amdgpu_bo_size(bo);
if (size != PAGE_SIZE || (data->offset + 8) > size) {