drm/i915: Make for_each_engine_masked work on intel_gt
PATCH 1/1 drm/i915: Make for_each_engine_masked work on intel_gt
From: Tvrtko Ursulin <[email protected]>
Medium term goal is to eliminate the i915->engine[] array and to get there we have recently introduced equivalent array in intel_gt. Now we need to migrate the code further towards this state.
This next step is to eliminate usage of i915->engines[] from the for_each_engine_masked iterator.
For this to work we also need to use engine->id as index when populating the gt->engine[] array and adjust the default engine set indexing to use engine->legacy_idx instead of assuming gt->engines[] indexing.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_engine_user.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- drivers/gpu/drm/i915/gt/intel_hangcheck.c | 2 +- drivers/gpu/drm/i915/gt/intel_reset.c | 12 ++++++------ drivers/gpu/drm/i915/gvt/execlist.c | 4 ++-- drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- drivers/gpu/drm/i915/i915_active.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +2 -2
@@ -209,8 +209,8 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx)return ERR_CAST (ce); } - e->engines[id] = ce; - e->num_engines = id +1 ; + e->engines[engine->legacy_idx] = ce; + e->num_engines = engine->legacy_idx +1 ; }return e;
drivers/gpu/drm/i915/gt/intel_engine_user.c +2 -2
@@ -183,8 +183,8 @@ static void add_legacy_ring(struct legacy_ring *ring,if (unlikely (idx ==-1 ))return ; -GEM_BUG_ON (idx >=ARRAY_SIZE (ring->gt->engine)); - ring->gt->engine[idx] = engine; +GEM_BUG_ON (engine->id >=ARRAY_SIZE (ring->gt->engine)); + ring->gt->engine[engine->id] = engine; ring->instance++; engine->legacy_idx = idx;
drivers/gpu/drm/i915/gt/intel_gt.c +1 -1
@@ -186,7 +186,7 @@ intel_gt_clear_error_registers(struct intel_gt *gt,struct intel_engine_cs *engine;enum intel_engine_id id; -for_each_engine_masked (engine, i915, engine_mask, id) +for_each_engine_masked (engine, gt, engine_mask, id)gen8_clear_engine_error_register (engine); } }
drivers/gpu/drm/i915/gt/intel_hangcheck.c +1 -1
@@ -237,7 +237,7 @@ static void hangcheck_declare_hang(struct intel_gt *gt, hung &= ~stuck; len =scnprintf (msg,sizeof (msg),"%s on " , stuck == hung ?"no progress" :"hang" ); -for_each_engine_masked (engine, gt->i915, hung, tmp) +for_each_engine_masked (engine, gt, hung, tmp) len +=scnprintf (msg + len,sizeof (msg) - len,"%s, " , engine->name); msg[len-2 ] ='\0' ;
drivers/gpu/drm/i915/gt/intel_reset.c +6 -6
@@ -298,7 +298,7 @@ static int gen6_reset_engines(struct intel_gt *gt,intel_engine_mask_t tmp; hw_mask =0 ; -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) { +for_each_engine_masked (engine, gt, engine_mask, tmp) {GEM_BUG_ON (engine->id >=ARRAY_SIZE (hw_engine_mask)); hw_mask |= hw_engine_mask[engine->id]; }
@@ -432,7 +432,7 @@ static int gen11_reset_engines(struct intel_gt *gt, hw_mask =GEN11_GRDOM_FULL ; }else { hw_mask =0 ; -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) { +for_each_engine_masked (engine, gt, engine_mask, tmp) {GEM_BUG_ON (engine->id >=ARRAY_SIZE (hw_engine_mask)); hw_mask |= hw_engine_mask[engine->id]; ret =gen11_lock_sfc (engine, &hw_mask);
@@ -451,7 +451,7 @@ static int gen11_reset_engines(struct intel_gt *gt,* expiration). */ if (engine_mask !=ALL_ENGINES ) -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) +for_each_engine_masked (engine, gt, engine_mask, tmp)gen11_unlock_sfc (engine);return ret;
@@ -510,7 +510,7 @@ static int gen8_reset_engines(struct intel_gt *gt,intel_engine_mask_t tmp;int ret; -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) { +for_each_engine_masked (engine, gt, engine_mask, tmp) { ret =gen8_engine_reset_prepare (engine);if (ret && !reset_non_ready) goto skip_reset;
@@ -536,7 +536,7 @@ static int gen8_reset_engines(struct intel_gt *gt, ret =gen6_reset_engines (gt, engine_mask, retry); skip_reset: -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) +for_each_engine_masked (engine, gt, engine_mask, tmp)gen8_engine_reset_cancel (engine);return ret;
@@ -1206,7 +1206,7 @@ void intel_gt_handle_error(struct intel_gt *gt,* single reset fails. */ if (intel_has_reset_engine (gt) && !intel_gt_is_wedged (gt)) { -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) { +for_each_engine_masked (engine, gt, engine_mask, tmp) {BUILD_BUG_ON (I915_RESET_MODESET >=I915_RESET_ENGINE );if (test_and_set_bit (I915_RESET_ENGINE + engine->id, >->reset.flags))
drivers/gpu/drm/i915/gvt/execlist.c +2 -2
@@ -534,7 +534,7 @@ static void clean_execlist(struct intel_vgpu *vgpu,struct intel_vgpu_submission *s = &vgpu->submission;intel_engine_mask_t tmp; -for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { +for_each_engine_masked (engine, &dev_priv->gt, engine_mask, tmp) {kfree (s->ring_scan_buffer[engine->id]); s->ring_scan_buffer[engine->id] =NULL ; s->ring_scan_buffer_size[engine->id] =0 ;
@@ -548,7 +548,7 @@ static void reset_execlist(struct intel_vgpu *vgpu,struct intel_engine_cs *engine;intel_engine_mask_t tmp; -for_each_engine_masked (engine, dev_priv, engine_mask, tmp) +for_each_engine_masked (engine, &dev_priv->gt, engine_mask, tmp)init_vgpu_execlist (vgpu, engine->id); }
drivers/gpu/drm/i915/gvt/scheduler.c +1 -1
@@ -887,7 +887,7 @@ void intel_vgpu_clean_workloads(struct intel_vgpu *vgpu,intel_engine_mask_t tmp;/* free the unsubmited workloads in the queues. */ -for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { +for_each_engine_masked (engine, &dev_priv->gt, engine_mask, tmp) {list_for_each_entry_safe (pos, n, &s->workload_q_head[engine->id], list) {list_del_init (&pos->list);
drivers/gpu/drm/i915/i915_active.c +2 -2
@@ -590,8 +590,8 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)int i915_active_acquire_preallocate_barrier (struct i915_active *ref,struct intel_engine_cs *engine) { -struct drm_i915_private *i915 = engine->i915;intel_engine_mask_t tmp, mask = engine->mask; +struct intel_gt *gt = engine->gt;struct llist_node *pos, *next;int err;
@@ -603,7 +603,7 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,* We can then use the preallocated nodes in * i915_active_acquire_barrier() */ -for_each_engine_masked (engine, i915, mask, tmp) { +for_each_engine_masked (engine, gt, mask, tmp) {u64 idx = engine->kernel_context->timeline->fence_context;struct active_node *node;
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -1420,10 +1420,10 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev)for_each_if ((engine__) = (dev_priv__)->engine[(id__)]) /* Iterator over subset of engines selected by mask */ -#define for_each_engine_masked (engine__, dev_priv__, mask__, tmp__) \ - for ((tmp__) = (mask__) & INTEL_INFO(dev_priv__)->engine_mask; \ +#define for_each_engine_masked (engine__, gt__, mask__, tmp__) \ + for ((tmp__) = (mask__) & INTEL_INFO((gt__)->i915)->engine_mask; \ (tmp__) ? \ - ((engine__) = (dev_priv__)->engine[__mask_next_bit(tmp__)]), 1 : \ + ((engine__) = (gt__)->engine[__mask_next_bit(tmp__)]), 1 : \ 0;)#define rb_to_uabi_engine (rb) \
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: Make for_each_engine_masked work on intel_gt
== Series Details ==
== Series Details ==
Series: drm/i915: Make for_each_engine_masked work on intel_gt
URL : https://patchwork.freedesktop.org/series/68111/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip df5679250335 drm/i915: Make for_each_engine_masked work on intel_gt -:202: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt__' - possible side-effects? #202: FILE: drivers/gpu/drm/i915/i915_drv.h:1423: +#define for_each_engine_masked(engine__, gt__, mask__, tmp__) \ + for ((tmp__) = (mask__) & INTEL_INFO((gt__)->i915)->engine_mask; \ (tmp__) ? \ + ((engine__) = (gt__)->engine[__mask_next_bit(tmp__)]), 1 : \ 0;)
-:202: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp__' - possible side-effects? #202: FILE: drivers/gpu/drm/i915/i915_drv.h:1423:
+#define for_each_engine_masked(engine__, gt__, mask__, tmp__) \
+ for ((tmp__) = (mask__) & INTEL_INFO((gt__)->i915)->engine_mask; \
(tmp__) ? \
+ ((engine__) = (gt__)->engine[__mask_next_bit(tmp__)]), 1 : \
0;)
total: 0 errors, 0 warnings, 2 checks, 138 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Make for_each_engine_masked work on intel_gt
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915: Make for_each_engine_masked work on intel_gt
URL : https://patchwork.freedesktop.org/series/68111/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7112 -> Patchwork_14841
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_14841 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_14841, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14841/index.html
Changes
-------
No changes found
Participating hosts (52 -> 5)
------------------------------
ERROR: It appears as if the changes made in Patchwork_14841 prevented too many machines from booting.
Missing (47): fi-kbl-soraka fi-skl-6770hq fi-bdw-gvtdvm fi-icl-u2 fi-skl-6260u fi-apl-guc fi-snb-2520m fi-icl-u3 fi-icl-y fi-skl-lmem fi-byt-n2820 fi-icl-dsi fi-icl-guc fi-skl-6600u fi-snb-2600 fi-hsw-4770r fi-cml-u2 fi-cml-u fi-bxt-dsi fi-bdw-5557u fi-tgl-u fi-icl-u4 fi-bsw-n3050 fi-tgl-u2 fi-byt-j1900 fi-cml-s fi-glk-dsi fi-kbl-7500u fi-hsw-4770 fi-ivb-3770 fi-kbl-r fi-ilk-m540 fi-skl-guc fi-cfl-8700k fi-hsw-4200u fi-hsw-peppy fi-byt-squawks fi-cfl-guc fi-kbl-guc fi-whl-u fi-kbl-x1275 fi-cfl-8109u fi-skl-iommu fi-kbl-8809g fi-bsw-kefka fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7112 -> Patchwork_14841
CI-20190529: 20190529
CI_DRM_7112: bb40330c82b49d8deb0040574139f7bc82857bf8 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5231: e293051f8f99c72cb01d21e4b73a5928ea351eb3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14841: df5679250335de268e12c13f8e535064322970fa @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
df5679250335 drm/i915: Make for_each_engine_masked work on intel_gt
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14841/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915: Make for_each_engine_masked work on intel_gt
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Medium term goal is to eliminate the i915->engine[] array and to get there we have recently introduced equivalent array in intel_gt. Now we need to migrate the code further towards this state.
This next step is to eliminate usage of i915->engines[] from the for_each_engine_masked iterator.
For this to work we also need to use engine->id as index when populating the gt->engine[] array and adjust the default engine set indexing to use engine->legacy_idx instead of assuming gt->engines[] indexing.
--- drivers/gpu/drm/i915/gem/i915_gem_context.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 ++++ drivers/gpu/drm/i915/gt/intel_engine_user.c | 5 +---- drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- drivers/gpu/drm/i915/gt/intel_hangcheck.c | 2 +- drivers/gpu/drm/i915/gt/intel_reset.c | 12 ++++++------ drivers/gpu/drm/i915/gvt/execlist.c | 4 ++-- drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- drivers/gpu/drm/i915/i915_active.c | 4 ++-- drivers/gpu/drm/i915/i915_drv.h | 6 +++--- 10 files changed, 23 insertions(+), 22 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_context.c +2 -2
@@ -209,8 +209,8 @@ static struct i915_gem_engines *default_engines(struct i915_gem_context *ctx)return ERR_CAST (ce); } - e->engines[id] = ce; - e->num_engines = id +1 ; + e->engines[engine->legacy_idx] = ce; + e->num_engines = engine->legacy_idx +1 ; }return e;
drivers/gpu/drm/i915/gt/intel_engine_cs.c +4 -0
@@ -277,6 +277,9 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)BUILD_BUG_ON (MAX_ENGINE_CLASS >=BIT (GEN11_ENGINE_CLASS_WIDTH ));BUILD_BUG_ON (MAX_ENGINE_INSTANCE >=BIT (GEN11_ENGINE_INSTANCE_WIDTH )); +if (GEM_DEBUG_WARN_ON (id >=ARRAY_SIZE (gt->engine))) +return -EINVAL ; +if (GEM_DEBUG_WARN_ON (info->class >MAX_ENGINE_CLASS ))return -EINVAL ;
@@ -328,6 +331,7 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)intel_engine_sanitize_mmio (engine); gt->engine_class[info->class][info->instance] = engine; + gt->engine[id] = engine;intel_engine_add_user (engine); gt->i915->engine[id] = engine;
drivers/gpu/drm/i915/gt/intel_engine_user.c +1 -4
@@ -183,11 +183,8 @@ static void add_legacy_ring(struct legacy_ring *ring,if (unlikely (idx ==-1 ))return ; -GEM_BUG_ON (idx >=ARRAY_SIZE (ring->gt->engine)); - ring->gt->engine[idx] = engine; - ring->instance++; - engine->legacy_idx = idx; + ring->instance++; }void intel_engines_driver_register (struct drm_i915_private *i915)
drivers/gpu/drm/i915/gt/intel_gt.c +1 -1
@@ -186,7 +186,7 @@ intel_gt_clear_error_registers(struct intel_gt *gt,struct intel_engine_cs *engine;enum intel_engine_id id; -for_each_engine_masked (engine, i915, engine_mask, id) +for_each_engine_masked (engine, gt, engine_mask, id)gen8_clear_engine_error_register (engine); } }
drivers/gpu/drm/i915/gt/intel_hangcheck.c +1 -1
@@ -237,7 +237,7 @@ static void hangcheck_declare_hang(struct intel_gt *gt, hung &= ~stuck; len =scnprintf (msg,sizeof (msg),"%s on " , stuck == hung ?"no progress" :"hang" ); -for_each_engine_masked (engine, gt->i915, hung, tmp) +for_each_engine_masked (engine, gt, hung, tmp) len +=scnprintf (msg + len,sizeof (msg) - len,"%s, " , engine->name); msg[len-2 ] ='\0' ;
drivers/gpu/drm/i915/gt/intel_reset.c +6 -6
@@ -298,7 +298,7 @@ static int gen6_reset_engines(struct intel_gt *gt,intel_engine_mask_t tmp; hw_mask =0 ; -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) { +for_each_engine_masked (engine, gt, engine_mask, tmp) {GEM_BUG_ON (engine->id >=ARRAY_SIZE (hw_engine_mask)); hw_mask |= hw_engine_mask[engine->id]; }
@@ -432,7 +432,7 @@ static int gen11_reset_engines(struct intel_gt *gt, hw_mask =GEN11_GRDOM_FULL ; }else { hw_mask =0 ; -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) { +for_each_engine_masked (engine, gt, engine_mask, tmp) {GEM_BUG_ON (engine->id >=ARRAY_SIZE (hw_engine_mask)); hw_mask |= hw_engine_mask[engine->id]; ret =gen11_lock_sfc (engine, &hw_mask);
@@ -451,7 +451,7 @@ static int gen11_reset_engines(struct intel_gt *gt,* expiration). */ if (engine_mask !=ALL_ENGINES ) -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) +for_each_engine_masked (engine, gt, engine_mask, tmp)gen11_unlock_sfc (engine);return ret;
@@ -510,7 +510,7 @@ static int gen8_reset_engines(struct intel_gt *gt,intel_engine_mask_t tmp;int ret; -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) { +for_each_engine_masked (engine, gt, engine_mask, tmp) { ret =gen8_engine_reset_prepare (engine);if (ret && !reset_non_ready) goto skip_reset;
@@ -536,7 +536,7 @@ static int gen8_reset_engines(struct intel_gt *gt, ret =gen6_reset_engines (gt, engine_mask, retry); skip_reset: -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) +for_each_engine_masked (engine, gt, engine_mask, tmp)gen8_engine_reset_cancel (engine);return ret;
@@ -1206,7 +1206,7 @@ void intel_gt_handle_error(struct intel_gt *gt,* single reset fails. */ if (intel_has_reset_engine (gt) && !intel_gt_is_wedged (gt)) { -for_each_engine_masked (engine, gt->i915, engine_mask, tmp) { +for_each_engine_masked (engine, gt, engine_mask, tmp) {BUILD_BUG_ON (I915_RESET_MODESET >=I915_RESET_ENGINE );if (test_and_set_bit (I915_RESET_ENGINE + engine->id, >->reset.flags))
drivers/gpu/drm/i915/gvt/execlist.c +2 -2
@@ -534,7 +534,7 @@ static void clean_execlist(struct intel_vgpu *vgpu,struct intel_vgpu_submission *s = &vgpu->submission;intel_engine_mask_t tmp; -for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { +for_each_engine_masked (engine, &dev_priv->gt, engine_mask, tmp) {kfree (s->ring_scan_buffer[engine->id]); s->ring_scan_buffer[engine->id] =NULL ; s->ring_scan_buffer_size[engine->id] =0 ;
@@ -548,7 +548,7 @@ static void reset_execlist(struct intel_vgpu *vgpu,struct intel_engine_cs *engine;intel_engine_mask_t tmp; -for_each_engine_masked (engine, dev_priv, engine_mask, tmp) +for_each_engine_masked (engine, &dev_priv->gt, engine_mask, tmp)init_vgpu_execlist (vgpu, engine->id); }
drivers/gpu/drm/i915/gvt/scheduler.c +1 -1
@@ -887,7 +887,7 @@ void intel_vgpu_clean_workloads(struct intel_vgpu *vgpu,intel_engine_mask_t tmp;/* free the unsubmited workloads in the queues. */ -for_each_engine_masked (engine, dev_priv, engine_mask, tmp) { +for_each_engine_masked (engine, &dev_priv->gt, engine_mask, tmp) {list_for_each_entry_safe (pos, n, &s->workload_q_head[engine->id], list) {list_del_init (&pos->list);
drivers/gpu/drm/i915/i915_active.c +2 -2
@@ -590,8 +590,8 @@ static struct active_node *reuse_idle_barrier(struct i915_active *ref, u64 idx)int i915_active_acquire_preallocate_barrier (struct i915_active *ref,struct intel_engine_cs *engine) { -struct drm_i915_private *i915 = engine->i915;intel_engine_mask_t tmp, mask = engine->mask; +struct intel_gt *gt = engine->gt;struct llist_node *pos, *next;int err;
@@ -603,7 +603,7 @@ int i915_active_acquire_preallocate_barrier(struct i915_active *ref,* We can then use the preallocated nodes in * i915_active_acquire_barrier() */ -for_each_engine_masked (engine, i915, mask, tmp) { +for_each_engine_masked (engine, gt, mask, tmp) {u64 idx = engine->kernel_context->timeline->fence_context;struct active_node *node;
drivers/gpu/drm/i915/i915_drv.h +3 -3
@@ -1415,10 +1415,10 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev)for_each_if ((engine__) = (dev_priv__)->engine[(id__)]) /* Iterator over subset of engines selected by mask */ -#define for_each_engine_masked (engine__, dev_priv__, mask__, tmp__) \ - for ((tmp__) = (mask__) & INTEL_INFO(dev_priv__)->engine_mask; \ +#define for_each_engine_masked (engine__, gt__, mask__, tmp__) \ + for ((tmp__) = (mask__) & INTEL_INFO((gt__)->i915)->engine_mask; \ (tmp__) ? \ - ((engine__) = (dev_priv__)->engine[__mask_next_bit(tmp__)]), 1 : \ + ((engine__) = (gt__)->engine[__mask_next_bit(tmp__)]), 1 : \ 0;)#define rb_to_uabi_engine (rb) \
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for drm/i915: Make for_each_engine_masked work on intel_gt (rev2)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915: Make for_each_engine_masked work on intel_gt (rev2)
URL : https://patchwork.freedesktop.org/series/68111/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 617c72e1ab51 drm/i915: Make for_each_engine_masked work on intel_gt -:226: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gt__' - possible side-effects? #226: FILE: drivers/gpu/drm/i915/i915_drv.h:1418: +#define for_each_engine_masked(engine__, gt__, mask__, tmp__) \ + for ((tmp__) = (mask__) & INTEL_INFO((gt__)->i915)->engine_mask; \ (tmp__) ? \ + ((engine__) = (gt__)->engine[__mask_next_bit(tmp__)]), 1 : \ 0;)
-:226: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'tmp__' - possible side-effects? #226: FILE: drivers/gpu/drm/i915/i915_drv.h:1418:
+#define for_each_engine_masked(engine__, gt__, mask__, tmp__) \
+ for ((tmp__) = (mask__) & INTEL_INFO((gt__)->i915)->engine_mask; \
(tmp__) ? \
+ ((engine__) = (gt__)->engine[__mask_next_bit(tmp__)]), 1 : \
0;)
total: 0 errors, 0 warnings, 2 checks, 156 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for drm/i915: Make for_each_engine_masked work on intel_gt (rev2)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915: Make for_each_engine_masked work on intel_gt (rev2)
URL : https://patchwork.freedesktop.org/series/68111/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7114 -> Patchwork_14849
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_14849 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_14849, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_14849:
### IGT changes ###
#### Possible regressions ####
* igt@i915_module_load@reload:
- fi-kbl-8809g: [PASS][1] -> [DMESG-WARN][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-kbl-8809g/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-kbl-8809g/igt@[email protected]
- fi-byt-j1900: [PASS][3] -> [DMESG-WARN][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-byt-j1900/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-byt-j1900/igt@[email protected]
- fi-kbl-r: [PASS][5] -> [DMESG-WARN][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-kbl-r/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-kbl-r/igt@[email protected]
- fi-whl-u: [PASS][7] -> [DMESG-WARN][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-whl-u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-whl-u/igt@[email protected]
- fi-skl-6600u: [PASS][9] -> [DMESG-WARN][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-skl-6600u/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-skl-6600u/igt@[email protected]
- fi-skl-iommu: [PASS][11] -> [DMESG-WARN][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-skl-iommu/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-skl-iommu/igt@[email protected]
- fi-hsw-4770r: [PASS][13] -> [DMESG-WARN][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-hsw-4770r/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-hsw-4770r/igt@[email protected]
- fi-elk-e7500: [PASS][15] -> [DMESG-WARN][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-elk-e7500/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-elk-e7500/igt@[email protected]
- fi-bsw-kefka: [PASS][17] -> [DMESG-WARN][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-bsw-kefka/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-bsw-kefka/igt@[email protected]
- fi-bdw-5557u: [PASS][19] -> [DMESG-WARN][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-bdw-5557u/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-bdw-5557u/igt@[email protected]
- fi-glk-dsi: [PASS][21] -> [DMESG-WARN][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-glk-dsi/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-glk-dsi/igt@[email protected]
- fi-skl-guc: [PASS][23] -> [DMESG-WARN][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-skl-guc/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-skl-guc/igt@[email protected]
- fi-kbl-guc: [PASS][25] -> [DMESG-WARN][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-kbl-guc/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-kbl-guc/igt@[email protected]
- fi-cfl-8109u: [PASS][27] -> [DMESG-WARN][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-cfl-8109u/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-cfl-8109u/igt@[email protected]
- fi-bdw-gvtdvm: NOTRUN -> [DMESG-WARN][29]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-bdw-gvtdvm/igt@[email protected]
- fi-kbl-7500u: [PASS][30] -> [DMESG-WARN][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-kbl-7500u/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-kbl-7500u/igt@[email protected]
- fi-cfl-8700k: [PASS][32] -> [DMESG-WARN][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-cfl-8700k/igt@[email protected]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-cfl-8700k/igt@[email protected]
- fi-snb-2520m: [PASS][34] -> [DMESG-WARN][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-snb-2520m/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-snb-2520m/igt@[email protected]
- fi-bxt-dsi: NOTRUN -> [DMESG-WARN][36]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-bxt-dsi/igt@[email protected]
- fi-hsw-4770: [PASS][37] -> [DMESG-WARN][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-hsw-4770/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-hsw-4770/igt@[email protected]
- fi-cfl-guc: [PASS][39] -> [DMESG-WARN][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-cfl-guc/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-cfl-guc/igt@[email protected]
- fi-skl-6770hq: [PASS][41] -> [DMESG-WARN][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-skl-6770hq/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-skl-6770hq/igt@[email protected]
- fi-bsw-n3050: [PASS][43] -> [DMESG-WARN][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-bsw-n3050/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-bsw-n3050/igt@[email protected]
- fi-ilk-650: [PASS][45] -> [DMESG-WARN][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-ilk-650/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-ilk-650/igt@[email protected]
- fi-ivb-3770: [PASS][47] -> [DMESG-WARN][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-ivb-3770/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-ivb-3770/igt@[email protected]
- fi-skl-lmem: [PASS][49] -> [DMESG-WARN][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-skl-lmem/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-skl-lmem/igt@[email protected]
- fi-hsw-peppy: [PASS][51] -> [DMESG-WARN][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-hsw-peppy/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-hsw-peppy/igt@[email protected]
- fi-skl-6260u: [PASS][53] -> [DMESG-WARN][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-skl-6260u/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-skl-6260u/igt@[email protected]
- fi-byt-n2820: [PASS][55] -> [DMESG-WARN][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-byt-n2820/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-byt-n2820/igt@[email protected]
- fi-icl-u3: [PASS][57] -> [DMESG-WARN][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-icl-u3/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-icl-u3/igt@[email protected]
- fi-kbl-x1275: [PASS][59] -> [DMESG-WARN][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-kbl-x1275/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-kbl-x1275/igt@[email protected]
- fi-snb-2600: [PASS][61] -> [DMESG-WARN][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-snb-2600/igt@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-snb-2600/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_module_load@reload:
- {fi-icl-dsi}: [PASS][63] -> [DMESG-WARN][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-icl-dsi/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-icl-dsi/igt@[email protected]
- {fi-tgl-u}: [PASS][65] -> [DMESG-WARN][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-tgl-u/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-tgl-u/igt@[email protected]
- {fi-tgl-u2}: [PASS][67] -> [DMESG-WARN][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-tgl-u2/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-tgl-u2/igt@[email protected]
- {fi-icl-guc}: [PASS][69] -> [DMESG-WARN][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-icl-guc/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-icl-guc/igt@[email protected]
- {fi-icl-u4}: [PASS][71] -> [DMESG-WARN][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-icl-u4/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-icl-u4/igt@[email protected]
- {fi-kbl-soraka}: [PASS][73] -> [DMESG-WARN][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-kbl-soraka/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-kbl-soraka/igt@[email protected]
- {fi-cml-s}: [PASS][75] -> [DMESG-WARN][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-cml-s/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-cml-s/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_14849 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_create@basic:
- fi-apl-guc: [PASS][77] -> [INCOMPLETE][78] ([fdo#103927])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-apl-guc/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-apl-guc/igt@[email protected]
* igt@gem_ctx_switch@legacy-render:
- fi-cml-u: [PASS][79] -> [INCOMPLETE][80] ([fdo#110566] / [fdo#111381])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-cml-u/igt@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-cml-u/igt@[email protected]
* igt@i915_pm_rps@basic-api:
- fi-icl-u3: [PASS][81] -> [DMESG-WARN][82] ([fdo#107724]) +1 similar issue
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-icl-u3/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-icl-u3/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_create@basic-files:
- fi-bdw-gvtdvm: [DMESG-WARN][83] -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-bdw-gvtdvm/igt@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-bdw-gvtdvm/igt@[email protected]
* igt@gem_flink_basic@double-flink:
- fi-icl-u3: [DMESG-WARN][85] ([fdo#107724]) -> [PASS][86] +2 similar issues
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-icl-u3/igt@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-icl-u3/igt@[email protected]
* igt@kms_busy@basic-flip-a:
- {fi-tgl-u2}: [DMESG-WARN][87] ([fdo#111600]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-tgl-u2/igt@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-tgl-u2/igt@[email protected]
* igt@kms_chamelium@hdmi-crc-fast:
- {fi-icl-u4}: [FAIL][89] ([fdo#111045]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-icl-u4/igt@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-icl-u4/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][91] ([fdo#111407]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-kbl-7500u/igt@[email protected]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-kbl-7500u/igt@[email protected]
#### Warnings ####
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-icl-u2: [DMESG-WARN][93] ([fdo#102505] / [fdo#110390]) -> [FAIL][94] ([fdo#109483])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-icl-u2/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-icl-u2/igt@[email protected]
* igt@runner@aborted:
- fi-bdw-gvtdvm: [FAIL][95] ([fdo#111917]) -> [FAIL][96] ([k.org#204565])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7114/fi-bdw-gvtdvm/igt@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/fi-bdw-gvtdvm/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102505]: https://bugs.freedesktop.org/show_bug.cgi?id=102505
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#106107]: https://bugs.freedesktop.org/show_bug.cgi?id=106107
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
[fdo#110390]: https://bugs.freedesktop.org/show_bug.cgi?id=110390
[fdo#110566]: https://bugs.freedesktop.org/show_bug.cgi?id=110566
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111381]: https://bugs.freedesktop.org/show_bug.cgi?id=111381
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[fdo#111600]: https://bugs.freedesktop.org/show_bug.cgi?id=111600
[fdo#111917]: https://bugs.freedesktop.org/show_bug.cgi?id=111917
[k.org#204565]: https://bugzilla.kernel.org/show_bug.cgi?id=204565
Participating hosts (52 -> 46)
------------------------------
Missing (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7114 -> Patchwork_14849
CI-20190529: 20190529
CI_DRM_7114: d9e909272a022597067d3ac2dfcedacd63c61af9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5231: e293051f8f99c72cb01d21e4b73a5928ea351eb3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14849: 617c72e1ab5131ca991600de1026f7f1c518d027 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
617c72e1ab51 drm/i915: Make for_each_engine_masked work on intel_gt
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14849/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx