drm/amdgpu: use the actual placement for pin accounting
authorChristian König <christian.koenig@amd.com>
Fri, 20 Oct 2017 11:11:00 +0000 (13:11 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
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 <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

index c48fc450d99beb0aae461fe4d7e8289148afbbcb..8a103303da3e3a9b6ed97068a25aba816e276f91 100644 (file)
@@ -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)