* [Intel-gfx] [CI] drm/i915: Populate logical context during first pin.
@ 2020-12-31 17:04 Chris Wilson
2020-12-31 18:06 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Populate logical context during first pin. (rev2) Patchwork
2020-12-31 21:35 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
0 siblings, 2 replies; 4+ messages in thread
From: Chris Wilson @ 2020-12-31 17:04 UTC (permalink / raw)
To: intel-gfx
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
This allows us to remove pin_map from state allocation, which saves
us a few retry loops. We won't need this until first pin, anyway.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_context_types.h | 13 +++---
.../drm/i915/gt/intel_execlists_submission.c | 43 +------------------
drivers/gpu/drm/i915/gt/intel_lrc.c | 4 ++
3 files changed, 13 insertions(+), 47 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_context_types.h b/drivers/gpu/drm/i915/gt/intel_context_types.h
index 430aafb78ed3..e10d78601bbd 100644
--- a/drivers/gpu/drm/i915/gt/intel_context_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_context_types.h
@@ -89,12 +89,13 @@ struct intel_context {
unsigned long flags;
#define CONTEXT_BARRIER_BIT 0
#define CONTEXT_ALLOC_BIT 1
-#define CONTEXT_VALID_BIT 2
-#define CONTEXT_CLOSED_BIT 3
-#define CONTEXT_USE_SEMAPHORES 4
-#define CONTEXT_BANNED 5
-#define CONTEXT_FORCE_SINGLE_SUBMISSION 6
-#define CONTEXT_NOPREEMPT 7
+#define CONTEXT_INIT_BIT 2
+#define CONTEXT_VALID_BIT 3
+#define CONTEXT_CLOSED_BIT 4
+#define CONTEXT_USE_SEMAPHORES 5
+#define CONTEXT_BANNED 6
+#define CONTEXT_FORCE_SINGLE_SUBMISSION 7
+#define CONTEXT_NOPREEMPT 8
u32 *lrc_reg_state;
union {
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index cb2491ec6d3f..2afbc0a4ca03 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -2500,48 +2500,9 @@ static int execlists_context_pin(struct intel_context *ce, void *vaddr)
return lrc_pin(ce, ce->engine, vaddr);
}
-static int __lrc_setup(struct intel_context *ce,
- struct intel_engine_cs *engine)
-{
- struct drm_i915_gem_object *obj = ce->state->obj;
- void *vaddr;
-
- vaddr = i915_gem_object_pin_map(obj, I915_MAP_WB);
- if (IS_ERR(vaddr)) {
- drm_dbg(&engine->i915->drm, "Could not map object pages!\n");
- return PTR_ERR(vaddr);
- }
-
- lrc_init_state(ce, engine, vaddr);
-
- __i915_gem_object_flush_map(obj, 0, engine->context_size);
- i915_gem_object_unpin_map(obj);
- return 0;
-}
-
-static int __execlists_context_alloc(struct intel_context *ce,
- struct intel_engine_cs *engine)
-{
- int err;
-
- err = lrc_alloc(ce, engine);
- if (err)
- return err;
-
- err = __lrc_setup(ce, engine);
- if (err)
- goto err_lrc;
-
- return 0;
-
-err_lrc:
- lrc_fini(ce);
- return err;
-}
-
static int execlists_context_alloc(struct intel_context *ce)
{
- return __execlists_context_alloc(ce, ce->engine);
+ return lrc_alloc(ce, ce->engine);
}
static const struct intel_context_ops execlists_context_ops = {
@@ -3414,7 +3375,7 @@ static int virtual_context_alloc(struct intel_context *ce)
{
struct virtual_engine *ve = container_of(ce, typeof(*ve), context);
- return __execlists_context_alloc(ce, ve->siblings[0]);
+ return lrc_alloc(ce, ve->siblings[0]);
}
static int virtual_context_pre_pin(struct intel_context *ce,
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 008f50a86355..4e856947fb13 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -916,6 +916,10 @@ lrc_pin(struct intel_context *ce,
void *vaddr)
{
ce->lrc_reg_state = vaddr + LRC_STATE_OFFSET;
+
+ if (!__test_and_set_bit(CONTEXT_INIT_BIT, &ce->flags))
+ lrc_init_state(ce, engine, vaddr);
+
ce->lrc.lrca = lrc_update_regs(ce, engine, ce->ring->tail);
return 0;
}
--
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] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Populate logical context during first pin. (rev2)
2020-12-31 17:04 [Intel-gfx] [CI] drm/i915: Populate logical context during first pin Chris Wilson
@ 2020-12-31 18:06 ` Patchwork
2020-12-31 21:35 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2020-12-31 18:06 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 4278 bytes --]
== Series Details ==
Series: drm/i915: Populate logical context during first pin. (rev2)
URL : https://patchwork.freedesktop.org/series/85356/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9537 -> Patchwork_19239
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/index.html
Known issues
------------
Here are the changes found in Patchwork_19239 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@memory-alloc:
- fi-cml-u2: NOTRUN -> [SKIP][1] ([fdo#109315]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/fi-cml-u2/igt@amdgpu/amd_basic@memory-alloc.html
* igt@fbdev@write:
- fi-tgl-y: [PASS][2] -> [DMESG-WARN][3] ([i915#402]) +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/fi-tgl-y/igt@fbdev@write.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/fi-tgl-y/igt@fbdev@write.html
* igt@gem_exec_fence@basic-busy@bcs0:
- fi-cml-u2: NOTRUN -> [SKIP][4] ([i915#1208]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/fi-cml-u2/igt@gem_exec_fence@basic-busy@bcs0.html
* igt@gem_huc_copy@huc-copy:
- fi-cml-u2: NOTRUN -> [SKIP][5] ([i915#2190])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/fi-cml-u2/igt@gem_huc_copy@huc-copy.html
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-cml-u2: NOTRUN -> [SKIP][6] ([i915#1004]) +2 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/fi-cml-u2/igt@kms_chamelium@hdmi-hpd-fast.html
* igt@kms_chamelium@vga-edid-read:
- fi-cml-u2: NOTRUN -> [SKIP][7] ([fdo#109309]) +1 similar issue
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/fi-cml-u2/igt@kms_chamelium@vga-edid-read.html
* igt@kms_force_connector_basic@force-load-detect:
- fi-cml-u2: NOTRUN -> [SKIP][8] ([fdo#109285])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/fi-cml-u2/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-cml-u2: NOTRUN -> [SKIP][9] ([fdo#109278] / [i915#533])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/fi-cml-u2/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
#### Possible fixes ####
* igt@debugfs_test@read_all_entries:
- fi-tgl-y: [DMESG-WARN][10] ([i915#402]) -> [PASS][11] +2 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/fi-tgl-y/igt@debugfs_test@read_all_entries.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/fi-tgl-y/igt@debugfs_test@read_all_entries.html
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#1004]: https://gitlab.freedesktop.org/drm/intel/issues/1004
[i915#1208]: https://gitlab.freedesktop.org/drm/intel/issues/1208
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
Participating hosts (41 -> 37)
------------------------------
Additional (1): fi-cml-u2
Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_9537 -> Patchwork_19239
CI-20190529: 20190529
CI_DRM_9537: c232ca705490fdec5109dd0c9b8a413dc3de5ecb @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5934: a5c54153a82fe4cbd3b72cd85eb1b3eea91a1155 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19239: 6a18ce0ea0e9a8f3f0fdd447c08bc71578a495d5 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
6a18ce0ea0e9 drm/i915: Populate logical context during first pin.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/index.html
[-- Attachment #1.2: Type: text/html, Size: 5165 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] 4+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Populate logical context during first pin. (rev2)
2020-12-31 17:04 [Intel-gfx] [CI] drm/i915: Populate logical context during first pin Chris Wilson
2020-12-31 18:06 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Populate logical context during first pin. (rev2) Patchwork
@ 2020-12-31 21:35 ` Patchwork
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2020-12-31 21:35 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
[-- Attachment #1.1: Type: text/plain, Size: 20997 bytes --]
== Series Details ==
Series: drm/i915: Populate logical context during first pin. (rev2)
URL : https://patchwork.freedesktop.org/series/85356/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_9537_full -> Patchwork_19239_full
====================================================
Summary
-------
**WARNING**
Minor unknown changes coming with Patchwork_19239_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_19239_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_19239_full:
### IGT changes ###
#### Warnings ####
* igt@i915_suspend@fence-restore-untiled:
- shard-kbl: [INCOMPLETE][1] ([i915#155]) -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-kbl3/igt@i915_suspend@fence-restore-untiled.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-kbl7/igt@i915_suspend@fence-restore-untiled.html
Known issues
------------
Here are the changes found in Patchwork_19239_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_capture@pi@rcs0:
- shard-skl: NOTRUN -> [INCOMPLETE][3] ([i915#2369])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl5/igt@gem_exec_capture@pi@rcs0.html
* igt@gem_exec_reloc@basic-wide-active@vcs1:
- shard-iclb: NOTRUN -> [FAIL][4] ([i915#2389])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-iclb4/igt@gem_exec_reloc@basic-wide-active@vcs1.html
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][5] -> [DMESG-WARN][6] ([i915#1436] / [i915#716])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl3/igt@gen9_exec_parse@allowed-single.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl4/igt@gen9_exec_parse@allowed-single.html
* igt@i915_selftest@live@gem_contexts:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([i915#198] / [i915#2369])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl1/igt@i915_selftest@live@gem_contexts.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl10/igt@i915_selftest@live@gem_contexts.html
* igt@i915_selftest@live@hugepages:
- shard-skl: [PASS][9] -> [DMESG-WARN][10] ([i915#2826])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl1/igt@i915_selftest@live@hugepages.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl10/igt@i915_selftest@live@hugepages.html
* igt@kms_async_flips@alternate-sync-async-flip:
- shard-tglb: [PASS][11] -> [FAIL][12] ([i915#2521])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-tglb5/igt@kms_async_flips@alternate-sync-async-flip.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-tglb1/igt@kms_async_flips@alternate-sync-async-flip.html
* igt@kms_chamelium@dp-crc-single:
- shard-skl: NOTRUN -> [SKIP][13] ([fdo#109271] / [fdo#111827])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl8/igt@kms_chamelium@dp-crc-single.html
* igt@kms_color@pipe-a-ctm-0-25:
- shard-tglb: NOTRUN -> [FAIL][14] ([i915#1149] / [i915#315])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-tglb6/igt@kms_color@pipe-a-ctm-0-25.html
* igt@kms_color@pipe-a-ctm-blue-to-red:
- shard-skl: [PASS][15] -> [FAIL][16] ([i915#129])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl2/igt@kms_color@pipe-a-ctm-blue-to-red.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl6/igt@kms_color@pipe-a-ctm-blue-to-red.html
* igt@kms_color_chamelium@pipe-d-degamma:
- shard-tglb: NOTRUN -> [SKIP][17] ([fdo#109284] / [fdo#111827]) +1 similar issue
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-tglb6/igt@kms_color_chamelium@pipe-d-degamma.html
* igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen:
- shard-skl: [PASS][18] -> [FAIL][19] ([i915#54]) +10 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl4/igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl1/igt@kms_cursor_crc@pipe-c-cursor-64x21-offscreen.html
* igt@kms_cursor_crc@pipe-d-cursor-512x512-random:
- shard-tglb: NOTRUN -> [SKIP][20] ([fdo#109279])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-tglb6/igt@kms_cursor_crc@pipe-d-cursor-512x512-random.html
* igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-untiled:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#108145] / [i915#177] / [i915#52] / [i915#54])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl2/igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-untiled.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl6/igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-untiled.html
* igt@kms_flip@plain-flip-fb-recreate@c-edp1:
- shard-skl: [PASS][23] -> [FAIL][24] ([i915#2122])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl6/igt@kms_flip@plain-flip-fb-recreate@c-edp1.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl7/igt@kms_flip@plain-flip-fb-recreate@c-edp1.html
* igt@kms_frontbuffer_tracking@fbc-2p-rte:
- shard-skl: NOTRUN -> [SKIP][25] ([fdo#109271]) +7 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl5/igt@kms_frontbuffer_tracking@fbc-2p-rte.html
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [PASS][26] -> [DMESG-WARN][27] ([i915#180])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-kbl2/igt@kms_frontbuffer_tracking@fbc-suspend.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-kbl4/igt@kms_frontbuffer_tracking@fbc-suspend.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-cur-indfb-draw-mmap-gtt:
- shard-tglb: NOTRUN -> [SKIP][28] ([fdo#111825]) +4 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-tglb6/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-cur-indfb-draw-mmap-gtt.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][29] -> [FAIL][30] ([i915#1188])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl1/igt@kms_hdr@bpc-switch-dpms.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl10/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][31] -> [FAIL][32] ([fdo#108145] / [i915#265]) +1 similar issue
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl2/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl6/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html
* igt@kms_psr@psr2_sprite_plane_onoff:
- shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109441])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-iclb2/igt@kms_psr@psr2_sprite_plane_onoff.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-iclb8/igt@kms_psr@psr2_sprite_plane_onoff.html
* igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend:
- shard-skl: [PASS][35] -> [INCOMPLETE][36] ([i915#198])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl7/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl3/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html
* igt@nouveau_crc@pipe-b-ctx-flip-skip-current-frame:
- shard-tglb: NOTRUN -> [SKIP][37] ([i915#2530])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-tglb6/igt@nouveau_crc@pipe-b-ctx-flip-skip-current-frame.html
* igt@prime_nv_test@i915_nv_sharing:
- shard-tglb: NOTRUN -> [SKIP][38] ([fdo#109291])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-tglb6/igt@prime_nv_test@i915_nv_sharing.html
#### Possible fixes ####
* {igt@gem_exec_fair@basic-none-share@rcs0}:
- shard-iclb: [FAIL][39] ([i915#2842]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-iclb3/igt@gem_exec_fair@basic-none-share@rcs0.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-iclb6/igt@gem_exec_fair@basic-none-share@rcs0.html
* {igt@gem_exec_fair@basic-none-solo@rcs0}:
- shard-glk: [FAIL][41] ([i915#2842]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-glk3/igt@gem_exec_fair@basic-none-solo@rcs0.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-glk3/igt@gem_exec_fair@basic-none-solo@rcs0.html
* {igt@gem_exec_schedule@u-fairslice@vecs0}:
- shard-skl: [DMESG-WARN][43] ([i915#1610]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl6/igt@gem_exec_schedule@u-fairslice@vecs0.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl7/igt@gem_exec_schedule@u-fairslice@vecs0.html
* igt@kms_color@pipe-b-ctm-negative:
- shard-skl: [DMESG-WARN][45] ([i915#1982]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl5/igt@kms_color@pipe-b-ctm-negative.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl2/igt@kms_color@pipe-b-ctm-negative.html
* igt@kms_cursor_crc@pipe-c-cursor-64x21-random:
- shard-skl: [FAIL][47] ([i915#54]) -> [PASS][48] +5 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl4/igt@kms_cursor_crc@pipe-c-cursor-64x21-random.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl3/igt@kms_cursor_crc@pipe-c-cursor-64x21-random.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [FAIL][49] ([i915#2346] / [i915#533]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl4/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic:
- shard-skl: [FAIL][51] ([i915#2346]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl6/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl7/igt@kms_cursor_legacy@flip-vs-cursor-busy-crc-atomic.html
* igt@kms_flip@2x-flip-vs-suspend-interruptible@bc-vga1-hdmi-a1:
- shard-hsw: [INCOMPLETE][53] ([i915#2055]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-hsw4/igt@kms_flip@2x-flip-vs-suspend-interruptible@bc-vga1-hdmi-a1.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-hsw1/igt@kms_flip@2x-flip-vs-suspend-interruptible@bc-vga1-hdmi-a1.html
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-tglb: [FAIL][55] ([i915#2598]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-tglb6/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-tglb3/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
* igt@kms_flip@plain-flip-fb-recreate@a-edp1:
- shard-skl: [FAIL][57] ([i915#2122]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl6/igt@kms_flip@plain-flip-fb-recreate@a-edp1.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl7/igt@kms_flip@plain-flip-fb-recreate@a-edp1.html
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-d-planes:
- shard-tglb: [INCOMPLETE][59] ([i915#2411] / [i915#456]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-tglb1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-d-planes.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-tglb6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-d-planes.html
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][61] ([fdo#108145] / [i915#265]) -> [PASS][62] +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl1/igt@kms_plane_alpha_blend@pipe-b-coverage-7efc.html
* igt@kms_plane_lowres@pipe-a-tiling-none:
- shard-iclb: [DMESG-FAIL][63] ([i915#1226]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-iclb5/igt@kms_plane_lowres@pipe-a-tiling-none.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-iclb3/igt@kms_plane_lowres@pipe-a-tiling-none.html
* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-skl: [INCOMPLETE][65] ([i915#198] / [i915#2405]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl9/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl5/igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend.html
#### Warnings ####
* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][67] ([i915#2681] / [i915#2684]) -> [WARN][68] ([i915#2684])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-iclb8/igt@i915_pm_rc6_residency@rc6-fence.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-iclb2/igt@i915_pm_rc6_residency@rc6-fence.html
* igt@runner@aborted:
- shard-kbl: [FAIL][69] ([i915#2295] / [i915#483]) -> ([FAIL][70], [FAIL][71], [FAIL][72]) ([fdo#109271] / [i915#1814] / [i915#2295] / [i915#483])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-kbl4/igt@runner@aborted.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-kbl4/igt@runner@aborted.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-kbl1/igt@runner@aborted.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-kbl7/igt@runner@aborted.html
- shard-iclb: ([FAIL][73], [FAIL][74]) ([i915#2295] / [i915#2724] / [i915#483]) -> ([FAIL][75], [FAIL][76]) ([i915#2295] / [i915#2724])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-iclb8/igt@runner@aborted.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-iclb8/igt@runner@aborted.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-iclb2/igt@runner@aborted.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-iclb2/igt@runner@aborted.html
- shard-glk: ([FAIL][77], [FAIL][78]) ([i915#2295] / [k.org#202321]) -> ([FAIL][79], [FAIL][80], [FAIL][81]) ([i915#2295] / [i915#2426] / [k.org#202321])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-glk8/igt@runner@aborted.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-glk6/igt@runner@aborted.html
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-glk8/igt@runner@aborted.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-glk3/igt@runner@aborted.html
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-glk8/igt@runner@aborted.html
- shard-skl: ([FAIL][82], [FAIL][83]) ([i915#2295] / [i915#2426]) -> ([FAIL][84], [FAIL][85], [FAIL][86], [FAIL][87], [FAIL][88]) ([i915#1436] / [i915#2295] / [i915#2426] / [i915#483])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl6/igt@runner@aborted.html
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9537/shard-skl6/igt@runner@aborted.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl4/igt@runner@aborted.html
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl5/igt@runner@aborted.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl4/igt@runner@aborted.html
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl7/igt@runner@aborted.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_19239/shard-skl10/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#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1149]: https://gitlab.freedesktop.org/drm/intel/issues/1149
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1226]: https://gitlab.freedesktop.org/drm/intel/issues/1226
[i915#129]: https://gitlab.freedesktop.org/drm/intel/issues/129
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1610]: https://gitlab.freedesktop.org/drm/intel/issues/1610
[i915#177]: https://gitlab.freedesktop.org/drm/intel/issues/177
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2055]: https://gitlab.freedesktop.org/drm/intel/issues/2055
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2295]: https://gitlab.freedesktop.org/drm/intel/issues/2295
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2369]: https://gitlab.freedesktop.org/drm/intel/issues/2369
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2405]: https://gitlab.freedesktop.org/drm/intel/issues/2405
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2530]: https://gitlab.freedesktop.org/drm/intel/issues/2530
[i915#2598]: https://gitlab.freedesktop.org/drm/intel/issues/2598
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2724]: https://gitlab.freedesktop.org/drm/intel/issues/2724
[i915#2826]: https://gitlab.freedesktop.org/drm/intel/issues/2826
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#456]: https://gitlab.freedesktop.org/drm/intel/issues/456
[i915#483]: https://gitlab.freedesktop.org/drm/intel/issues/483
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_9537 -> Patchwork_19239
CI-20190529: 20190529
CI_DRM_9537: c232ca705490fdec5109dd0c9b8a413dc3de5ecb @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5934: a5c54153a82fe4cbd3b72cd85eb1b3eea91a1155 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_19239: 6a18ce0ea0e9a8f3f0fdd447c08bc71578a495d5 @ 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_19239/index.html
[-- Attachment #1.2: Type: text/html, Size: 24885 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] 4+ messages in thread
* [Intel-gfx] [CI] drm/i915: Populate logical context during first pin.
@ 2020-12-31 16:29 Chris Wilson
0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2020-12-31 16:29 UTC (permalink / raw)
To: intel-gfx
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
This allows us to remove pin_map from state allocation, which saves
us a few retry loops. We won't need this until first pin, anyway.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/gt/intel_context_types.h | 13 +++---
.../drm/i915/gt/intel_execlists_submission.c | 43 +------------------
drivers/gpu/drm/i915/gt/intel_lrc.c | 7 ++-
3 files changed, 15 insertions(+), 48 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_context_types.h b/drivers/gpu/drm/i915/gt/intel_context_types.h
index 430aafb78ed3..e10d78601bbd 100644
--- a/drivers/gpu/drm/i915/gt/intel_context_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_context_types.h
@@ -89,12 +89,13 @@ struct intel_context {
unsigned long flags;
#define CONTEXT_BARRIER_BIT 0
#define CONTEXT_ALLOC_BIT 1
-#define CONTEXT_VALID_BIT 2
-#define CONTEXT_CLOSED_BIT 3
-#define CONTEXT_USE_SEMAPHORES 4
-#define CONTEXT_BANNED 5
-#define CONTEXT_FORCE_SINGLE_SUBMISSION 6
-#define CONTEXT_NOPREEMPT 7
+#define CONTEXT_INIT_BIT 2
+#define CONTEXT_VALID_BIT 3
+#define CONTEXT_CLOSED_BIT 4
+#define CONTEXT_USE_SEMAPHORES 5
+#define CONTEXT_BANNED 6
+#define CONTEXT_FORCE_SINGLE_SUBMISSION 7
+#define CONTEXT_NOPREEMPT 8
u32 *lrc_reg_state;
union {
diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
index cb2491ec6d3f..2afbc0a4ca03 100644
--- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c
@@ -2500,48 +2500,9 @@ static int execlists_context_pin(struct intel_context *ce, void *vaddr)
return lrc_pin(ce, ce->engine, vaddr);
}
-static int __lrc_setup(struct intel_context *ce,
- struct intel_engine_cs *engine)
-{
- struct drm_i915_gem_object *obj = ce->state->obj;
- void *vaddr;
-
- vaddr = i915_gem_object_pin_map(obj, I915_MAP_WB);
- if (IS_ERR(vaddr)) {
- drm_dbg(&engine->i915->drm, "Could not map object pages!\n");
- return PTR_ERR(vaddr);
- }
-
- lrc_init_state(ce, engine, vaddr);
-
- __i915_gem_object_flush_map(obj, 0, engine->context_size);
- i915_gem_object_unpin_map(obj);
- return 0;
-}
-
-static int __execlists_context_alloc(struct intel_context *ce,
- struct intel_engine_cs *engine)
-{
- int err;
-
- err = lrc_alloc(ce, engine);
- if (err)
- return err;
-
- err = __lrc_setup(ce, engine);
- if (err)
- goto err_lrc;
-
- return 0;
-
-err_lrc:
- lrc_fini(ce);
- return err;
-}
-
static int execlists_context_alloc(struct intel_context *ce)
{
- return __execlists_context_alloc(ce, ce->engine);
+ return lrc_alloc(ce, ce->engine);
}
static const struct intel_context_ops execlists_context_ops = {
@@ -3414,7 +3375,7 @@ static int virtual_context_alloc(struct intel_context *ce)
{
struct virtual_engine *ve = container_of(ce, typeof(*ve), context);
- return __execlists_context_alloc(ce, ve->siblings[0]);
+ return lrc_alloc(ce, ve->siblings[0]);
}
static int virtual_context_pre_pin(struct intel_context *ce,
diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c
index 008f50a86355..11c38045798f 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -906,8 +906,13 @@ lrc_pre_pin(struct intel_context *ce,
*vaddr = i915_gem_object_pin_map(ce->state->obj,
i915_coherent_map_type(ce->engine->i915) |
I915_MAP_OVERRIDE);
+ if (IS_ERR(*vaddr))
+ return PTR_ERR(*vaddr);
- return PTR_ERR_OR_ZERO(*vaddr);
+ if (!__test_and_set_bit(CONTEXT_INIT_BIT, &ce->flags))
+ lrc_init_state(ce, engine, *vaddr);
+
+ return 0;
}
int
--
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] 4+ messages in thread
end of thread, other threads:[~2020-12-31 21:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-31 17:04 [Intel-gfx] [CI] drm/i915: Populate logical context during first pin Chris Wilson
2020-12-31 18:06 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Populate logical context during first pin. (rev2) Patchwork
2020-12-31 21:35 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2020-12-31 16:29 [Intel-gfx] [CI] drm/i915: Populate logical context during first pin Chris Wilson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).