git.samba.org
/
sfrench
/
cifs-2.6.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.12' of git://people.freedesktop.org/~agd5f/linux into drm...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu_gart.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
index 2ee327d6977507601af8638c5ff5e756be309003..902e6015abca377bb10b057dbb0c8479b66be394 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
@@
-186,7
+186,7
@@
void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev)
if (adev->gart.robj == NULL) {
return;
}
- r = amdgpu_bo_reserve(adev->gart.robj,
fals
e);
+ r = amdgpu_bo_reserve(adev->gart.robj,
tru
e);
if (likely(r == 0)) {
amdgpu_bo_kunmap(adev->gart.robj);
amdgpu_bo_unpin(adev->gart.robj);