projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
cik_sdma.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
index
0212219
..
d3ac329
100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+++ b/
drivers/gpu/drm/amd/amdgpu/cik_sdma.c
@@
-669,7
+669,8
@@
static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring)
err1:
fence_put(f);
- amdgpu_ib_free(adev, &ib);
+ amdgpu_ib_free(adev, &ib, NULL);
+ fence_put(f);
err0:
amdgpu_wb_free(adev, index);
return r;