Merge tag 'rproc-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_test.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
index 2f4d5ca9894fc361ee72bd5b168fc89102ceac42..7b230bcbf2c6ee7e1f5f93d57f5d2a4110177d87 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_test.c
@@ -42,16 +42,11 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
        size = 1024 * 1024;
 
        /* Number of tests =
-        * (Total GTT - IB pool - writeback page - ring buffers) / test size
+        * (Total GTT - gart_pin_size - (2 transfer windows for buffer moves)) / test size
         */
-       n = adev->gmc.gart_size - AMDGPU_IB_POOL_SIZE;
-       for (i = 0; i < AMDGPU_MAX_RINGS; ++i)
-               if (adev->rings[i])
-                       n -= adev->rings[i]->ring_size;
-       if (adev->wb.wb_obj)
-               n -= AMDGPU_GPU_PAGE_SIZE;
-       if (adev->irq.ih.ring_obj)
-               n -= adev->irq.ih.ring_size;
+       n = adev->gmc.gart_size - atomic64_read(&adev->gart_pin_size);
+       n -= AMDGPU_GTT_MAX_TRANSFER_SIZE * AMDGPU_GTT_NUM_TRANSFER_WINDOWS *
+               AMDGPU_GPU_PAGE_SIZE;
        n /= size;
 
        gtt_obj = kcalloc(n, sizeof(*gtt_obj), GFP_KERNEL);
@@ -157,10 +152,10 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
                                          i, *vram_start, gart_start,
                                          (unsigned long long)
                                          (gart_addr - adev->gmc.gart_start +
-                                          (void*)gart_start - gtt_map),
+                                          (void *)gart_start - gtt_map),
                                          (unsigned long long)
                                          (vram_addr - adev->gmc.vram_start +
-                                          (void*)gart_start - gtt_map));
+                                          (void *)gart_start - gtt_map));
                                amdgpu_bo_kunmap(vram_obj);
                                goto out_lclean_unpin;
                        }
@@ -203,10 +198,10 @@ static void amdgpu_do_test_moves(struct amdgpu_device *adev)
                                          i, *gart_start, vram_start,
                                          (unsigned long long)
                                          (vram_addr - adev->gmc.vram_start +
-                                          (void*)vram_start - vram_map),
+                                          (void *)vram_start - vram_map),
                                          (unsigned long long)
                                          (gart_addr - adev->gmc.gart_start +
-                                          (void*)vram_start - vram_map));
+                                          (void *)vram_start - vram_map));
                                amdgpu_bo_kunmap(gtt_obj[i]);
                                goto out_lclean_unpin;
                        }