From: Imre Deak <imre.deak@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [i-g-t PATCH v2 2/2] tests/lib: make sure the GPU is idle at test start and exit
Date: Tue, 28 May 2013 17:22:58 +0300 [thread overview]
Message-ID: <1369750978-6040-2-git-send-email-imre.deak@intel.com> (raw)
In-Reply-To: <1369750978-6040-1-git-send-email-imre.deak@intel.com>
In-Reply-To: <1369669362-21300-1-git-send-email-imre.deak@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64270
v2:
- Make sure also that the GPU is idle at start and error exit of any
test using drm_open_any(). (Daniel)
Signed-off-by: Imre Deak <imre.deak@intel.com>
---
lib/drmtest.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/lib/drmtest.c b/lib/drmtest.c
index 2d37fb6..198104d 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -228,7 +228,7 @@ int drm_get_card(int master)
}
/** Open the first DRM device we can find, searching up to 16 device nodes */
-int drm_open_any(void)
+static int __drm_open_any(void)
{
char *name;
int ret, fd;
@@ -248,6 +248,29 @@ int drm_open_any(void)
return fd;
}
+static void quiescent_gpu_at_exit(int sig)
+{
+ int fd;
+
+ fd = __drm_open_any();
+ if (fd >= 0)
+ close(fd);
+}
+
+int drm_open_any(void)
+{
+ static int open_count;
+ int fd = __drm_open_any();
+
+ if (fd < 0 || __sync_fetch_and_add(&open_count, 1))
+ return fd;
+
+ gem_quiescent_gpu(fd);
+ drmtest_install_exit_handler(quiescent_gpu_at_exit);
+
+ return fd;
+}
+
/**
* Open the first DRM device we can find where we end up being the master.
*/
--
1.8.1.2
next prev parent reply other threads:[~2013-05-28 14:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-27 15:42 [i-g-t PATCH] tests/gem_wait_render_timeout: make sure the GPU is idle before exiting Imre Deak
2013-05-28 9:31 ` Daniel Vetter
2013-05-28 14:22 ` [i-g-t PATCH v2 1/2] lib: make sure all rings are idle in gpu_quiescent_gpu() Imre Deak
2013-05-28 14:22 ` Imre Deak [this message]
2013-05-28 14:35 ` [i-g-t PATCH v3 2/2] tests/lib: make sure the GPU is idle at test start and exit Imre Deak
2013-05-28 16:33 ` Daniel Vetter
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=1369750978-6040-2-git-send-email-imre.deak@intel.com \
--to=imre.deak@intel.com \
--cc=intel-gfx@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