<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-2022-jp">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<p style="font-family:Arial;font-size:11pt;color:#0078D7;margin:5pt;" align="Left">
[AMD Official Use Only - Internal Distribution Only]<br>
</p>
<br>
<div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
For libdrm tests, please open a gitlab merge request:</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<a href="https://gitlab.freedesktop.org/mesa/drm/-/merge_requests" id="LPlnk489763">https://gitlab.freedesktop.org/mesa/drm/-/merge_requests</a></div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Alex</div>
<div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Yu, Lang <Lang.Yu@amd.com><br>
<b>Sent:</b> Friday, May 7, 2021 3:10 AM<br>
<b>To:</b> Chen, Guchun <Guchun.Chen@amd.com>; amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org>; Huang, Ray <Ray.Huang@amd.com>; Song, Asher <Asher.Song@amd.com><br>
<b>Subject:</b> RE: [PATCH libdrm] Revert "tests/amdgpu: fix bo eviction test issue"</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">[AMD Official Use Only - Internal Distribution Only]<br>
<br>
<br>
Reviewed-by:  Lang Yu <Lang.Yu@amd.com><br>
<br>
Regards,<br>
Lang<br>
<br>
-----Original Message-----<br>
From: Chen, Guchun <Guchun.Chen@amd.com> <br>
Sent: Thursday, May 6, 2021 5:55 PM<br>
To: amd-gfx@lists.freedesktop.org; Yu, Lang <Lang.Yu@amd.com>; Huang, Ray <Ray.Huang@amd.com>; Song, Asher <Asher.Song@amd.com><br>
Cc: Chen, Guchun <Guchun.Chen@amd.com><br>
Subject: [PATCH libdrm] Revert "tests/amdgpu: fix bo eviction test issue"<br>
<br>
This reverts commit a5a400c9581c3b91598623603067556b18084c5d.<br>
<br>
bo evict test was disabled by default per below commit. So still keep it as disabled.<br>
<br>
1f6a85cc test/amdgpu: disable bo eviction test by default<br>
<br>
Signed-off-by: Guchun Chen <guchun.chen@amd.com><br>
---<br>
 tests/amdgpu/amdgpu_test.c |  3 +++<br>
 tests/amdgpu/basic_tests.c | 13 ++++---------<br>
 2 files changed, 7 insertions(+), 9 deletions(-)<br>
<br>
diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c index 60f3a508..77bbfbcc 100644<br>
--- a/tests/amdgpu/amdgpu_test.c<br>
+++ b/tests/amdgpu/amdgpu_test.c<br>
@@ -496,6 +496,9 @@ static void amdgpu_disable_suites()<br>
                                 "gfx ring slow bad draw test (set amdgpu.lockup_timeout=50)", CU_FALSE))<br>
                         fprintf(stderr, "test deactivation failed - %s\n", CU_get_error_msg());<br>
 <br>
+       if (amdgpu_set_test_active(BASIC_TESTS_STR, "bo eviction Test", CU_FALSE))<br>
+               fprintf(stderr, "test deactivation failed - %s\n", <br>
+CU_get_error_msg());<br>
+<br>
         /* This test was ran on GFX8 and GFX9 only */<br>
         if (family_id < AMDGPU_FAMILY_VI || family_id > AMDGPU_FAMILY_RV)<br>
                 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<br>
--- a/tests/amdgpu/basic_tests.c<br>
+++ b/tests/amdgpu/basic_tests.c<br>
@@ -928,15 +928,6 @@ static void amdgpu_bo_eviction_test(void)<br>
                                    0, &vram_info);<br>
         CU_ASSERT_EQUAL(r, 0);<br>
 <br>
-       r = amdgpu_query_heap_info(device_handle, AMDGPU_GEM_DOMAIN_GTT,<br>
-                                  0, &gtt_info);<br>
-       CU_ASSERT_EQUAL(r, 0);<br>
-<br>
-       if (vram_info.max_allocation > gtt_info.heap_size/3) {<br>
-               vram_info.max_allocation = gtt_info.heap_size/3;<br>
-               gtt_info.max_allocation = vram_info.max_allocation;<br>
-       }<br>
-<br>
         r = amdgpu_bo_alloc_wrap(device_handle, vram_info.max_allocation, 4096,<br>
                                  AMDGPU_GEM_DOMAIN_VRAM, 0, &vram_max[0]);<br>
         CU_ASSERT_EQUAL(r, 0);<br>
@@ -944,6 +935,10 @@ static void amdgpu_bo_eviction_test(void)<br>
                                  AMDGPU_GEM_DOMAIN_VRAM, 0, &vram_max[1]);<br>
         CU_ASSERT_EQUAL(r, 0);<br>
 <br>
+       r = amdgpu_query_heap_info(device_handle, AMDGPU_GEM_DOMAIN_GTT,<br>
+                                  0, &gtt_info);<br>
+       CU_ASSERT_EQUAL(r, 0);<br>
+<br>
         r = amdgpu_bo_alloc_wrap(device_handle, gtt_info.max_allocation, 4096,<br>
                                  AMDGPU_GEM_DOMAIN_GTT, 0, &gtt_max[0]);<br>
         CU_ASSERT_EQUAL(r, 0);<br>
--<br>
2.17.1<br>
_______________________________________________<br>
amd-gfx mailing list<br>
amd-gfx@lists.freedesktop.org<br>
<a href="https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Calexander.deucher%40amd.com%7Cb3ce363db6e94aa1396308d9112727fc%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637559682163619573%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=d9uch8frkIAiVkdtaOHillKHngoVp8brn%2FxJuKatmYU%3D&amp;reserved=0">https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=04%7C01%7Calexander.deucher%40amd.com%7Cb3ce363db6e94aa1396308d9112727fc%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637559682163619573%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=d9uch8frkIAiVkdtaOHillKHngoVp8brn%2FxJuKatmYU%3D&amp;reserved=0</a><br>
</div>
</span></font></div>
</div>
</body>
</html>