public inbox for igt-dev@lists.freedesktop.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t 1/2] tests/i915/gem_madvise: Use gem_mmap__device_coherent
@ 2020-01-30  1:10 Vinay Belgaumkar
  2020-01-30  1:21 ` vbelgaum
  0 siblings, 1 reply; 4+ messages in thread
From: Vinay Belgaumkar @ 2020-01-30  1:10 UTC (permalink / raw)
  To: igt-dev; +Cc: Daniel Vetter

Allow test to run on platforms without aperture as well.

Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Cc: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/gem_madvise.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 7162a5c3..56ce91cb 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -63,7 +63,7 @@ dontneed_before_mmap(void)
 
 	handle = gem_create(fd, OBJECT_SIZE);
 	gem_madvise(fd, handle, I915_MADV_DONTNEED);
-	ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE);
+	ptr = gem_mmap__device_coherent(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE);
 	close(fd);
 
 	signal(SIGSEGV, sigtrap);
@@ -90,7 +90,7 @@ dontneed_after_mmap(void)
 	char *ptr;
 
 	handle = gem_create(fd, OBJECT_SIZE);
-	ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE);
+	ptr = gem_mmap__device_coherent(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE);
 	igt_assert(ptr);
 	gem_madvise(fd, handle, I915_MADV_DONTNEED);
 	close(fd);
-- 
2.22.0.245.g4d8ec15c66


From bbe42e9b2c2cd27eed8c090c4be80e7c18a4263d Mon Sep 17 00:00:00 2001
From: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Date: Wed, 29 Jan 2020 16:24:31 -0800
Subject: [PATCH i-g-t 2/2] tests/i915/gem_mmap_offset_exhaustion: Use
 gem_mmap__device_coherent

Allow test to run on platforms that do not have aperture.

Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Cc: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@intel.com>
---
 tests/i915/gem_mmap_offset_exhaustion.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/i915/gem_mmap_offset_exhaustion.c b/tests/i915/gem_mmap_offset_exhaustion.c
index f243507e..992bc43b 100644
--- a/tests/i915/gem_mmap_offset_exhaustion.c
+++ b/tests/i915/gem_mmap_offset_exhaustion.c
@@ -60,9 +60,9 @@ create_and_map_bo(int fd)
 
 	handle = gem_create(fd, OBJECT_SIZE);
 
-	ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE);
+	ptr = gem_mmap__device_coherent(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE);
 
-	/* touch it to force it into the gtt */
+	/* touch it to force backing storage allocation */
 	*ptr = 0;
 
 	/* but then unmap it again because we only have limited address space on
-- 
2.22.0.245.g4d8ec15c66

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [igt-dev] [PATCH i-g-t 1/2] tests/i915/gem_madvise: Use gem_mmap__device_coherent
  2020-01-30  1:10 [igt-dev] [PATCH i-g-t 1/2] tests/i915/gem_madvise: Use gem_mmap__device_coherent Vinay Belgaumkar
@ 2020-01-30  1:21 ` vbelgaum
  0 siblings, 0 replies; 4+ messages in thread
From: vbelgaum @ 2020-01-30  1:21 UTC (permalink / raw)
  To: igt-dev; +Cc: Daniel Vetter



On 01/29/2020 05:10 PM, Vinay Belgaumkar wrote:
> Allow test to run on platforms without aperture as well.
>
> Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>

Please disregard this patch, will resend the series.

Thanks,
Vinay.
> Cc: Antonio Argenziano <antonio.argenziano@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>   tests/i915/gem_madvise.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
> index 7162a5c3..56ce91cb 100644
> --- a/tests/i915/gem_madvise.c
> +++ b/tests/i915/gem_madvise.c
> @@ -63,7 +63,7 @@ dontneed_before_mmap(void)
>   
>   	handle = gem_create(fd, OBJECT_SIZE);
>   	gem_madvise(fd, handle, I915_MADV_DONTNEED);
> -	ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE);
> +	ptr = gem_mmap__device_coherent(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE);
>   	close(fd);
>   
>   	signal(SIGSEGV, sigtrap);
> @@ -90,7 +90,7 @@ dontneed_after_mmap(void)
>   	char *ptr;
>   
>   	handle = gem_create(fd, OBJECT_SIZE);
> -	ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE);
> +	ptr = gem_mmap__device_coherent(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE);
>   	igt_assert(ptr);
>   	gem_madvise(fd, handle, I915_MADV_DONTNEED);
>   	close(fd);

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [igt-dev] [PATCH i-g-t 1/2] tests/i915/gem_madvise: Use gem_mmap__device_coherent
@ 2020-01-30  1:23 Vinay Belgaumkar
  2020-01-30  1:38 ` Chris Wilson
  0 siblings, 1 reply; 4+ messages in thread
From: Vinay Belgaumkar @ 2020-01-30  1:23 UTC (permalink / raw)
  To: igt-dev

Allow test to run on platforms without aperture as well.

Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Cc: Antonio Argenziano <antonio.argenziano@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/i915/gem_madvise.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
index 7162a5c3..56ce91cb 100644
--- a/tests/i915/gem_madvise.c
+++ b/tests/i915/gem_madvise.c
@@ -63,7 +63,7 @@ dontneed_before_mmap(void)
 
 	handle = gem_create(fd, OBJECT_SIZE);
 	gem_madvise(fd, handle, I915_MADV_DONTNEED);
-	ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE);
+	ptr = gem_mmap__device_coherent(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE);
 	close(fd);
 
 	signal(SIGSEGV, sigtrap);
@@ -90,7 +90,7 @@ dontneed_after_mmap(void)
 	char *ptr;
 
 	handle = gem_create(fd, OBJECT_SIZE);
-	ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE);
+	ptr = gem_mmap__device_coherent(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE);
 	igt_assert(ptr);
 	gem_madvise(fd, handle, I915_MADV_DONTNEED);
 	close(fd);
-- 
2.22.0.245.g4d8ec15c66

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [igt-dev] [PATCH i-g-t 1/2] tests/i915/gem_madvise: Use gem_mmap__device_coherent
  2020-01-30  1:23 Vinay Belgaumkar
@ 2020-01-30  1:38 ` Chris Wilson
  0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2020-01-30  1:38 UTC (permalink / raw)
  To: Vinay Belgaumkar, igt-dev

Quoting Vinay Belgaumkar (2020-01-30 01:23:57)
> Allow test to run on platforms without aperture as well.
> 
> Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
> Cc: Antonio Argenziano <antonio.argenziano@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>  tests/i915/gem_madvise.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/i915/gem_madvise.c b/tests/i915/gem_madvise.c
> index 7162a5c3..56ce91cb 100644
> --- a/tests/i915/gem_madvise.c
> +++ b/tests/i915/gem_madvise.c
> @@ -63,7 +63,7 @@ dontneed_before_mmap(void)
>  
>         handle = gem_create(fd, OBJECT_SIZE);
>         gem_madvise(fd, handle, I915_MADV_DONTNEED);
> -       ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_READ | PROT_WRITE);
> +       ptr = gem_mmap__device_coherent(fd, handle, 0, OBJECT_SIZE, PROT_READ | PROT_WRITE);

Tricky, this does not work with gem_mmap__wc... Maybe pretend it should.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-01-30  1:38 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-30  1:10 [igt-dev] [PATCH i-g-t 1/2] tests/i915/gem_madvise: Use gem_mmap__device_coherent Vinay Belgaumkar
2020-01-30  1:21 ` vbelgaum
  -- strict thread matches above, loose matches on Subject: below --
2020-01-30  1:23 Vinay Belgaumkar
2020-01-30  1:38 ` Chris Wilson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox