From: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: "Christian König" <christian.koenig@amd.com>
Subject: [igt-dev] [V3 i-g-t 12/23] tests/amdgpu: Use drm_close_driver() to close the drm fd
Date: Thu, 22 Jun 2023 12:24:11 +0530 [thread overview]
Message-ID: <20230622065422.2235134-13-bhanuprakash.modem@intel.com> (raw)
In-Reply-To: <20230622065422.2235134-1-bhanuprakash.modem@intel.com>
To close the drm file descriptor, use igt helper drm_close_driver()
instead of using close().
Cc: Vitaly Prosyak <vitaly.prosyak@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
tests/amdgpu/amd_basic.c | 2 +-
tests/amdgpu/amd_cs_nop.c | 2 +-
tests/amdgpu/amd_deadlock.c | 2 +-
tests/amdgpu/amd_info.c | 2 +-
tests/amdgpu/amd_module_load.c | 2 +-
tests/amdgpu/amd_prime.c | 6 +++---
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/amdgpu/amd_basic.c b/tests/amdgpu/amd_basic.c
index 38525a85e..f7d7f036f 100644
--- a/tests/amdgpu/amd_basic.c
+++ b/tests/amdgpu/amd_basic.c
@@ -696,6 +696,6 @@ igt_main
igt_fixture {
amdgpu_device_deinitialize(device);
- close(fd);
+ drm_close_driver(fd);
}
}
diff --git a/tests/amdgpu/amd_cs_nop.c b/tests/amdgpu/amd_cs_nop.c
index ea3f6aae8..323c1b16a 100644
--- a/tests/amdgpu/amd_cs_nop.c
+++ b/tests/amdgpu/amd_cs_nop.c
@@ -239,6 +239,6 @@ igt_main
igt_fixture {
amdgpu_cs_ctx_free(context);
amdgpu_device_deinitialize(device);
- close(fd);
+ drm_close_driver(fd);
}
}
diff --git a/tests/amdgpu/amd_deadlock.c b/tests/amdgpu/amd_deadlock.c
index df650c921..d805b8d18 100644
--- a/tests/amdgpu/amd_deadlock.c
+++ b/tests/amdgpu/amd_deadlock.c
@@ -118,6 +118,6 @@ igt_main
igt_fixture {
amdgpu_device_deinitialize(device);
- close(fd);
+ drm_close_driver(fd);
}
}
diff --git a/tests/amdgpu/amd_info.c b/tests/amdgpu/amd_info.c
index d6aea827b..c1137ab4d 100644
--- a/tests/amdgpu/amd_info.c
+++ b/tests/amdgpu/amd_info.c
@@ -154,6 +154,6 @@ igt_main
igt_fixture {
amdgpu_device_deinitialize(dev);
- close(fd);
+ drm_close_driver(fd);
}
}
diff --git a/tests/amdgpu/amd_module_load.c b/tests/amdgpu/amd_module_load.c
index 77df96d50..cbc9106f6 100644
--- a/tests/amdgpu/amd_module_load.c
+++ b/tests/amdgpu/amd_module_load.c
@@ -54,7 +54,7 @@ static void sanity_check(void)
err = -errno;
igt_set_timeout(0, NULL);
- close(fd);
+ drm_close_driver(fd);
igt_assert_eq(err, 0);
}
diff --git a/tests/amdgpu/amd_prime.c b/tests/amdgpu/amd_prime.c
index 62924f15b..6916c3173 100644
--- a/tests/amdgpu/amd_prime.c
+++ b/tests/amdgpu/amd_prime.c
@@ -166,7 +166,7 @@ static void amd_plug(amdgpu_device_handle device, struct cork *c)
static void unplug(struct cork *c)
{
vgem_fence_signal(c->device, c->fence);
- close(c->device);
+ drm_close_driver(c->device);
}
static void i915_to_amd(int i915, int amd, amdgpu_device_handle device)
@@ -461,7 +461,7 @@ igt_main
igt_fixture {
amdgpu_device_deinitialize(device);
- close(amd);
- close(i915);
+ drm_close_driver(amd);
+ drm_close_driver(i915);
}
}
--
2.40.0
next prev parent reply other threads:[~2023-06-22 7:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 6:53 [igt-dev] [V3 i-g-t 00/23] XE test cleanup to handle xe_device Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 01/23] lib: Interface to close the drm fd Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 02/23] lib: Cache xe_device at driver open/close level Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 03/23] lib/xe/xe_query: Add xe_config() interface Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 04/23] lib/igt_msm: Use drm_close_driver() to close the drm fd Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 05/23] tests/amdgpu: Close the fd before exit Bhanuprakash Modem
2023-06-22 7:22 ` Christian König
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 06/23] tests/i915: " Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 07/23] tests/kms: " Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 08/23] tests/nouveau_crc: " Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 09/23] tests/xe/xe_gpgpu_fill: " Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 10/23] tests/i915/kms_mmap_write_crc: Avoid closing the closed fd Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 11/23] tests: Use drm_close_driver() to close the drm fd Bhanuprakash Modem
2023-06-22 6:54 ` Bhanuprakash Modem [this message]
2023-06-22 7:22 ` [igt-dev] [V3 i-g-t 12/23] tests/amdgpu: " Christian König
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 13/23] tests/chamelium: " Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 14/23] tests/panfrost: " Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 15/23] tests/v3d: " Bhanuprakash Modem
2023-06-22 11:55 ` Maira Canal
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 16/23] tests/vc4: " Bhanuprakash Modem
2023-06-22 11:56 ` Maira Canal
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 17/23] tests/vmwgfx: " Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 18/23] tests/kms: " Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 19/23] tests/xe: " Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 20/23] tests/i915: " Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 21/23] tests/xe/xe_debugfs: Use xe_config() helper to get the config Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 22/23] tests: Drop xe_device get/put from test level Bhanuprakash Modem
2023-06-22 6:54 ` [igt-dev] [V3 i-g-t 23/23] Revert "lib/igt_kms: Cache xe_device info for kms tests" Bhanuprakash Modem
2023-06-22 8:02 ` [igt-dev] ✗ Fi.CI.BAT: failure for XE test cleanup to handle xe_device (rev6) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230622065422.2235134-13-bhanuprakash.modem@intel.com \
--to=bhanuprakash.modem@intel.com \
--cc=christian.koenig@amd.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox