[PATCH v2] drm/i915/selftests: Silence compiler warning in igt_ctx_exec

[PATCH v2] drm/i915/selftests: Silence compiler warning in igt_ctx_exec

[Chris Wilson]

The compiler doesn't always spot the guard that object is allocated on
the first pass, leading to:

drivers/gpu/drm/i915/selftests/i915_gem_context.c: warning: 'obj' may be used uninitialized in this function [-Wuninitialized]:  => 370:8

v2: Make it more obvious by setting obj to NULL on the first pass and
any later pass where we need to reallocate.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Fixes: 791ff39ae32a ("drm/i915: Live testing for context execution")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Matthew Auld <matthew.auld@intel.com>
c: <drm-intel-fixes@lists.freedesktop.org> # v4.12-rc1+
---
 drivers/gpu/drm/i915/selftests/i915_gem_context.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/selftests/i915_gem_context.c
index 1afb8b06e3e1..12b85b3278cd 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_context.c
@@ -320,7 +320,7 @@ static unsigned long max_dwords(struct drm_i915_gem_object *obj)
 static int igt_ctx_exec(void *arg)
 {
 	struct drm_i915_private *i915 = arg;
-	struct drm_i915_gem_object *obj;
+	struct drm_i915_gem_object *obj = NULL;
 	struct drm_file *file;
 	IGT_TIMEOUT(end_time);
 	LIST_HEAD(objects);
@@ -359,7 +359,7 @@ static int igt_ctx_exec(void *arg)
 		}
 
 		for_each_engine(engine, i915, id) {
-			if (dw == 0) {
+			if (!obj) {
 				obj = create_test_object(ctx, file, &objects);
 				if (IS_ERR(obj)) {
 					err = PTR_ERR(obj);
@@ -376,8 +376,10 @@ static int igt_ctx_exec(void *arg)
 				goto out_unlock;
 			}
 
-			if (++dw == max_dwords(obj))
+			if (++dw == max_dwords(obj)) {
+				obj = NULL;
 				dw = 0;
+			}
 			ndwords++;
 		}
 		ncontexts++;
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915/selftests: Silence compiler warning in igt_ctx_exec (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915/selftests: Silence compiler warning in igt_ctx_exec (rev2)
URL   : https://patchwork.freedesktop.org/series/24787/
State : success

== Summary ==

Series 24787v2 drm/i915/selftests: Silence compiler warning in igt_ctx_exec
https://patchwork.freedesktop.org/api/1.0/series/24787/revisions/2/mbox/

fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:431s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:442s
fi-bdw-5557u failed to collect. IGT log at Patchwork_4790/fi-bdw-5557u/igt.log
fi-bsw-n3050 failed to collect. IGT log at Patchwork_4790/fi-bsw-n3050/igt.log
fi-bxt-j4205 failed to collect. IGT log at Patchwork_4790/fi-bxt-j4205/igt.log
fi-hsw-4770 failed to collect. IGT log at Patchwork_4790/fi-hsw-4770/igt.log
fi-hsw-4770r failed to collect. IGT log at Patchwork_4790/fi-hsw-4770r/igt.log
fi-ilk-650 failed to collect. IGT log at Patchwork_4790/fi-ilk-650/igt.log
fi-ivb-3520m failed to collect. IGT log at Patchwork_4790/fi-ivb-3520m/igt.log
fi-ivb-3770 failed to collect. IGT log at Patchwork_4790/fi-ivb-3770/igt.log
fi-kbl-7500u failed to collect. IGT log at Patchwork_4790/fi-kbl-7500u/igt.log
fi-kbl-7560u failed to collect. IGT log at Patchwork_4790/fi-kbl-7560u/igt.log
fi-skl-6260u failed to collect. IGT log at Patchwork_4790/fi-skl-6260u/igt.log
fi-skl-6700hq failed to collect. IGT log at Patchwork_4790/fi-skl-6700hq/igt.log
fi-skl-6700k failed to collect. IGT log at Patchwork_4790/fi-skl-6700k/igt.log
fi-skl-6770hq failed to collect. IGT log at Patchwork_4790/fi-skl-6770hq/igt.log
fi-snb-2520m failed to collect. IGT log at Patchwork_4790/fi-snb-2520m/igt.log
fi-snb-2600 failed to collect. IGT log at Patchwork_4790/fi-snb-2600/igt.log

c6d01bed4870cb979003bbbfb38b0e7ebf036794 drm-tip: 2017y-05m-23d-14h-42m-41s UTC integration manifest
160a9c9 drm/i915/selftests: Silence compiler warning in igt_ctx_exec

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4790/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✓ Fi.CI.BAT: success for drm/i915/selftests: Silence compiler warning in igt_ctx_exec (rev2)

[Saarinen, Jani]

HI, 
> -----Original Message-----
> From: Intel-gfx [mailto:intel-gfx-bounces@lists.freedesktop.org] On Behalf Of
> Patchwork
> Sent: Tuesday, May 23, 2017 11:01 PM
> To: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: intel-gfx@lists.freedesktop.org
> Subject: [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/selftests: Silence compiler
> warning in igt_ctx_exec (rev2)
> 
> == Series Details ==
> 
> Series: drm/i915/selftests: Silence compiler warning in igt_ctx_exec (rev2)
> URL   : https://patchwork.freedesktop.org/series/24787/
> State : success
> 
> == Summary ==
> 
> Series 24787v2 drm/i915/selftests: Silence compiler warning in igt_ctx_exec
> https://patchwork.freedesktop.org/api/1.0/series/24787/revisions/2/mbox/
> 
> fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:431s
> fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:442s
Same here...will be investigated. 

> fi-bdw-5557u failed to collect. IGT log at Patchwork_4790/fi-bdw-5557u/igt.log
> fi-bsw-n3050 failed to collect. IGT log at Patchwork_4790/fi-bsw-n3050/igt.log
> fi-bxt-j4205 failed to collect. IGT log at Patchwork_4790/fi-bxt-j4205/igt.log
> fi-hsw-4770 failed to collect. IGT log at Patchwork_4790/fi-hsw-4770/igt.log
> fi-hsw-4770r failed to collect. IGT log at Patchwork_4790/fi-hsw-4770r/igt.log
> fi-ilk-650 failed to collect. IGT log at Patchwork_4790/fi-ilk-650/igt.log fi-ivb-
> 3520m failed to collect. IGT log at Patchwork_4790/fi-ivb-3520m/igt.log
> fi-ivb-3770 failed to collect. IGT log at Patchwork_4790/fi-ivb-3770/igt.log
> fi-kbl-7500u failed to collect. IGT log at Patchwork_4790/fi-kbl-7500u/igt.log
> fi-kbl-7560u failed to collect. IGT log at Patchwork_4790/fi-kbl-7560u/igt.log
> fi-skl-6260u failed to collect. IGT log at Patchwork_4790/fi-skl-6260u/igt.log
> fi-skl-6700hq failed to collect. IGT log at Patchwork_4790/fi-skl-6700hq/igt.log
> fi-skl-6700k failed to collect. IGT log at Patchwork_4790/fi-skl-6700k/igt.log
> fi-skl-6770hq failed to collect. IGT log at Patchwork_4790/fi-skl-6770hq/igt.log
> fi-snb-2520m failed to collect. IGT log at Patchwork_4790/fi-snb-2520m/igt.log
> fi-snb-2600 failed to collect. IGT log at Patchwork_4790/fi-snb-2600/igt.log
> 
> c6d01bed4870cb979003bbbfb38b0e7ebf036794 drm-tip: 2017y-05m-23d-14h-
> 42m-41s UTC integration manifest
> 160a9c9 drm/i915/selftests: Silence compiler warning in igt_ctx_exec
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4790/


Jani Saarinen
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo



_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915/selftests: Silence compiler warning in igt_ctx_exec

[Tvrtko Ursulin]

On 23/05/2017 20:44, Chris Wilson wrote:
> The compiler doesn't always spot the guard that object is allocated on
> the first pass, leading to:
>
> drivers/gpu/drm/i915/selftests/i915_gem_context.c: warning: 'obj' may be used uninitialized in this function [-Wuninitialized]:  => 370:8
>
> v2: Make it more obvious by setting obj to NULL on the first pass and
> any later pass where we need to reallocate.
>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Fixes: 791ff39ae32a ("drm/i915: Live testing for context execution")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Matthew Auld <matthew.auld@intel.com>
> c: <drm-intel-fixes@lists.freedesktop.org> # v4.12-rc1+
> ---
>  drivers/gpu/drm/i915/selftests/i915_gem_context.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/selftests/i915_gem_context.c
> index 1afb8b06e3e1..12b85b3278cd 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_context.c
> @@ -320,7 +320,7 @@ static unsigned long max_dwords(struct drm_i915_gem_object *obj)
>  static int igt_ctx_exec(void *arg)
>  {
>  	struct drm_i915_private *i915 = arg;
> -	struct drm_i915_gem_object *obj;
> +	struct drm_i915_gem_object *obj = NULL;
>  	struct drm_file *file;
>  	IGT_TIMEOUT(end_time);
>  	LIST_HEAD(objects);
> @@ -359,7 +359,7 @@ static int igt_ctx_exec(void *arg)
>  		}
>
>  		for_each_engine(engine, i915, id) {
> -			if (dw == 0) {
> +			if (!obj) {
>  				obj = create_test_object(ctx, file, &objects);
>  				if (IS_ERR(obj)) {
>  					err = PTR_ERR(obj);
> @@ -376,8 +376,10 @@ static int igt_ctx_exec(void *arg)
>  				goto out_unlock;
>  			}
>
> -			if (++dw == max_dwords(obj))
> +			if (++dw == max_dwords(obj)) {
> +				obj = NULL;
>  				dw = 0;
> +			}
>  			ndwords++;
>  		}
>  		ncontexts++;
>

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915/selftests: Silence compiler warning in igt_ctx_exec

[Chris Wilson]

On Wed, May 24, 2017 at 10:29:02AM +0100, Tvrtko Ursulin wrote:
> 
> On 23/05/2017 20:44, Chris Wilson wrote:
> >The compiler doesn't always spot the guard that object is allocated on
> >the first pass, leading to:
> >
> >drivers/gpu/drm/i915/selftests/i915_gem_context.c: warning: 'obj' may be used uninitialized in this function [-Wuninitialized]:  => 370:8
> >
> >v2: Make it more obvious by setting obj to NULL on the first pass and
> >any later pass where we need to reallocate.
> >
> >Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> >Fixes: 791ff39ae32a ("drm/i915: Live testing for context execution")
> >Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> >Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >Cc: Matthew Auld <matthew.auld@intel.com>
> >c: <drm-intel-fixes@lists.freedesktop.org> # v4.12-rc1+

> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Ta, and pushed.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915/selftests: Silence compiler warning in igt_ctx_exec (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915/selftests: Silence compiler warning in igt_ctx_exec (rev2)
URL   : https://patchwork.freedesktop.org/series/24787/
State : success

== Summary ==

Series 24787v2 drm/i915/selftests: Silence compiler warning in igt_ctx_exec
https://patchwork.freedesktop.org/api/1.0/series/24787/revisions/2/mbox/

Test gem_exec_flush:
        Subgroup basic-batch-kernel-default-uc:
                pass       -> FAIL       (fi-snb-2600) fdo#100007
Test gem_exec_suspend:
        Subgroup basic-s4-devices:
                dmesg-warn -> PASS       (fi-snb-2600) fdo#100125
Test kms_flip:
        Subgroup basic-flip-vs-dpms:
                dmesg-fail -> DMESG-WARN (fi-skl-6700hq) fdo#101144
        Subgroup basic-flip-vs-modeset:
                skip       -> PASS       (fi-skl-6700hq) fdo#100867
        Subgroup basic-flip-vs-wf_vblank:
                skip       -> PASS       (fi-skl-6700hq) fdo#99739
        Subgroup basic-plain-flip:
                skip       -> PASS       (fi-skl-6700hq)
Test kms_frontbuffer_tracking:
        Subgroup basic:
                skip       -> PASS       (fi-skl-6700hq)
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-a:
                fail       -> PASS       (fi-skl-6700hq) fdo#101154 +16

fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144
fdo#100867 https://bugs.freedesktop.org/show_bug.cgi?id=100867
fdo#99739 https://bugs.freedesktop.org/show_bug.cgi?id=99739
fdo#101154 https://bugs.freedesktop.org/show_bug.cgi?id=101154

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:444s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:432s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:578s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:515s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:487s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:486s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:423s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:414s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:417s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:499s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:462s
fi-kbl-7500u     total:278  pass:255  dwarn:5   dfail:0   fail:0   skip:18  time:461s
fi-kbl-7560u     total:278  pass:263  dwarn:5   dfail:0   fail:0   skip:10  time:567s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:466s
fi-skl-6700hq    total:278  pass:260  dwarn:1   dfail:0   fail:0   skip:17  time:566s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:470s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:501s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:442s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:532s
fi-snb-2600      total:278  pass:248  dwarn:0   dfail:0   fail:1   skip:29  time:412s

c8f2238b9cbfef358e61596cd49b1f648c85811e drm-tip: 2017y-05m-24d-08h-04m-41s UTC integration manifest
553b12b drm/i915/selftests: Silence compiler warning in igt_ctx_exec

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4797/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915/selftests: Silence compiler warning in igt_ctx_exec

[Joonas Lahtinen]

On ti, 2017-05-23 at 20:44 +0100, Chris Wilson wrote:
> The compiler doesn't always spot the guard that object is allocated on
> the first pass, leading to:
> 
> drivers/gpu/drm/i915/selftests/i915_gem_context.c: warning: 'obj' may be used uninitialized in this function [-Wuninitialized]:  => 370:8
> 
> v2: Make it more obvious by setting obj to NULL on the first pass and
> any later pass where we need to reallocate.
> 
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Fixes: 791ff39ae32a ("drm/i915: Live testing for context execution")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Matthew Auld <matthew.auld@intel.com>
> c: <drm-intel-fixes@lists.freedesktop.org> # v4.12-rc1+

Still not Cc?

Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

Regards, Joonas
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915/selftests: Silence compiler warning in igt_ctx_exec

[Chris Wilson]

On Wed, May 24, 2017 at 06:24:06PM +0300, Joonas Lahtinen wrote:
> On ti, 2017-05-23 at 20:44 +0100, Chris Wilson wrote:
> > The compiler doesn't always spot the guard that object is allocated on
> > the first pass, leading to:
> > 
> > drivers/gpu/drm/i915/selftests/i915_gem_context.c: warning: 'obj' may be used uninitialized in this function [-Wuninitialized]:  => 370:8
> > 
> > v2: Make it more obvious by setting obj to NULL on the first pass and
> > any later pass where we need to reallocate.
> > 
> > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > Fixes: 791ff39ae32a ("drm/i915: Live testing for context execution")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > Cc: Matthew Auld <matthew.auld@intel.com>
> > c: <drm-intel-fixes@lists.freedesktop.org> # v4.12-rc1+
> 
> Still not Cc?

:( Completely forgot. Still debatable if we care whether the build
report is improved for v4.12 or v4.13.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915/selftests: Silence compiler warning in igt_ctx_exec

[Joonas Lahtinen]

On ke, 2017-05-24 at 16:37 +0100, Chris Wilson wrote:
> On Wed, May 24, 2017 at 06:24:06PM +0300, Joonas Lahtinen wrote:
> > 
> > On ti, 2017-05-23 at 20:44 +0100, Chris Wilson wrote:
> > > 
> > > The compiler doesn't always spot the guard that object is allocated on
> > > the first pass, leading to:
> > > 
> > > drivers/gpu/drm/i915/selftests/i915_gem_context.c: warning: 'obj' may be used uninitialized in this function [-Wuninitialized]:  => 370:8
> > > 
> > > v2: Make it more obvious by setting obj to NULL on the first pass and
> > > any later pass where we need to reallocate.
> > > 
> > > Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> > > Fixes: 791ff39ae32a ("drm/i915: Live testing for context execution")
> > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > > Cc: Matthew Auld <matthew.auld@intel.com>
> > > c: <drm-intel-fixes@lists.freedesktop.org> # v4.12-rc1+
> > 
> > Still not Cc?
> 
> :( Completely forgot. Still debatable if we care whether the build
> report is improved for v4.12 or v4.13.

I don't think it's worth backporting.

Regards, Joonas
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx