[PATCH libdrm] Revert "tests/amdgpu: fix bo eviction test issue"

[Guchun Chen]

This reverts commit a5a400c9581c3b91598623603067556b18084c5d.

bo evict test was disabled by default per below commit. So still keep it
as disabled.

1f6a85cc test/amdgpu: disable bo eviction test by default

Signed-off-by: Guchun Chen <guchun.c...@amd.com>
---
 tests/amdgpu/amdgpu_test.c |  3 +++
 tests/amdgpu/basic_tests.c | 13 ++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c
index 60f3a508..77bbfbcc 100644
--- a/tests/amdgpu/amdgpu_test.c
+++ b/tests/amdgpu/amdgpu_test.c
@@ -496,6 +496,9 @@ static void amdgpu_disable_suites()
                                "gfx ring slow bad draw test (set 
amdgpu.lockup_timeout=50)", CU_FALSE))
                        fprintf(stderr, "test deactivation failed - %s\n", 
CU_get_error_msg());
 
+       if (amdgpu_set_test_active(BASIC_TESTS_STR, "bo eviction Test", 
CU_FALSE))
+               fprintf(stderr, "test deactivation failed - %s\n", 
CU_get_error_msg());
+
        /* This test was ran on GFX8 and GFX9 only */
        if (family_id < AMDGPU_FAMILY_VI || family_id > AMDGPU_FAMILY_RV)
                if (amdgpu_set_test_active(BASIC_TESTS_STR, "Sync dependency 
Test", CU_FALSE))
diff --git a/tests/amdgpu/basic_tests.c b/tests/amdgpu/basic_tests.c
index 8e7c4916..3a4214f5 100644
--- a/tests/amdgpu/basic_tests.c
+++ b/tests/amdgpu/basic_tests.c
@@ -928,15 +928,6 @@ static void amdgpu_bo_eviction_test(void)
                                   0, &vram_info);
        CU_ASSERT_EQUAL(r, 0);
 
-       r = amdgpu_query_heap_info(device_handle, AMDGPU_GEM_DOMAIN_GTT,
-                                  0, &gtt_info);
-       CU_ASSERT_EQUAL(r, 0);
-
-       if (vram_info.max_allocation > gtt_info.heap_size/3) {
-               vram_info.max_allocation = gtt_info.heap_size/3;
-               gtt_info.max_allocation = vram_info.max_allocation;
-       }
-
        r = amdgpu_bo_alloc_wrap(device_handle, vram_info.max_allocation, 4096,
                                 AMDGPU_GEM_DOMAIN_VRAM, 0, &vram_max[0]);
        CU_ASSERT_EQUAL(r, 0);
@@ -944,6 +935,10 @@ static void amdgpu_bo_eviction_test(void)
                                 AMDGPU_GEM_DOMAIN_VRAM, 0, &vram_max[1]);
        CU_ASSERT_EQUAL(r, 0);
 
+       r = amdgpu_query_heap_info(device_handle, AMDGPU_GEM_DOMAIN_GTT,
+                                  0, &gtt_info);
+       CU_ASSERT_EQUAL(r, 0);
+
        r = amdgpu_bo_alloc_wrap(device_handle, gtt_info.max_allocation, 4096,
                                 AMDGPU_GEM_DOMAIN_GTT, 0, &gtt_max[0]);
        CU_ASSERT_EQUAL(r, 0);
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx