From: Antonio Argenziano <antonio.argenziano@intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t v6 8/9] Remove static variables from mapping version function
Date: Thu, 13 Jun 2019 14:54:47 -0700 [thread overview]
Message-ID: <20190613215448.17994-9-antonio.argenziano@intel.com> (raw)
In-Reply-To: <20190613215448.17994-1-antonio.argenziano@intel.com>
---
lib/i915/gem_mman.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/lib/i915/gem_mman.c b/lib/i915/gem_mman.c
index 2b3947de..4d08a01e 100644
--- a/lib/i915/gem_mman.c
+++ b/lib/i915/gem_mman.c
@@ -50,22 +50,17 @@
*/
static int gem_mmap__gtt_version(int fd)
{
- static int gtt_version = ~0;
+ int gtt_version = ~0;
+ struct drm_i915_getparam gp;
- if (gtt_version == ~0) {
- struct drm_i915_getparam gp;
+ memset(&gp, 0, sizeof(gp));
+ gp.param = I915_PARAM_MMAP_GTT_VERSION;
+ gp.value = >t_version;
- gtt_version = 0;
+ if(ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp) && errno == -ENODEV)
+ gtt_version = -1; /* No mappable aperture */
- memset(&gp, 0, sizeof(gp));
- gp.param = I915_PARAM_MMAP_GTT_VERSION;
- gp.value = >t_version;
-
- if(ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp) && errno == -ENODEV)
- gtt_version = -1; /* No mappable aperture */
-
- errno = 0;
- }
+ errno = 0;
return gtt_version;
}
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-06-13 21:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-13 21:54 [igt-dev] [PATCH i-g-t v6 0/9] Aperture removal IGT changes Antonio Argenziano
2019-06-13 21:54 ` [igt-dev] [PATCH i-g-t v6 1/9] tests/i915/gem_render_copy.c: Do detiling on the CPU side Antonio Argenziano
2019-06-13 21:54 ` [igt-dev] [PATCH i-g-t v6 2/9] tests/i915/gem_madvise.c: Add more mappings Antonio Argenziano
2019-06-13 21:54 ` [igt-dev] [PATCH i-g-t v6 3/9] lib/i915/gem_mman: Remove static variables Antonio Argenziano
2019-06-13 21:54 ` [igt-dev] [PATCH i-g-t v6 4/9] lib/i915: Add mmap_offset support Antonio Argenziano
2019-06-13 21:54 ` [igt-dev] [PATCH i-g-t v6 5/9] tests/i915/gem_mmap_offset_exhaustion.c: Extend test to different mappings Antonio Argenziano
2019-06-13 21:54 ` [igt-dev] [PATCH i-g-t v6 6/9] igt/lib: Add wrapper to check if gtt mapping is available Antonio Argenziano
2019-06-14 9:47 ` Chris Wilson
2019-06-14 20:47 ` Antonio Argenziano
2019-06-13 21:54 ` [igt-dev] [PATCH i-g-t v6 7/9] igt/i915: Require GTT mapping to be available when needed Antonio Argenziano
2019-06-14 9:54 ` Chris Wilson
2019-06-14 21:16 ` Antonio Argenziano
2019-06-14 21:34 ` Chris Wilson
2019-06-13 21:54 ` Antonio Argenziano [this message]
2019-06-13 21:54 ` [igt-dev] [PATCH i-g-t v6 9/9] igt/lib: If mappable aperture is missing return 0 size Antonio Argenziano
2019-06-14 9:56 ` Chris Wilson
2019-06-14 12:56 ` [igt-dev] ✓ Fi.CI.BAT: success for Aperture removal IGT changes (rev2) Patchwork
2019-06-15 9:07 ` [igt-dev] ✗ Fi.CI.IGT: failure " 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=20190613215448.17994-9-antonio.argenziano@intel.com \
--to=antonio.argenziano@intel.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