* [PATCH] drm/i915/execlists: Avoid putting the error pointer
@ 2018-06-11 15:33 Chris Wilson
2018-06-11 15:36 ` Lionel Landwerlin
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2018-06-11 15:33 UTC (permalink / raw)
To: intel-gfx
On allocation error, do not jump to the unwind handler that tries to
free the error opinter.
Reported-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: a89d1f921c15 ("drm/i915: Split i915_gem_timeline into individual timelines")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_lrc.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 3e008adf5a01..43b75f60abf9 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -2770,10 +2770,8 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
context_size += LRC_HEADER_PAGES * PAGE_SIZE;
ctx_obj = i915_gem_object_create(ctx->i915, context_size);
- if (IS_ERR(ctx_obj)) {
- ret = PTR_ERR(ctx_obj);
- goto error_deref_obj;
- }
+ if (IS_ERR(ctx_obj))
+ return PTR_ERR(ctx_obj);
vma = i915_vma_instance(ctx_obj, &ctx->i915->ggtt.vm, NULL);
if (IS_ERR(vma)) {
--
2.17.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915/execlists: Avoid putting the error pointer
2018-06-11 15:33 [PATCH] drm/i915/execlists: Avoid putting the error pointer Chris Wilson
@ 2018-06-11 15:36 ` Lionel Landwerlin
2018-06-11 16:32 ` Chris Wilson
2018-06-11 15:58 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-06-11 20:23 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Lionel Landwerlin @ 2018-06-11 15:36 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 11/06/18 16:33, Chris Wilson wrote:
> On allocation error, do not jump to the unwind handler that tries to
> free the error opinter.
>
> Reported-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Fixes: a89d1f921c15 ("drm/i915: Split i915_gem_timeline into individual timelines")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> ---
> drivers/gpu/drm/i915/intel_lrc.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index 3e008adf5a01..43b75f60abf9 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -2770,10 +2770,8 @@ static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
> context_size += LRC_HEADER_PAGES * PAGE_SIZE;
>
> ctx_obj = i915_gem_object_create(ctx->i915, context_size);
> - if (IS_ERR(ctx_obj)) {
> - ret = PTR_ERR(ctx_obj);
> - goto error_deref_obj;
> - }
> + if (IS_ERR(ctx_obj))
> + return PTR_ERR(ctx_obj);
>
> vma = i915_vma_instance(ctx_obj, &ctx->i915->ggtt.vm, NULL);
> if (IS_ERR(vma)) {
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915/execlists: Avoid putting the error pointer
2018-06-11 15:36 ` Lionel Landwerlin
@ 2018-06-11 16:32 ` Chris Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2018-06-11 16:32 UTC (permalink / raw)
To: Lionel Landwerlin, intel-gfx
Quoting Lionel Landwerlin (2018-06-11 16:36:48)
> On 11/06/18 16:33, Chris Wilson wrote:
> > On allocation error, do not jump to the unwind handler that tries to
> > free the error opinter.
> >
> > Reported-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> > Fixes: a89d1f921c15 ("drm/i915: Split i915_gem_timeline into individual timelines")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
At least one spelling mistake fixed, and pushed. Thanks for spotting the
error and reviewing the fix,
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915/execlists: Avoid putting the error pointer
2018-06-11 15:33 [PATCH] drm/i915/execlists: Avoid putting the error pointer Chris Wilson
2018-06-11 15:36 ` Lionel Landwerlin
@ 2018-06-11 15:58 ` Patchwork
2018-06-11 20:23 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-06-11 15:58 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/execlists: Avoid putting the error pointer
URL : https://patchwork.freedesktop.org/series/44573/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4302 -> Patchwork_9259 =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9259 need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_9259, 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/44573/revisions/1/mbox/
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9259:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_gttfill@basic:
fi-pnv-d510: SKIP -> PASS
== Known issues ==
Here are the changes found in Patchwork_9259 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@gem_exec_suspend@basic-s3:
fi-skl-gvtdvm: NOTRUN -> INCOMPLETE (fdo#105600, fdo#104108)
igt@kms_flip@basic-flip-vs-modeset:
fi-glk-j4005: PASS -> DMESG-WARN (fdo#106000)
==== Possible fixes ====
igt@gem_mmap_gtt@basic-small-bo-tiledx:
fi-gdg-551: FAIL (fdo#102575) -> PASS
igt@kms_pipe_crc_basic@read-crc-pipe-b-frame-sequence:
fi-glk-j4005: FAIL (fdo#103481) -> PASS
igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
fi-cnl-psr: DMESG-WARN (fdo#104951) -> PASS
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103481 https://bugs.freedesktop.org/show_bug.cgi?id=103481
fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
fdo#104951 https://bugs.freedesktop.org/show_bug.cgi?id=104951
fdo#105600 https://bugs.freedesktop.org/show_bug.cgi?id=105600
fdo#106000 https://bugs.freedesktop.org/show_bug.cgi?id=106000
== Participating hosts (41 -> 38) ==
Additional (2): fi-bdw-gvtdvm fi-skl-gvtdvm
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-skl-6700hq
== Build changes ==
* Linux: CI_DRM_4302 -> Patchwork_9259
CI_DRM_4302: ef129f260b2bd362959651fe8e20e369bf3c977e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4513: 7b6838781441cfbc7f6c18f421f127dfb02b44cf @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9259: 1a29eb5fef33473b4c987e684fae559ca53147b3 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
1a29eb5fef33 drm/i915/execlists: Avoid putting the error pointer
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9259/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* ✓ Fi.CI.IGT: success for drm/i915/execlists: Avoid putting the error pointer
2018-06-11 15:33 [PATCH] drm/i915/execlists: Avoid putting the error pointer Chris Wilson
2018-06-11 15:36 ` Lionel Landwerlin
2018-06-11 15:58 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-06-11 20:23 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-06-11 20:23 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/execlists: Avoid putting the error pointer
URL : https://patchwork.freedesktop.org/series/44573/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4302_full -> Patchwork_9259_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9259_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_9259_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9259_full:
=== IGT changes ===
==== Warnings ====
igt@gem_mocs_settings@mocs-rc6-vebox:
shard-kbl: PASS -> SKIP
igt@pm_rc6_residency@rc6-accuracy:
shard-kbl: SKIP -> PASS +2
shard-snb: SKIP -> PASS
== Known issues ==
Here are the changes found in Patchwork_9259_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_flip@2x-flip-vs-expired-vblank:
shard-hsw: PASS -> FAIL (fdo#102887)
igt@kms_flip_tiling@flip-x-tiled:
shard-glk: PASS -> FAIL (fdo#103822, fdo#104724)
==== Possible fixes ====
igt@drv_suspend@shrink:
shard-glk: INCOMPLETE (fdo#103359, k.org#198133) -> PASS
igt@gem_eio@suspend:
shard-snb: FAIL (fdo#105957) -> PASS
igt@gem_exec_big:
shard-hsw: INCOMPLETE (fdo#103540) -> PASS
igt@gem_ppgtt@blt-vs-render-ctxn:
shard-kbl: INCOMPLETE (fdo#106023, fdo#103665) -> PASS
igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
shard-hsw: FAIL (fdo#105767) -> PASS
igt@kms_cursor_legacy@2x-nonblocking-modeset-vs-cursor-atomic:
shard-glk: FAIL (fdo#106509, fdo#105454) -> PASS
igt@kms_cursor_legacy@cursor-vs-flip-toggle:
shard-hsw: FAIL (fdo#103355) -> PASS
igt@kms_flip@2x-flip-vs-blocking-wf-vblank:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip_tiling@flip-to-y-tiled:
shard-glk: FAIL (fdo#103822, fdo#104724) -> PASS
igt@kms_setmode@basic:
shard-hsw: FAIL (fdo#99912) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103355 https://bugs.freedesktop.org/show_bug.cgi?id=103355
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
fdo#105767 https://bugs.freedesktop.org/show_bug.cgi?id=105767
fdo#105957 https://bugs.freedesktop.org/show_bug.cgi?id=105957
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4302 -> Patchwork_9259
CI_DRM_4302: ef129f260b2bd362959651fe8e20e369bf3c977e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4513: 7b6838781441cfbc7f6c18f421f127dfb02b44cf @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9259: 1a29eb5fef33473b4c987e684fae559ca53147b3 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9259/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-06-11 20:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-11 15:33 [PATCH] drm/i915/execlists: Avoid putting the error pointer Chris Wilson
2018-06-11 15:36 ` Lionel Landwerlin
2018-06-11 16:32 ` Chris Wilson
2018-06-11 15:58 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-06-11 20:23 ` ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox