| Message ID | 20190327092005.32017-1-mika.kuoppala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915/selftests: Fix an IS_ERR() vs NULL check | expand |
Quoting Mika Kuoppala (2019-03-27 09:20:05) > The live_context() function returns error pointers. It never returns > NULL. > > Fixes: 52c0fdb25c7c ("drm/i915: Replace global breadcrumbs with per-context interrupt tracking") > Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> > --- > drivers/gpu/drm/i915/selftests/i915_request.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c > index e6ffe2240126..7c5154dba6d6 100644 > --- a/drivers/gpu/drm/i915/selftests/i915_request.c > +++ b/drivers/gpu/drm/i915/selftests/i915_request.c > @@ -1146,11 +1146,15 @@ static int live_breadcrumbs_smoketest(void *arg) > > mutex_lock(&i915->drm.struct_mutex); > for (n = 0; n < t[0].ncontexts; n++) { > - t[0].contexts[n] = live_context(i915, file); > - if (!t[0].contexts[n]) { > + struct i915_gem_context *ctx; > + > + ctx = live_context(i915, file); > + if (IS_ERR(ctx)) { > ret = -ENOMEM; ret = PTR_ERR(ctx); Might be interesting if it's not ENOMEM. -Chris
Patchwork <patchwork@emeril.freedesktop.org> writes: > == Series Details == > > Series: drm/i915/selftests: Fix an IS_ERR() vs NULL check (rev3) Ok, never ever send a patch with identical subject line. > URL : https://patchwork.freedesktop.org/series/58557/ > State : failure > > == Summary == > > CI Bug Log - changes from CI_DRM_5824 -> Patchwork_12612 > ==================================================== > > Summary > ------- > > **FAILURE** > > Serious unknown changes coming with Patchwork_12612 absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_12612, please notify your bug team to allow them > to document this new failure mode, which will reduce false positives in CI. > > External URL: https://patchwork.freedesktop.org/api/1.0/series/58557/revisions/3/mbox/ > > Possible new issues > ------------------- > > Here are the unknown changes that may have been introduced in Patchwork_12612: > > ### IGT changes ### > > #### Possible regressions #### > > * igt@i915_selftest@live_uncore: > - fi-kbl-8809g: PASS -> DMESG-FAIL <3> [320.015575] bcs0:RING_MI_MODE=200, fw_domains 0x2 still up after 100ms! -Mika > > > Known issues > ------------ > > Here are the changes found in Patchwork_12612 that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@gem_exec_basic@readonly-bsd2: > - fi-pnv-d510: NOTRUN -> SKIP [fdo#109271] +76 > > * igt@i915_selftest@live_contexts: > - fi-skl-gvtdvm: PASS -> DMESG-FAIL [fdo#110235 ] > > * igt@kms_busy@basic-flip-c: > - fi-pnv-d510: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] > > * igt@kms_frontbuffer_tracking@basic: > - fi-byt-clapper: PASS -> FAIL [fdo#103167] > > * igt@prime_vgem@basic-fence-flip: > - fi-gdg-551: PASS -> FAIL [fdo#103182] > > > #### Possible fixes #### > > * igt@kms_busy@basic-flip-a: > - fi-gdg-551: FAIL [fdo#103182] -> PASS > > > [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 > [fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182 > [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 > [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278 > [fdo#110235 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110235 > > > Participating hosts (42 -> 37) > ------------------------------ > > Additional (1): fi-pnv-d510 > Missing (6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-bdw-samus > > > Build changes > ------------- > > * Linux: CI_DRM_5824 -> Patchwork_12612 > > CI_DRM_5824: d6a239f8bd502261971e5a2fb0ec71ae0b30b298 @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_4907: 7c8f2616fa0fd3ddb16e050c5b7ea9ce707abbe4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_12612: 545ca65d2548ce9a6d6c965abb1ce061d2c7eb18 @ git://anongit.freedesktop.org/gfx-ci/linux > > > == Linux commits == > > 545ca65d2548 drm/i915/selftests: Fix an IS_ERR() vs NULL check > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_12612/
diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c index e6ffe2240126..7c5154dba6d6 100644 --- a/drivers/gpu/drm/i915/selftests/i915_request.c +++ b/drivers/gpu/drm/i915/selftests/i915_request.c @@ -1146,11 +1146,15 @@ static int live_breadcrumbs_smoketest(void *arg) mutex_lock(&i915->drm.struct_mutex); for (n = 0; n < t[0].ncontexts; n++) { - t[0].contexts[n] = live_context(i915, file); - if (!t[0].contexts[n]) { + struct i915_gem_context *ctx; + + ctx = live_context(i915, file); + if (IS_ERR(ctx)) { ret = -ENOMEM; goto out_contexts; } + + t[0].contexts[n] = ctx; } ret = igt_live_test_begin(&live, i915, __func__, "");
The live_context() function returns error pointers. It never returns NULL. Fixes: 52c0fdb25c7c ("drm/i915: Replace global breadcrumbs with per-context interrupt tracking") Signed-off-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> --- drivers/gpu/drm/i915/selftests/i915_request.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)