From: John Stultz <john.stultz@linaro.org>
To: lkml <linux-kernel@vger.kernel.org>
Cc: John Stultz <john.stultz@linaro.org>,
Shuah Khan <shuah@kernel.org>,
Brian Starkey <brian.starkey@arm.com>,
Sumit Semwal <sumit.semwal@linaro.org>,
Laura Abbott <labbott@kernel.org>,
Hridya Valsaraju <hridya@google.com>,
Suren Baghdasaryan <surenb@google.com>,
Sandeep Patil <sspatil@google.com>,
Daniel Mentz <danielmentz@google.com>,
linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-kselftest@vger.kernel.org
Subject: [PATCH 3/5] kselftests: dmabuf-heaps: Softly fail if don't find a vgem device
Date: Fri, 29 Jan 2021 03:05:12 +0000 [thread overview]
Message-ID: <20210129030514.1231773-3-john.stultz@linaro.org> (raw)
In-Reply-To: <20210129030514.1231773-1-john.stultz@linaro.org>
While testing against a vgem device is helpful for testing importing
they aren't always configured in, so don't make it a fatal failure.
Cc: Shuah Khan <shuah@kernel.org>
Cc: Brian Starkey <brian.starkey@arm.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Laura Abbott <labbott@kernel.org>
Cc: Hridya Valsaraju <hridya@google.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Sandeep Patil <sspatil@google.com>
Cc: Daniel Mentz <danielmentz@google.com>
Cc: linux-media@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-kselftest@vger.kernel.org
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
.../testing/selftests/dmabuf-heaps/dmabuf-heap.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
index 46f6759a8acc..8cedd539c7fb 100644
--- a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
+++ b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
@@ -184,15 +184,14 @@ static int test_alloc_and_import(char *heap_name)
if (importer_fd < 0) {
ret = importer_fd;
printf("Failed to open vgem\n");
- goto out;
- }
-
- ret = import_vgem_fd(importer_fd, dmabuf_fd, &handle);
- if (ret < 0) {
- printf("Failed to import buffer\n");
- goto out;
+ } else {
+ ret = import_vgem_fd(importer_fd, dmabuf_fd, &handle);
+ if (ret < 0) {
+ printf("Failed to import buffer\n");
+ goto out;
+ }
+ printf("import passed\n");
}
- printf("import passed\n");
ret = dmabuf_sync(dmabuf_fd, DMA_BUF_SYNC_START);
if (ret < 0) {
--
2.25.1
next prev parent reply other threads:[~2021-01-29 3:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-29 3:05 [PATCH 1/5] kselftests: dmabuf-heaps: Fix Makefile's inclusion of the kernel's usr/include dir John Stultz
2021-01-29 3:05 ` [PATCH 2/5] kselftests: dmabuf-heaps: Add clearer checks on DMABUF_BEGIN/END_SYNC John Stultz
2021-01-29 3:05 ` John Stultz [this message]
2021-01-29 3:05 ` [PATCH 4/5] kselftests: dmabuf-heaps: Cleanup test output John Stultz
2021-01-29 3:05 ` [PATCH 5/5] kselftests: dmabuf-heaps: Add extra checking that allocated buffers are zeroed John Stultz
2021-02-08 23:23 ` [PATCH 1/5] kselftests: dmabuf-heaps: Fix Makefile's inclusion of the kernel's usr/include dir Shuah Khan
2021-02-08 23:51 ` John Stultz
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=20210129030514.1231773-3-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=brian.starkey@arm.com \
--cc=danielmentz@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hridya@google.com \
--cc=labbott@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=sspatil@google.com \
--cc=sumit.semwal@linaro.org \
--cc=surenb@google.com \
/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