projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8840a38
)
drm/amdgpu: use the actual placement for pin accounting
author
Christian König
<
[email protected]
>
Fri, 20 Oct 2017 11:11:00 +0000
(13:11 +0200)
committer
Alex Deucher
<
[email protected]
>
Mon, 4 Dec 2017 21:33:15 +0000
(16:33 -0500)
This allows us to specify multiple possible placements again.
Signed-off-by: Christian König <
[email protected]
>
Reviewed-by: Alex Deucher <
[email protected]
>
Signed-off-by: Alex Deucher <
[email protected]
>
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index c48fc450d99beb0aae461fe4d7e8289148afbbcb..8a103303da3e3a9b6ed97068a25aba816e276f91 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@
-697,6
+697,8
@@
int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain,
}
*gpu_addr = amdgpu_bo_gpu_offset(bo);
}
+
+ domain = amdgpu_mem_type_to_domain(bo->tbo.mem.mem_type);
if (domain == AMDGPU_GEM_DOMAIN_VRAM) {
adev->vram_pin_size += amdgpu_bo_size(bo);
if (bo->flags & AMDGPU_GEM_CREATE_NO_CPU_ACCESS)