|
@@ -63,11 +63,35 @@ static bool amdgpu_need_backup(struct amdgpu_device *adev)
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+/**
|
|
|
|
+ * amdgpu_bo_subtract_pin_size - Remove BO from pin_size accounting
|
|
|
|
+ *
|
|
|
|
+ * @bo: &amdgpu_bo buffer object
|
|
|
|
+ *
|
|
|
|
+ * This function is called when a BO stops being pinned, and updates the
|
|
|
|
+ * &amdgpu_device pin_size values accordingly.
|
|
|
|
+ */
|
|
|
|
+static void amdgpu_bo_subtract_pin_size(struct amdgpu_bo *bo)
|
|
|
|
+{
|
|
|
|
+ struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
|
|
|
|
+
|
|
|
|
+ if (bo->tbo.mem.mem_type == TTM_PL_VRAM) {
|
|
|
|
+ atomic64_sub(amdgpu_bo_size(bo), &adev->vram_pin_size);
|
|
|
|
+ atomic64_sub(amdgpu_vram_mgr_bo_visible_size(bo),
|
|
|
|
+ &adev->visible_pin_size);
|
|
|
|
+ } else if (bo->tbo.mem.mem_type == TTM_PL_TT) {
|
|
|
|
+ atomic64_sub(amdgpu_bo_size(bo), &adev->gart_pin_size);
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
static void amdgpu_ttm_bo_destroy(struct ttm_buffer_object *tbo)
|
|
static void amdgpu_ttm_bo_destroy(struct ttm_buffer_object *tbo)
|
|
{
|
|
{
|
|
struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
|
|
struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);
|
|
struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo);
|
|
struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo);
|
|
|
|
|
|
|
|
+ if (WARN_ON_ONCE(bo->pin_count > 0))
|
|
|
|
+ amdgpu_bo_subtract_pin_size(bo);
|
|
|
|
+
|
|
if (bo->kfd_bo)
|
|
if (bo->kfd_bo)
|
|
amdgpu_amdkfd_unreserve_system_memory_limit(bo);
|
|
amdgpu_amdkfd_unreserve_system_memory_limit(bo);
|
|
|
|
|
|
@@ -968,13 +992,7 @@ int amdgpu_bo_unpin(struct amdgpu_bo *bo)
|
|
if (bo->pin_count)
|
|
if (bo->pin_count)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- if (bo->tbo.mem.mem_type == TTM_PL_VRAM) {
|
|
|
|
- atomic64_sub(amdgpu_bo_size(bo), &adev->vram_pin_size);
|
|
|
|
- atomic64_sub(amdgpu_vram_mgr_bo_visible_size(bo),
|
|
|
|
- &adev->visible_pin_size);
|
|
|
|
- } else if (bo->tbo.mem.mem_type == TTM_PL_TT) {
|
|
|
|
- atomic64_sub(amdgpu_bo_size(bo), &adev->gart_pin_size);
|
|
|
|
- }
|
|
|
|
|
|
+ amdgpu_bo_subtract_pin_size(bo);
|
|
|
|
|
|
for (i = 0; i < bo->placement.num_placement; i++) {
|
|
for (i = 0; i < bo->placement.num_placement; i++) {
|
|
bo->placements[i].lpfn = 0;
|
|
bo->placements[i].lpfn = 0;
|