* [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page allocation failure
@ 2020-10-19 8:34 Chris Wilson
2020-10-19 9:09 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Chris Wilson @ 2020-10-19 8:34 UTC (permalink / raw)
To: intel-gfx; +Cc: Matthew Auld, Chris Wilson
In switching to using objects for our ppGTT scratch pages, care was not
taken to avoid trying to unref NULL objects on failure. And for gen6
ppGTT, it appears we forgot entirely to unwind after a partial allocation
failure.
Fixes: 89351925a477 ("drm/i915/gt: Switch to object allocations for page directories")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 18 ++++++++++++------
drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 3 ++-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
index c0d17f87b00f..680bd9442eb0 100644
--- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
@@ -239,18 +239,24 @@ static int gen6_ppgtt_init_scratch(struct gen6_ppgtt *ppgtt)
I915_CACHE_NONE, PTE_READ_ONLY);
vm->scratch[1] = vm->alloc_pt_dma(vm, I915_GTT_PAGE_SIZE_4K);
- if (IS_ERR(vm->scratch[1]))
- return PTR_ERR(vm->scratch[1]);
+ if (IS_ERR(vm->scratch[1])) {
+ ret = PTR_ERR(vm->scratch[1]);
+ goto err_scratch0;
+ }
ret = pin_pt_dma(vm, vm->scratch[1]);
- if (ret) {
- i915_gem_object_put(vm->scratch[1]);
- return ret;
- }
+ if (ret)
+ goto err_scratch1;
fill32_px(vm->scratch[1], vm->scratch[0]->encode);
return 0;
+
+err_scratch1:
+ i915_gem_object_put(vm->scratch[1]);
+err_scratch0:
+ i915_gem_object_put(vm->scratch[0]);
+ return ret;
}
static void gen6_ppgtt_free_pd(struct gen6_ppgtt *ppgtt)
diff --git a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
index b236aa046f91..a37c968ef8f7 100644
--- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
+++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
@@ -607,7 +607,8 @@ static int gen8_init_scratch(struct i915_address_space *vm)
return 0;
free_scratch:
- free_scratch(vm);
+ while (i--)
+ i915_gem_object_put(vm->scratch[i]);
return -ENOMEM;
}
--
2.20.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Onion unwind for scratch page allocation failure
2020-10-19 8:34 [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page allocation failure Chris Wilson
@ 2020-10-19 9:09 ` Patchwork
2020-10-19 10:51 ` [Intel-gfx] [PATCH] " Matthew Auld
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2020-10-19 9:09 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 4410 bytes --]
== Series Details ==
Series: drm/i915/gt: Onion unwind for scratch page allocation failure
URL : https://patchwork.freedesktop.org/series/82811/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9161 -> Patchwork_18725
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/index.html
Known issues
------------
Here are the changes found in Patchwork_18725 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload:
- fi-byt-j1900: [PASS][1] -> [DMESG-WARN][2] ([i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/fi-byt-j1900/igt@i915_module_load@reload.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/fi-byt-j1900/igt@i915_module_load@reload.html
* igt@i915_selftest@live@execlists:
- fi-tgl-u2: [PASS][3] -> [INCOMPLETE][4] ([i915#2268] / [i915#2292])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/fi-tgl-u2/igt@i915_selftest@live@execlists.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/fi-tgl-u2/igt@i915_selftest@live@execlists.html
#### Possible fixes ####
* igt@core_hotunplug@unbind-rebind:
- {fi-tgl-dsi}: [DMESG-WARN][5] ([i915#1982]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/fi-tgl-dsi/igt@core_hotunplug@unbind-rebind.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/fi-tgl-dsi/igt@core_hotunplug@unbind-rebind.html
* igt@gem_exec_suspend@basic-s0:
- fi-tgl-u2: [FAIL][7] ([i915#1888]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/fi-tgl-u2/igt@gem_exec_suspend@basic-s0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/fi-tgl-u2/igt@gem_exec_suspend@basic-s0.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- {fi-kbl-7560u}: [DMESG-WARN][9] ([i915#1982]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/fi-kbl-7560u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/fi-kbl-7560u/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
- fi-kbl-r: [DMESG-WARN][11] ([i915#1982]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/fi-kbl-r/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/fi-kbl-r/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html
#### Warnings ####
* igt@core_hotunplug@unbind-rebind:
- fi-icl-u2: [DMESG-WARN][13] ([i915#289]) -> [DMESG-WARN][14] ([i915#1982] / [i915#289])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/fi-icl-u2/igt@core_hotunplug@unbind-rebind.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/fi-icl-u2/igt@core_hotunplug@unbind-rebind.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2268]: https://gitlab.freedesktop.org/drm/intel/issues/2268
[i915#2292]: https://gitlab.freedesktop.org/drm/intel/issues/2292
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#289]: https://gitlab.freedesktop.org/drm/intel/issues/289
Participating hosts (45 -> 39)
------------------------------
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9161 -> Patchwork_18725
CI-20190529: 20190529
CI_DRM_9161: f474d6c53162f26d23510062d99569d3898639b1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5821: 2bf22b1cff7905f7e214c0707941929a09450257 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18725: e06d45d35a228357125c56cb97fcaa4ad299e04c @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
e06d45d35a22 drm/i915/gt: Onion unwind for scratch page allocation failure
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/index.html
[-- Attachment #1.2: Type: text/html, Size: 5445 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page allocation failure
2020-10-19 8:34 [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page allocation failure Chris Wilson
2020-10-19 9:09 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2020-10-19 10:51 ` Matthew Auld
2020-10-19 11:30 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Matthew Auld @ 2020-10-19 10:51 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On 19/10/2020 09:34, Chris Wilson wrote:
> In switching to using objects for our ppGTT scratch pages, care was not
> taken to avoid trying to unref NULL objects on failure. And for gen6
> ppGTT, it appears we forgot entirely to unwind after a partial allocation
> failure.
>
> Fixes: 89351925a477 ("drm/i915/gt: Switch to object allocations for page directories")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Matthew Auld <matthew.auld@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/gt: Onion unwind for scratch page allocation failure
2020-10-19 8:34 [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page allocation failure Chris Wilson
2020-10-19 9:09 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-10-19 10:51 ` [Intel-gfx] [PATCH] " Matthew Auld
@ 2020-10-19 11:30 ` Patchwork
2020-10-19 16:10 ` [Intel-gfx] [PATCH] " Tang, CQ
2020-10-20 16:27 ` Tang, CQ
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2020-10-19 11:30 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 18162 bytes --]
== Series Details ==
Series: drm/i915/gt: Onion unwind for scratch page allocation failure
URL : https://patchwork.freedesktop.org/series/82811/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_9161_full -> Patchwork_18725_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_18725_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_18725_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_18725_full:
### IGT changes ###
#### Possible regressions ####
* igt@gem_eio@in-flight-contexts-10ms:
- shard-snb: [PASS][1] -> [TIMEOUT][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-snb7/igt@gem_eio@in-flight-contexts-10ms.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-snb2/igt@gem_eio@in-flight-contexts-10ms.html
* igt@kms_flip@2x-flip-vs-expired-vblank@ac-vga1-hdmi-a1:
- shard-hsw: NOTRUN -> [INCOMPLETE][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-hsw8/igt@kms_flip@2x-flip-vs-expired-vblank@ac-vga1-hdmi-a1.html
#### Warnings ####
* igt@runner@aborted:
- shard-iclb: ([FAIL][4], [FAIL][5]) ([i915#2439]) -> [FAIL][6]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-iclb5/igt@runner@aborted.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-iclb3/igt@runner@aborted.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-iclb7/igt@runner@aborted.html
- shard-skl: [FAIL][7] ([i915#1611] / [i915#1814] / [i915#2029]) -> [FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-skl2/igt@runner@aborted.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-skl9/igt@runner@aborted.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* {igt@kms_async_flips@async-flip-with-page-flip-events}:
- shard-skl: [FAIL][9] ([i915#2521]) -> [DMESG-FAIL][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-skl9/igt@kms_async_flips@async-flip-with-page-flip-events.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-skl9/igt@kms_async_flips@async-flip-with-page-flip-events.html
### Piglit changes ###
#### Possible regressions ####
* spec@arb_framebuffer_object@mixed-buffer-sizes (NEW):
- {pig-icl-1065g7}: NOTRUN -> [FAIL][11]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/pig-icl-1065g7/spec@arb_framebuffer_object@mixed-buffer-sizes.html
New tests
---------
New tests have been introduced between CI_DRM_9161_full and Patchwork_18725_full:
### New Piglit tests (1) ###
* spec@arb_framebuffer_object@mixed-buffer-sizes:
- Statuses : 1 fail(s)
- Exec time: [0.33] s
Known issues
------------
Here are the changes found in Patchwork_18725_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@in-flight-contexts-10ms:
- shard-hsw: [PASS][12] -> [TIMEOUT][13] ([i915#1976])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-hsw1/igt@gem_eio@in-flight-contexts-10ms.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-hsw6/igt@gem_eio@in-flight-contexts-10ms.html
* igt@gem_exec_suspend@basic-s3-devices:
- shard-hsw: [PASS][14] -> [FAIL][15] ([i915#1888])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-hsw6/igt@gem_exec_suspend@basic-s3-devices.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-hsw4/igt@gem_exec_suspend@basic-s3-devices.html
* igt@gem_partial_pwrite_pread@reads-display:
- shard-snb: [PASS][16] -> [INCOMPLETE][17] ([i915#82])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-snb5/igt@gem_partial_pwrite_pread@reads-display.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-snb7/igt@gem_partial_pwrite_pread@reads-display.html
* igt@kms_cursor_edge_walk@pipe-b-64x64-top-edge:
- shard-skl: [PASS][18] -> [DMESG-WARN][19] ([i915#1982]) +5 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-skl1/igt@kms_cursor_edge_walk@pipe-b-64x64-top-edge.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-skl3/igt@kms_cursor_edge_walk@pipe-b-64x64-top-edge.html
* igt@kms_flip@2x-dpms-vs-vblank-race-interruptible@ab-vga1-hdmi-a1:
- shard-hsw: [PASS][20] -> [DMESG-WARN][21] ([i915#1982])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-hsw1/igt@kms_flip@2x-dpms-vs-vblank-race-interruptible@ab-vga1-hdmi-a1.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-hsw6/igt@kms_flip@2x-dpms-vs-vblank-race-interruptible@ab-vga1-hdmi-a1.html
* igt@kms_flip@wf_vblank-ts-check@a-dp1:
- shard-kbl: [PASS][22] -> [DMESG-WARN][23] ([i915#1982]) +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-kbl4/igt@kms_flip@wf_vblank-ts-check@a-dp1.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-kbl1/igt@kms_flip@wf_vblank-ts-check@a-dp1.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-pgflip-blt:
- shard-snb: [PASS][24] -> [FAIL][25] ([i915#2546]) +1 similar issue
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-snb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-pgflip-blt.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-snb7/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-indfb-pgflip-blt.html
* igt@kms_frontbuffer_tracking@fbcpsr-stridechange:
- shard-tglb: [PASS][26] -> [DMESG-WARN][27] ([i915#1982]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-tglb5/igt@kms_frontbuffer_tracking@fbcpsr-stridechange.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-tglb1/igt@kms_frontbuffer_tracking@fbcpsr-stridechange.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][28] -> [FAIL][29] ([i915#1188])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-skl5/igt@kms_hdr@bpc-switch-dpms.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-skl4/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][30] -> [DMESG-FAIL][31] ([fdo#108145] / [i915#1982])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-skl9/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-skl9/igt@kms_plane_alpha_blend@pipe-a-coverage-7efc.html
* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [PASS][32] -> [SKIP][33] ([fdo#109441]) +2 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-iclb1/igt@kms_psr@psr2_primary_page_flip.html
#### Possible fixes ####
* igt@gem_exec_whisper@basic-normal:
- shard-glk: [DMESG-WARN][34] ([i915#118] / [i915#95]) -> [PASS][35] +1 similar issue
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-glk6/igt@gem_exec_whisper@basic-normal.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-glk4/igt@gem_exec_whisper@basic-normal.html
* igt@gem_partial_pwrite_pread@reads-display:
- shard-hsw: [FAIL][36] ([i915#1888] / [i915#2261]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-hsw6/igt@gem_partial_pwrite_pread@reads-display.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-hsw4/igt@gem_partial_pwrite_pread@reads-display.html
* igt@gem_sync@basic-store-all:
- shard-iclb: [INCOMPLETE][38] -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-iclb3/igt@gem_sync@basic-store-all.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-iclb8/igt@gem_sync@basic-store-all.html
* igt@gem_userptr_blits@map-fixed-invalidate-busy-gup@wb:
- shard-hsw: [FAIL][40] ([i915#1888]) -> [PASS][41] +1 similar issue
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-hsw1/igt@gem_userptr_blits@map-fixed-invalidate-busy-gup@wb.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-hsw6/igt@gem_userptr_blits@map-fixed-invalidate-busy-gup@wb.html
* igt@gem_userptr_blits@sync-unmap-cycles:
- shard-skl: [TIMEOUT][42] ([i915#2424]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-skl1/igt@gem_userptr_blits@sync-unmap-cycles.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-skl1/igt@gem_userptr_blits@sync-unmap-cycles.html
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-hsw: [WARN][44] ([i915#1519]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-hsw4/igt@i915_pm_rc6_residency@rc6-fence.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-hsw1/igt@i915_pm_rc6_residency@rc6-fence.html
* {igt@kms_async_flips@async-flip-with-page-flip-events}:
- shard-tglb: [FAIL][46] ([i915#2521]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-tglb7/igt@kms_async_flips@async-flip-with-page-flip-events.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-tglb3/igt@kms_async_flips@async-flip-with-page-flip-events.html
* igt@kms_big_fb@y-tiled-64bpp-rotate-180:
- shard-apl: [DMESG-WARN][48] ([i915#1635] / [i915#1982]) -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-apl2/igt@kms_big_fb@y-tiled-64bpp-rotate-180.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-apl1/igt@kms_big_fb@y-tiled-64bpp-rotate-180.html
* igt@kms_cursor_edge_walk@pipe-c-256x256-bottom-edge:
- shard-skl: [DMESG-WARN][50] ([i915#1982]) -> [PASS][51] +5 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-skl5/igt@kms_cursor_edge_walk@pipe-c-256x256-bottom-edge.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-skl6/igt@kms_cursor_edge_walk@pipe-c-256x256-bottom-edge.html
* igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
- shard-hsw: [FAIL][52] ([i915#96]) -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-hsw6/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-hsw4/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
* igt@kms_cursor_legacy@flip-vs-cursor-toggle:
- shard-tglb: [FAIL][54] ([i915#2346]) -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-tglb7/igt@kms_cursor_legacy@flip-vs-cursor-toggle.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-tglb3/igt@kms_cursor_legacy@flip-vs-cursor-toggle.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-snb: [DMESG-WARN][56] ([i915#42]) -> [PASS][57]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-snb7/igt@kms_fbcon_fbt@fbc-suspend.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-snb2/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_flip@flip-vs-suspend@c-hdmi-a1:
- shard-hsw: [INCOMPLETE][58] ([i915#2055]) -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-hsw2/igt@kms_flip@flip-vs-suspend@c-hdmi-a1.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-hsw8/igt@kms_flip@flip-vs-suspend@c-hdmi-a1.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-skl: [INCOMPLETE][60] ([i915#198]) -> [PASS][61]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-skl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-skl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [SKIP][62] ([fdo#109441]) -> [PASS][63] +1 similar issue
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-iclb6/igt@kms_psr@psr2_sprite_blt.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
* igt@perf@blocking:
- shard-skl: [FAIL][64] ([i915#1542]) -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-skl9/igt@perf@blocking.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-skl9/igt@perf@blocking.html
* igt@perf_pmu@module-unload:
- shard-tglb: [DMESG-WARN][66] ([i915#1982]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-tglb3/igt@perf_pmu@module-unload.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-tglb7/igt@perf_pmu@module-unload.html
#### Warnings ####
* igt@i915_pm_rpm@modeset-lpsp:
- shard-tglb: [DMESG-WARN][68] ([i915#1982] / [i915#2411]) -> [DMESG-WARN][69] ([i915#2411])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-tglb6/igt@i915_pm_rpm@modeset-lpsp.html
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-tglb6/igt@i915_pm_rpm@modeset-lpsp.html
* igt@kms_content_protection@atomic:
- shard-apl: [FAIL][70] ([fdo#110321] / [fdo#110336] / [i915#1635]) -> [TIMEOUT][71] ([i915#1319] / [i915#1635])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-apl6/igt@kms_content_protection@atomic.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-apl1/igt@kms_content_protection@atomic.html
* igt@kms_content_protection@srm:
- shard-apl: [TIMEOUT][72] ([i915#1319] / [i915#1635]) -> [FAIL][73] ([fdo#110321] / [i915#1635])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-apl7/igt@kms_content_protection@srm.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-apl1/igt@kms_content_protection@srm.html
* igt@runner@aborted:
- shard-glk: ([FAIL][74], [FAIL][75]) ([i915#1611] / [i915#1814] / [k.org#202321]) -> [FAIL][76] ([k.org#202321])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-glk8/igt@runner@aborted.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9161/shard-glk6/igt@runner@aborted.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_18725/shard-glk3/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110321]: https://bugs.freedesktop.org/show_bug.cgi?id=110321
[fdo#110336]: https://bugs.freedesktop.org/show_bug.cgi?id=110336
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1319]: https://gitlab.freedesktop.org/drm/intel/issues/1319
[i915#1519]: https://gitlab.freedesktop.org/drm/intel/issues/1519
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#1611]: https://gitlab.freedesktop.org/drm/intel/issues/1611
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1976]: https://gitlab.freedesktop.org/drm/intel/issues/1976
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2055]: https://gitlab.freedesktop.org/drm/intel/issues/2055
[i915#2261]: https://gitlab.freedesktop.org/drm/intel/issues/2261
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2424]: https://gitlab.freedesktop.org/drm/intel/issues/2424
[i915#2439]: https://gitlab.freedesktop.org/drm/intel/issues/2439
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2546]: https://gitlab.freedesktop.org/drm/intel/issues/2546
[i915#42]: https://gitlab.freedesktop.org/drm/intel/issues/42
[i915#82]: https://gitlab.freedesktop.org/drm/intel/issues/82
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
[i915#96]: https://gitlab.freedesktop.org/drm/intel/issues/96
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9161 -> Patchwork_18725
CI-20190529: 20190529
CI_DRM_9161: f474d6c53162f26d23510062d99569d3898639b1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5821: 2bf22b1cff7905f7e214c0707941929a09450257 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_18725: e06d45d35a228357125c56cb97fcaa4ad299e04c @ 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_18725/index.html
[-- Attachment #1.2: Type: text/html, Size: 21215 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page allocation failure
2020-10-19 8:34 [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page allocation failure Chris Wilson
` (2 preceding siblings ...)
2020-10-19 11:30 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
@ 2020-10-19 16:10 ` Tang, CQ
2020-10-20 16:27 ` Tang, CQ
4 siblings, 0 replies; 6+ messages in thread
From: Tang, CQ @ 2020-10-19 16:10 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Auld, Matthew
I fixed this problem partially (not gen6 code) with patch:
http://intel-gfx-pw.fi.intel.com/series/5911/
Should I continue to fix on internal?
--CQ
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of
> Chris Wilson
> Sent: Monday, October 19, 2020 1:35 AM
> To: intel-gfx@lists.freedesktop.org
> Cc: Auld, Matthew <matthew.auld@intel.com>; Chris Wilson <chris@chris-
> wilson.co.uk>
> Subject: [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page
> allocation failure
>
> In switching to using objects for our ppGTT scratch pages, care was not taken
> to avoid trying to unref NULL objects on failure. And for gen6 ppGTT, it
> appears we forgot entirely to unwind after a partial allocation failure.
>
> Fixes: 89351925a477 ("drm/i915/gt: Switch to object allocations for page
> directories")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Matthew Auld <matthew.auld@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 18 ++++++++++++------
> drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 3 ++-
> 2 files changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
> b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
> index c0d17f87b00f..680bd9442eb0 100644
> --- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
> +++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
> @@ -239,18 +239,24 @@ static int gen6_ppgtt_init_scratch(struct
> gen6_ppgtt *ppgtt)
> I915_CACHE_NONE, PTE_READ_ONLY);
>
> vm->scratch[1] = vm->alloc_pt_dma(vm, I915_GTT_PAGE_SIZE_4K);
> - if (IS_ERR(vm->scratch[1]))
> - return PTR_ERR(vm->scratch[1]);
> + if (IS_ERR(vm->scratch[1])) {
> + ret = PTR_ERR(vm->scratch[1]);
> + goto err_scratch0;
> + }
>
> ret = pin_pt_dma(vm, vm->scratch[1]);
> - if (ret) {
> - i915_gem_object_put(vm->scratch[1]);
> - return ret;
> - }
> + if (ret)
> + goto err_scratch1;
>
> fill32_px(vm->scratch[1], vm->scratch[0]->encode);
>
> return 0;
> +
> +err_scratch1:
> + i915_gem_object_put(vm->scratch[1]);
> +err_scratch0:
> + i915_gem_object_put(vm->scratch[0]);
> + return ret;
> }
>
> static void gen6_ppgtt_free_pd(struct gen6_ppgtt *ppgtt) diff --git
> a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
> b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
> index b236aa046f91..a37c968ef8f7 100644
> --- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
> +++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
> @@ -607,7 +607,8 @@ static int gen8_init_scratch(struct i915_address_space
> *vm)
> return 0;
>
> free_scratch:
> - free_scratch(vm);
> + while (i--)
> + i915_gem_object_put(vm->scratch[i]);
> return -ENOMEM;
> }
>
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page allocation failure
2020-10-19 8:34 [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page allocation failure Chris Wilson
` (3 preceding siblings ...)
2020-10-19 16:10 ` [Intel-gfx] [PATCH] " Tang, CQ
@ 2020-10-20 16:27 ` Tang, CQ
4 siblings, 0 replies; 6+ messages in thread
From: Tang, CQ @ 2020-10-20 16:27 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Auld, Matthew
Reviewed-by: CQ Tang <cq.tang@intel.com>
--CQ
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of
> Chris Wilson
> Sent: Monday, October 19, 2020 1:35 AM
> To: intel-gfx@lists.freedesktop.org
> Cc: Auld, Matthew <matthew.auld@intel.com>; Chris Wilson <chris@chris-
> wilson.co.uk>
> Subject: [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page
> allocation failure
>
> In switching to using objects for our ppGTT scratch pages, care was not taken
> to avoid trying to unref NULL objects on failure. And for gen6 ppGTT, it
> appears we forgot entirely to unwind after a partial allocation failure.
>
> Fixes: 89351925a477 ("drm/i915/gt: Switch to object allocations for page
> directories")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Matthew Auld <matthew.auld@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 18 ++++++++++++------
> drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 3 ++-
> 2 files changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
> b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
> index c0d17f87b00f..680bd9442eb0 100644
> --- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
> +++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c
> @@ -239,18 +239,24 @@ static int gen6_ppgtt_init_scratch(struct
> gen6_ppgtt *ppgtt)
> I915_CACHE_NONE, PTE_READ_ONLY);
>
> vm->scratch[1] = vm->alloc_pt_dma(vm, I915_GTT_PAGE_SIZE_4K);
> - if (IS_ERR(vm->scratch[1]))
> - return PTR_ERR(vm->scratch[1]);
> + if (IS_ERR(vm->scratch[1])) {
> + ret = PTR_ERR(vm->scratch[1]);
> + goto err_scratch0;
> + }
>
> ret = pin_pt_dma(vm, vm->scratch[1]);
> - if (ret) {
> - i915_gem_object_put(vm->scratch[1]);
> - return ret;
> - }
> + if (ret)
> + goto err_scratch1;
>
> fill32_px(vm->scratch[1], vm->scratch[0]->encode);
>
> return 0;
> +
> +err_scratch1:
> + i915_gem_object_put(vm->scratch[1]);
> +err_scratch0:
> + i915_gem_object_put(vm->scratch[0]);
> + return ret;
> }
>
> static void gen6_ppgtt_free_pd(struct gen6_ppgtt *ppgtt) diff --git
> a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
> b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
> index b236aa046f91..a37c968ef8f7 100644
> --- a/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
> +++ b/drivers/gpu/drm/i915/gt/gen8_ppgtt.c
> @@ -607,7 +607,8 @@ static int gen8_init_scratch(struct i915_address_space
> *vm)
> return 0;
>
> free_scratch:
> - free_scratch(vm);
> + while (i--)
> + i915_gem_object_put(vm->scratch[i]);
> return -ENOMEM;
> }
>
> --
> 2.20.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-20 16:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-19 8:34 [Intel-gfx] [PATCH] drm/i915/gt: Onion unwind for scratch page allocation failure Chris Wilson
2020-10-19 9:09 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-10-19 10:51 ` [Intel-gfx] [PATCH] " Matthew Auld
2020-10-19 11:30 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
2020-10-19 16:10 ` [Intel-gfx] [PATCH] " Tang, CQ
2020-10-20 16:27 ` Tang, CQ
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.