summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu
diff options
context:
space:
mode:
authorChristian König2019-01-30 13:41:05 +0100
committerAlex Deucher2019-02-19 21:58:27 +0100
commit661b96b21c25e05b9a02178b4f19fea83b5dd774 (patch)
treeeac646c8bcfd5a2ac6d17ff7249b6f9dead74c7f /drivers/gpu/drm/amd/amdgpu
parentdrm/amdgpu: cleanup setting bulk_movable (diff)
downloadkernel-qcow2-linux-661b96b21c25e05b9a02178b4f19fea83b5dd774.tar.gz
kernel-qcow2-linux-661b96b21c25e05b9a02178b4f19fea83b5dd774.tar.xz
kernel-qcow2-linux-661b96b21c25e05b9a02178b4f19fea83b5dd774.zip
drm/amdgpu: partial revert cleanup setting bulk_movable v2
We still need to set bulk_movable to false when new BOs are added or removed. v2: also set it to false on removal Signed-off-by: Christian König <christian.koenig@amd.com> Tested-by: StDenis, Tom <Tom.StDenis@amd.com> Tested-by: Przemek Socha <soprwa@gmail.com> Reviewed-by: Zhou, David(ChunMing) <David1.Zhou@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index d4c733885e87..b06ffd29ccc6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -332,6 +332,7 @@ static void amdgpu_vm_bo_base_init(struct amdgpu_vm_bo_base *base,
if (bo->tbo.resv != vm->root.base.bo->tbo.resv)
return;
+ vm->bulk_moveable = false;
if (bo->tbo.type == ttm_bo_type_kernel)
amdgpu_vm_bo_relocated(base);
else
@@ -2755,6 +2756,9 @@ void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
struct amdgpu_vm_bo_base **base;
if (bo) {
+ if (bo->tbo.resv == vm->root.base.bo->tbo.resv)
+ vm->bulk_moveable = false;
+
for (base = &bo_va->base.bo->vm_bo; *base;
base = &(*base)->next) {
if (*base != &bo_va->base)