[PATCH 3/7] test/amdgpu: Add helper functions for hot unplug

[Andrey Grodzovsky]

Expose close device and add open device wich preserves
test index.

Signed-off-by: Andrey Grodzovsky <andrey.grodzov...@amd.com>
---
 tests/amdgpu/amdgpu_test.c | 31 ++++++++++++++++++++++++++++---
 tests/amdgpu/amdgpu_test.h |  3 +++
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c
index 60f3a508..2864eaff 100644
--- a/tests/amdgpu/amdgpu_test.c
+++ b/tests/amdgpu/amdgpu_test.c
@@ -339,12 +339,13 @@ static int amdgpu_open_devices(int open_render_node)
 
 /* Close AMD devices.
  */
-static void amdgpu_close_devices()
+void amdgpu_close_devices()
 {
        int i;
        for (i = 0; i < MAX_CARDS_SUPPORTED; i++)
-               if (drm_amdgpu[i] >=0)
+               if (drm_amdgpu[i] >=0) {
                        close(drm_amdgpu[i]);
+               }
 }
 
 /* Print AMD devices information */
@@ -520,6 +521,31 @@ static void amdgpu_disable_suites()
                        fprintf(stderr, "test deactivation failed - %s\n", 
CU_get_error_msg());
 }
 
+int test_device_index;
+
+int amdgpu_open_device_on_test_index(int render_node)
+{
+       int i;
+
+       if (amdgpu_open_devices(open_render_node) <= 0) {
+               perror("Cannot open AMDGPU device");
+               return -1;
+       }
+
+       if (test_device_index >= 0) {
+               /* Most tests run on device of drm_amdgpu[0].
+                * Swap the chosen device to drm_amdgpu[0].
+                */
+               i = drm_amdgpu[0];
+               drm_amdgpu[0] = drm_amdgpu[test_device_index];
+               drm_amdgpu[test_device_index] = i;
+       }
+
+       return 0;
+
+
+}
+
 /* The main() function for setting up and running the tests.
  * Returns a CUE_SUCCESS on successful running, another
  * CUnit error code on failure.
@@ -535,7 +561,6 @@ int main(int argc, char **argv)
        int display_devices = 0;/* By default not to display devices' info */
        CU_pSuite pSuite = NULL;
        CU_pTest  pTest  = NULL;
-       int test_device_index;
        int display_list = 0;
        int force_run = 0;
 
diff --git a/tests/amdgpu/amdgpu_test.h b/tests/amdgpu/amdgpu_test.h
index 4970d0dd..107134a5 100644
--- a/tests/amdgpu/amdgpu_test.h
+++ b/tests/amdgpu/amdgpu_test.h
@@ -476,4 +476,7 @@ void amdgpu_test_exec_cs_helper_raw(amdgpu_device_handle 
device_handle,
                                    struct amdgpu_cs_request *ibs_request,
                                    bool secure);
 
+void amdgpu_close_devices();
+int amdgpu_open_device_on_test_index(int render_node);
+
 #endif  /* #ifdef _AMDGPU_TEST_H_ */
-- 
2.25.1

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