[igt-dev] [PATCH i-g-t 1/2] tests/i915_query: fix expected subslice count on hsw

[igt-dev] [PATCH i-g-t 1/2] tests/i915_query: fix expected subslice count on hsw

[Lionel Landwerlin]

Haswell's configuration are a bit different from the following Gens.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105476
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
 tests/i915_query.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/i915_query.c b/tests/i915_query.c
index bb0f0707..328c54bc 100644
--- a/tests/i915_query.c
+++ b/tests/i915_query.c
@@ -449,11 +449,17 @@ test_query_topology_known_pci_ids(int fd, int devid)
 		break;
 	case 2:
 		igt_assert_eq(n_slices, 1);
-		igt_assert_eq(n_subslices, 3);
+		if (dev_info->is_haswell)
+			igt_assert_eq(n_subslices, 2);
+		else
+			igt_assert_eq(n_subslices, 3);
 		break;
 	case 3:
 		igt_assert_eq(n_slices, 2);
-		igt_assert_eq(n_subslices, 2 * 3);
+		if (dev_info->is_haswell)
+			igt_assert_eq(n_subslices, 2 * 2);
+		else
+			igt_assert_eq(n_subslices, 2 * 3);
 		break;
 	case 4:
 		igt_assert_eq(n_slices, 3);
-- 
2.16.2

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

[igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split garbage test

[Lionel Landwerlin]

Unfortunately I forgot that some of those tests require rcs topology
support which we don't have on Sandybridge. This change split the test
in 2 (first part available on all platforms, second part only with rcs
topology support).

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105475
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
 tests/i915_query.c | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/tests/i915_query.c b/tests/i915_query.c
index 328c54bc..c7de8cbd 100644
--- a/tests/i915_query.c
+++ b/tests/i915_query.c
@@ -69,9 +69,7 @@ static bool has_query_supports(int fd)
 static void test_query_garbage(int fd)
 {
 	struct drm_i915_query query;
-	struct drm_i915_query_item items[2];
-	struct drm_i915_query_item *items_ptr;
-	int i, n_items;
+	struct drm_i915_query_item item;
 
 	/* Verify that invalid query pointers are rejected. */
 	igt_assert_eq(__i915_query(fd, NULL), -EFAULT);
@@ -90,8 +88,15 @@ static void test_query_garbage(int fd)
 	i915_query_items_err(fd, (void *) 0, 1, EFAULT);
 
 	/* Test the invalid query id = 0. */
-	memset(items, 0, sizeof(items));
-	i915_query_items_err(fd, items, 1, EINVAL);
+	memset(&item, 0, sizeof(item));
+	i915_query_items_err(fd, &item, 1, EINVAL);
+}
+
+static void test_query_garbage_items(int fd)
+{
+	struct drm_i915_query_item items[2];
+	struct drm_i915_query_item *items_ptr;
+	int i, n_items;
 
 	/*
 	 * Query item flags field is currently valid only if equals to 0.
@@ -486,6 +491,11 @@ igt_main
 	igt_subtest("query-garbage")
 		test_query_garbage(fd);
 
+	igt_subtest("query-garbage-items") {
+		igt_require(query_topology_supported(fd));
+		test_query_garbage_items(fd);
+	}
+
 	igt_subtest("query-topology-kernel-writes") {
 		igt_require(query_topology_supported(fd));
 		test_query_topology_kernel_writes(fd);
-- 
2.16.2

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

[igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/2] tests/i915_query: fix expected subslice count on hsw

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/2] tests/i915_query: fix expected subslice count on hsw
URL   : https://patchwork.freedesktop.org/series/39840/
State : success

== Summary ==

IGT patchset tested on top of latest successful build
89b915f5aa465d5c3498b170b1572fae20460491 tests/pm_rpm: Don't try to create an X-tiled ARGB8888 framebuffer

with latest DRM-Tip kernel build CI_DRM_3915
da600bbe2441 drm-tip: 2018y-03m-12d-22h-06m-53s UTC integration manifest

Testlist changes:
+igt@i915_query@query-garbage-items

---- Known issues:

Test gem_mmap_gtt:
        Subgroup basic-small-bo-tiledx:
                fail       -> PASS       (fi-gdg-551) fdo#102575
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-b:
                incomplete -> PASS       (fi-snb-2520m) fdo#103713

fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:432s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:385s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:535s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:299s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:514s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:513s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:514s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:502s
fi-cfl-8700k     total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:410s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:590s
fi-elk-e7500     total:288  pass:229  dwarn:0   dfail:0   fail:0   skip:59  time:434s
fi-gdg-551       total:288  pass:180  dwarn:0   dfail:0   fail:0   skip:108 time:315s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:535s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:403s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:420s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:474s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:432s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:474s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:470s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:518s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:644s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:442s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:525s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:539s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:507s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:491s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:427s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:536s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:406s
Blacklisted hosts:
fi-cfl-u         total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:512s
fi-cnl-drrs      total:288  pass:257  dwarn:3   dfail:0   fail:0   skip:28  time:531s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1114/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split garbage test

[Chris Wilson]

Quoting Lionel Landwerlin (2018-03-13 09:17:55)
> Unfortunately I forgot that some of those tests require rcs topology
> support which we don't have on Sandybridge. This change split the test
> in 2 (first part available on all platforms, second part only with rcs
> topology support).
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105475
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

Aside, why are the flags prefixed with DRM_I915_QUERY and not just
I915_QUERY matching the rest of the uAPI? In fact, the whole perf abi is
special. ARGH.

> ---
>  tests/i915_query.c | 20 +++++++++++++++-----
>  1 file changed, 15 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/i915_query.c b/tests/i915_query.c
> index 328c54bc..c7de8cbd 100644
> --- a/tests/i915_query.c
> +++ b/tests/i915_query.c
> @@ -69,9 +69,7 @@ static bool has_query_supports(int fd)
>  static void test_query_garbage(int fd)
>  {
>         struct drm_i915_query query;
> -       struct drm_i915_query_item items[2];
> -       struct drm_i915_query_item *items_ptr;
> -       int i, n_items;
> +       struct drm_i915_query_item item;
>  
>         /* Verify that invalid query pointers are rejected. */
>         igt_assert_eq(__i915_query(fd, NULL), -EFAULT);
> @@ -90,8 +88,15 @@ static void test_query_garbage(int fd)
>         i915_query_items_err(fd, (void *) 0, 1, EFAULT);
>  
>         /* Test the invalid query id = 0. */
> -       memset(items, 0, sizeof(items));
> -       i915_query_items_err(fd, items, 1, EINVAL);
> +       memset(&item, 0, sizeof(item));
> +       i915_query_items_err(fd, &item, 1, EINVAL);
> +}
> +
> +static void test_query_garbage_items(int fd)
> +{
> +       struct drm_i915_query_item items[2];
> +       struct drm_i915_query_item *items_ptr;
> +       int i, n_items;
>  
>         /*
>          * Query item flags field is currently valid only if equals to 0.
> @@ -486,6 +491,11 @@ igt_main
>         igt_subtest("query-garbage")
>                 test_query_garbage(fd);
>  
> +       igt_subtest("query-garbage-items") {
> +               igt_require(query_topology_supported(fd));
> +               test_query_garbage_items(fd);
> +       }
> +
>         igt_subtest("query-topology-kernel-writes") {
>                 igt_require(query_topology_supported(fd));
>                 test_query_topology_kernel_writes(fd);

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,1/2] tests/i915_query: fix expected subslice count on hsw

[Patchwork]

== Series Details ==

Series: series starting with [i-g-t,1/2] tests/i915_query: fix expected subslice count on hsw
URL   : https://patchwork.freedesktop.org/series/39840/
State : success

== Summary ==

---- Known issues:

Test gem_eio:
        Subgroup in-flight-contexts:
                incomplete -> PASS       (shard-apl) fdo#105341
Test kms_atomic_transition:
        Subgroup 1x-modeset-transitions-nonblocking-fencing:
                fail       -> PASS       (shard-apl) fdo#103207
Test kms_cursor_crc:
        Subgroup cursor-256x256-suspend:
                skip       -> PASS       (shard-snb) fdo#103375
Test kms_rotation_crc:
        Subgroup primary-rotation-180:
                pass       -> FAIL       (shard-snb) fdo#103925
Test perf:
        Subgroup blocking:
                pass       -> FAIL       (shard-hsw) fdo#102252

fdo#105341 https://bugs.freedesktop.org/show_bug.cgi?id=105341
fdo#103207 https://bugs.freedesktop.org/show_bug.cgi?id=103207
fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252

shard-apl        total:3474 pass:1831 dwarn:1   dfail:0   fail:7   skip:1634 time:13058s
shard-hsw        total:3474 pass:1778 dwarn:1   dfail:0   fail:2   skip:1692 time:11979s
shard-snb        total:3474 pass:1365 dwarn:1   dfail:0   fail:3   skip:2105 time:7221s
Blacklisted hosts:
shard-kbl        total:3441 pass:1935 dwarn:1   dfail:0   fail:9   skip:1495 time:9567s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1114/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split garbage test

[Lionel Landwerlin]

On 13/03/18 09:50, Chris Wilson wrote:
> Quoting Lionel Landwerlin (2018-03-13 09:17:55)
>> Unfortunately I forgot that some of those tests require rcs topology
>> support which we don't have on Sandybridge. This change split the test
>> in 2 (first part available on all platforms, second part only with rcs
>> topology support).
>>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105475
>> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Aside, why are the flags prefixed with DRM_I915_QUERY and not just
> I915_QUERY matching the rest of the uAPI? In fact, the whole perf abi is
> special. ARGH.

Argh...

Is it too late for to send a fix?

Since it's only one DRM_I915_QUERY_TOPOLOGY_INFO, can we add a new 
define properly named an make the wrongly named one a macro to that?
And make sure it doesn't happen in the future? (at least for this define)

Thanks for the review.

>
>> ---
>>   tests/i915_query.c | 20 +++++++++++++++-----
>>   1 file changed, 15 insertions(+), 5 deletions(-)
>>
>> diff --git a/tests/i915_query.c b/tests/i915_query.c
>> index 328c54bc..c7de8cbd 100644
>> --- a/tests/i915_query.c
>> +++ b/tests/i915_query.c
>> @@ -69,9 +69,7 @@ static bool has_query_supports(int fd)
>>   static void test_query_garbage(int fd)
>>   {
>>          struct drm_i915_query query;
>> -       struct drm_i915_query_item items[2];
>> -       struct drm_i915_query_item *items_ptr;
>> -       int i, n_items;
>> +       struct drm_i915_query_item item;
>>   
>>          /* Verify that invalid query pointers are rejected. */
>>          igt_assert_eq(__i915_query(fd, NULL), -EFAULT);
>> @@ -90,8 +88,15 @@ static void test_query_garbage(int fd)
>>          i915_query_items_err(fd, (void *) 0, 1, EFAULT);
>>   
>>          /* Test the invalid query id = 0. */
>> -       memset(items, 0, sizeof(items));
>> -       i915_query_items_err(fd, items, 1, EINVAL);
>> +       memset(&item, 0, sizeof(item));
>> +       i915_query_items_err(fd, &item, 1, EINVAL);
>> +}
>> +
>> +static void test_query_garbage_items(int fd)
>> +{
>> +       struct drm_i915_query_item items[2];
>> +       struct drm_i915_query_item *items_ptr;
>> +       int i, n_items;
>>   
>>          /*
>>           * Query item flags field is currently valid only if equals to 0.
>> @@ -486,6 +491,11 @@ igt_main
>>          igt_subtest("query-garbage")
>>                  test_query_garbage(fd);
>>   
>> +       igt_subtest("query-garbage-items") {
>> +               igt_require(query_topology_supported(fd));
>> +               test_query_garbage_items(fd);
>> +       }
>> +
>>          igt_subtest("query-topology-kernel-writes") {
>>                  igt_require(query_topology_supported(fd));
>>                  test_query_topology_kernel_writes(fd);
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
> -Chris
>

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

Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split garbage test

[Chris Wilson]

Quoting Lionel Landwerlin (2018-03-13 10:37:18)
> On 13/03/18 09:50, Chris Wilson wrote:
> > Quoting Lionel Landwerlin (2018-03-13 09:17:55)
> >> Unfortunately I forgot that some of those tests require rcs topology
> >> support which we don't have on Sandybridge. This change split the test
> >> in 2 (first part available on all platforms, second part only with rcs
> >> topology support).
> >>
> >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105475
> >> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> > Aside, why are the flags prefixed with DRM_I915_QUERY and not just
> > I915_QUERY matching the rest of the uAPI? In fact, the whole perf abi is
> > special. ARGH.
> 
> Argh...
> 
> Is it too late for to send a fix?

Yes. It's been sealed as it has been sent for 4.17 inclusion. From our
perspective, it is upstream already and so now part of the stable ABI.
Changing defines is just as messy as it can cause source code
incompatibility; admittedly that is greatly reduced by our users pulling
in copies of i915_drm.h and so can coordinate the changes. Hmm, but it
still looks ugly and like we are changing uAPI to an outside observer.
 
> Since it's only one DRM_I915_QUERY_TOPOLOGY_INFO, can we add a new 
> define properly named an make the wrongly named one a macro to that?
> And make sure it doesn't happen in the future? (at least for this define)

Nah, what's done is done and we live with it.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split garbage test

[Lofstedt, Marta]

CI results are looking good.

Reviewed-by: Marta Lofstedt <marta.lofstedt@intel.com>

> -----Original Message-----
> From: igt-dev [mailto:igt-dev-bounces@lists.freedesktop.org] On Behalf Of
> Lionel Landwerlin
> Sent: Tuesday, March 13, 2018 12:37 PM
> To: Chris Wilson <chris@chris-wilson.co.uk>; igt-dev@lists.freedesktop.org
> Subject: Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split garbage test
> 
> On 13/03/18 09:50, Chris Wilson wrote:
> > Quoting Lionel Landwerlin (2018-03-13 09:17:55)
> >> Unfortunately I forgot that some of those tests require rcs topology
> >> support which we don't have on Sandybridge. This change split the
> >> test in 2 (first part available on all platforms, second part only
> >> with rcs topology support).
> >>
> >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105475
> >> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> > Aside, why are the flags prefixed with DRM_I915_QUERY and not just
> > I915_QUERY matching the rest of the uAPI? In fact, the whole perf abi
> > is special. ARGH.
> 
> Argh...
> 
> Is it too late for to send a fix?
> 
> Since it's only one DRM_I915_QUERY_TOPOLOGY_INFO, can we add a new
> define properly named an make the wrongly named one a macro to that?
> And make sure it doesn't happen in the future? (at least for this define)
> 
> Thanks for the review.
> 
> >
> >> ---
> >>   tests/i915_query.c | 20 +++++++++++++++-----
> >>   1 file changed, 15 insertions(+), 5 deletions(-)
> >>
> >> diff --git a/tests/i915_query.c b/tests/i915_query.c index
> >> 328c54bc..c7de8cbd 100644
> >> --- a/tests/i915_query.c
> >> +++ b/tests/i915_query.c
> >> @@ -69,9 +69,7 @@ static bool has_query_supports(int fd)
> >>   static void test_query_garbage(int fd)
> >>   {
> >>          struct drm_i915_query query;
> >> -       struct drm_i915_query_item items[2];
> >> -       struct drm_i915_query_item *items_ptr;
> >> -       int i, n_items;
> >> +       struct drm_i915_query_item item;
> >>
> >>          /* Verify that invalid query pointers are rejected. */
> >>          igt_assert_eq(__i915_query(fd, NULL), -EFAULT); @@ -90,8
> >> +88,15 @@ static void test_query_garbage(int fd)
> >>          i915_query_items_err(fd, (void *) 0, 1, EFAULT);
> >>
> >>          /* Test the invalid query id = 0. */
> >> -       memset(items, 0, sizeof(items));
> >> -       i915_query_items_err(fd, items, 1, EINVAL);
> >> +       memset(&item, 0, sizeof(item));
> >> +       i915_query_items_err(fd, &item, 1, EINVAL); }
> >> +
> >> +static void test_query_garbage_items(int fd) {
> >> +       struct drm_i915_query_item items[2];
> >> +       struct drm_i915_query_item *items_ptr;
> >> +       int i, n_items;
> >>
> >>          /*
> >>           * Query item flags field is currently valid only if equals to 0.
> >> @@ -486,6 +491,11 @@ igt_main
> >>          igt_subtest("query-garbage")
> >>                  test_query_garbage(fd);
> >>
> >> +       igt_subtest("query-garbage-items") {
> >> +               igt_require(query_topology_supported(fd));
> >> +               test_query_garbage_items(fd);
> >> +       }
> >> +
> >>          igt_subtest("query-topology-kernel-writes") {
> >>                  igt_require(query_topology_supported(fd));
> >>                  test_query_topology_kernel_writes(fd);
> > Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
> >
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split garbage test

[Lionel Landwerlin]

Rb for the whole series? :)

On 13/03/18 11:05, Lofstedt, Marta wrote:
> CI results are looking good.
>
> Reviewed-by: Marta Lofstedt <marta.lofstedt@intel.com>
>
>> -----Original Message-----
>> From: igt-dev [mailto:igt-dev-bounces@lists.freedesktop.org] On Behalf Of
>> Lionel Landwerlin
>> Sent: Tuesday, March 13, 2018 12:37 PM
>> To: Chris Wilson <chris@chris-wilson.co.uk>; igt-dev@lists.freedesktop.org
>> Subject: Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split garbage test
>>
>> On 13/03/18 09:50, Chris Wilson wrote:
>>> Quoting Lionel Landwerlin (2018-03-13 09:17:55)
>>>> Unfortunately I forgot that some of those tests require rcs topology
>>>> support which we don't have on Sandybridge. This change split the
>>>> test in 2 (first part available on all platforms, second part only
>>>> with rcs topology support).
>>>>
>>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105475
>>>> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>>> Aside, why are the flags prefixed with DRM_I915_QUERY and not just
>>> I915_QUERY matching the rest of the uAPI? In fact, the whole perf abi
>>> is special. ARGH.
>> Argh...
>>
>> Is it too late for to send a fix?
>>
>> Since it's only one DRM_I915_QUERY_TOPOLOGY_INFO, can we add a new
>> define properly named an make the wrongly named one a macro to that?
>> And make sure it doesn't happen in the future? (at least for this define)
>>
>> Thanks for the review.
>>
>>>> ---
>>>>    tests/i915_query.c | 20 +++++++++++++++-----
>>>>    1 file changed, 15 insertions(+), 5 deletions(-)
>>>>
>>>> diff --git a/tests/i915_query.c b/tests/i915_query.c index
>>>> 328c54bc..c7de8cbd 100644
>>>> --- a/tests/i915_query.c
>>>> +++ b/tests/i915_query.c
>>>> @@ -69,9 +69,7 @@ static bool has_query_supports(int fd)
>>>>    static void test_query_garbage(int fd)
>>>>    {
>>>>           struct drm_i915_query query;
>>>> -       struct drm_i915_query_item items[2];
>>>> -       struct drm_i915_query_item *items_ptr;
>>>> -       int i, n_items;
>>>> +       struct drm_i915_query_item item;
>>>>
>>>>           /* Verify that invalid query pointers are rejected. */
>>>>           igt_assert_eq(__i915_query(fd, NULL), -EFAULT); @@ -90,8
>>>> +88,15 @@ static void test_query_garbage(int fd)
>>>>           i915_query_items_err(fd, (void *) 0, 1, EFAULT);
>>>>
>>>>           /* Test the invalid query id = 0. */
>>>> -       memset(items, 0, sizeof(items));
>>>> -       i915_query_items_err(fd, items, 1, EINVAL);
>>>> +       memset(&item, 0, sizeof(item));
>>>> +       i915_query_items_err(fd, &item, 1, EINVAL); }
>>>> +
>>>> +static void test_query_garbage_items(int fd) {
>>>> +       struct drm_i915_query_item items[2];
>>>> +       struct drm_i915_query_item *items_ptr;
>>>> +       int i, n_items;
>>>>
>>>>           /*
>>>>            * Query item flags field is currently valid only if equals to 0.
>>>> @@ -486,6 +491,11 @@ igt_main
>>>>           igt_subtest("query-garbage")
>>>>                   test_query_garbage(fd);
>>>>
>>>> +       igt_subtest("query-garbage-items") {
>>>> +               igt_require(query_topology_supported(fd));
>>>> +               test_query_garbage_items(fd);
>>>> +       }
>>>> +
>>>>           igt_subtest("query-topology-kernel-writes") {
>>>>                   igt_require(query_topology_supported(fd));
>>>>                   test_query_topology_kernel_writes(fd);
>>> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
>>>
>> _______________________________________________
>> igt-dev mailing list
>> igt-dev@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/igt-dev


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

Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split garbage test

[Lofstedt, Marta]

Well, yes

we won't get results on the query-garbage-items util we have results to diff with, better just send it up

/Marta

> -----Original Message-----
> From: Landwerlin, Lionel G
> Sent: Tuesday, March 13, 2018 1:08 PM
> To: Lofstedt, Marta <marta.lofstedt@intel.com>; Chris Wilson <chris@chris-
> wilson.co.uk>; igt-dev@lists.freedesktop.org
> Subject: Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split garbage test
> 
> Rb for the whole series? :)
> 
> On 13/03/18 11:05, Lofstedt, Marta wrote:
> > CI results are looking good.
> >
> > Reviewed-by: Marta Lofstedt <marta.lofstedt@intel.com>
> >
> >> -----Original Message-----
> >> From: igt-dev [mailto:igt-dev-bounces@lists.freedesktop.org] On
> >> Behalf Of Lionel Landwerlin
> >> Sent: Tuesday, March 13, 2018 12:37 PM
> >> To: Chris Wilson <chris@chris-wilson.co.uk>;
> >> igt-dev@lists.freedesktop.org
> >> Subject: Re: [igt-dev] [PATCH i-g-t 2/2] tests/i915_query: split
> >> garbage test
> >>
> >> On 13/03/18 09:50, Chris Wilson wrote:
> >>> Quoting Lionel Landwerlin (2018-03-13 09:17:55)
> >>>> Unfortunately I forgot that some of those tests require rcs
> >>>> topology support which we don't have on Sandybridge. This change
> >>>> split the test in 2 (first part available on all platforms, second
> >>>> part only with rcs topology support).
> >>>>
> >>>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105475
> >>>> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> >>> Aside, why are the flags prefixed with DRM_I915_QUERY and not just
> >>> I915_QUERY matching the rest of the uAPI? In fact, the whole perf
> >>> abi is special. ARGH.
> >> Argh...
> >>
> >> Is it too late for to send a fix?
> >>
> >> Since it's only one DRM_I915_QUERY_TOPOLOGY_INFO, can we add a
> new
> >> define properly named an make the wrongly named one a macro to that?
> >> And make sure it doesn't happen in the future? (at least for this
> >> define)
> >>
> >> Thanks for the review.
> >>
> >>>> ---
> >>>>    tests/i915_query.c | 20 +++++++++++++++-----
> >>>>    1 file changed, 15 insertions(+), 5 deletions(-)
> >>>>
> >>>> diff --git a/tests/i915_query.c b/tests/i915_query.c index
> >>>> 328c54bc..c7de8cbd 100644
> >>>> --- a/tests/i915_query.c
> >>>> +++ b/tests/i915_query.c
> >>>> @@ -69,9 +69,7 @@ static bool has_query_supports(int fd)
> >>>>    static void test_query_garbage(int fd)
> >>>>    {
> >>>>           struct drm_i915_query query;
> >>>> -       struct drm_i915_query_item items[2];
> >>>> -       struct drm_i915_query_item *items_ptr;
> >>>> -       int i, n_items;
> >>>> +       struct drm_i915_query_item item;
> >>>>
> >>>>           /* Verify that invalid query pointers are rejected. */
> >>>>           igt_assert_eq(__i915_query(fd, NULL), -EFAULT); @@ -90,8
> >>>> +88,15 @@ static void test_query_garbage(int fd)
> >>>>           i915_query_items_err(fd, (void *) 0, 1, EFAULT);
> >>>>
> >>>>           /* Test the invalid query id = 0. */
> >>>> -       memset(items, 0, sizeof(items));
> >>>> -       i915_query_items_err(fd, items, 1, EINVAL);
> >>>> +       memset(&item, 0, sizeof(item));
> >>>> +       i915_query_items_err(fd, &item, 1, EINVAL); }
> >>>> +
> >>>> +static void test_query_garbage_items(int fd) {
> >>>> +       struct drm_i915_query_item items[2];
> >>>> +       struct drm_i915_query_item *items_ptr;
> >>>> +       int i, n_items;
> >>>>
> >>>>           /*
> >>>>            * Query item flags field is currently valid only if equals to 0.
> >>>> @@ -486,6 +491,11 @@ igt_main
> >>>>           igt_subtest("query-garbage")
> >>>>                   test_query_garbage(fd);
> >>>>
> >>>> +       igt_subtest("query-garbage-items") {
> >>>> +               igt_require(query_topology_supported(fd));
> >>>> +               test_query_garbage_items(fd);
> >>>> +       }
> >>>> +
> >>>>           igt_subtest("query-topology-kernel-writes") {
> >>>>                   igt_require(query_topology_supported(fd));
> >>>>                   test_query_topology_kernel_writes(fd);
> >>> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> -Chris
> >>>
> >> _______________________________________________
> >> igt-dev mailing list
> >> igt-dev@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/igt-dev
> 

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