| Message ID | 20210816171444.105469-1-thomas.hellstrom@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/i915: Ditch the i915_gem_ww_ctx loop member | expand |
On Mon, 16 Aug 2021 at 18:14, Thomas Hellström <thomas.hellstrom@linux.intel.com> wrote: > > It's only used by the for_i915_gem_ww() macro and we can use > the (typically) on-stack _err variable in its place. > > v2: > - Don't clear the _err variable when entering the loop > (Matthew Auld, Maarten Lankhorst). > - Use parentheses around the _err macro argument. > - Fix up comment. > > Cc: Matthew Auld <matthew.william.auld@gmail.com> > Suggested-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
On Tue, 17 Aug 2021 at 18:28, Patchwork <patchwork@emeril.freedesktop.org> wrote: > > Patch Details > Series:drm/i915: Ditch the i915_gem_ww_ctx loop member (rev2) > URL:https://patchwork.freedesktop.org/series/93711/ > State:failure > Details:https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20834/index.html > > CI Bug Log - changes from CI_DRM_10490_full -> Patchwork_20834_full > > Summary > > FAILURE > > Serious unknown changes coming with Patchwork_20834_full absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_20834_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_20834_full: > > IGT changes > > Possible regressions > > igt@kms_atomic_transition@plane-toggle-modeset-transition: > > shard-tglb: PASS -> INCOMPLETE Lakshmi, this failure is unrelated.
Re-reported. Bug filed for the regression. #4009 igt@kms_atomic_transition@plane-toggle-modeset-transition - incomplete - No warnings/errors Lakshmi. -----Original Message----- From: Matthew Auld <matthew.william.auld@gmail.com> Sent: Thursday, August 19, 2021 6:40 AM To: Intel Graphics Development <intel-gfx@lists.freedesktop.org> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>; Vudum, Lakshminarayana <lakshminarayana.vudum@intel.com> Subject: Re: [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: Ditch the i915_gem_ww_ctx loop member (rev2) On Tue, 17 Aug 2021 at 18:28, Patchwork <patchwork@emeril.freedesktop.org> wrote: > > Patch Details > Series:drm/i915: Ditch the i915_gem_ww_ctx loop member (rev2) > URL:https://patchwork.freedesktop.org/series/93711/ > State:failure > Details:https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20834/index > .html > > CI Bug Log - changes from CI_DRM_10490_full -> Patchwork_20834_full > > Summary > > FAILURE > > Serious unknown changes coming with Patchwork_20834_full absolutely > need to be verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_20834_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_20834_full: > > IGT changes > > Possible regressions > > igt@kms_atomic_transition@plane-toggle-modeset-transition: > > shard-tglb: PASS -> INCOMPLETE Lakshmi, this failure is unrelated.
diff --git a/drivers/gpu/drm/i915/i915_gem_ww.h b/drivers/gpu/drm/i915/i915_gem_ww.h index f6b1a796667b..86f0fe343de6 100644 --- a/drivers/gpu/drm/i915/i915_gem_ww.h +++ b/drivers/gpu/drm/i915/i915_gem_ww.h @@ -11,8 +11,7 @@ struct i915_gem_ww_ctx { struct ww_acquire_ctx ctx; struct list_head obj_list; struct drm_i915_gem_object *contended; - unsigned short intr; - unsigned short loop; + bool intr; }; void i915_gem_ww_ctx_init(struct i915_gem_ww_ctx *ctx, bool intr); @@ -20,31 +19,23 @@ void i915_gem_ww_ctx_fini(struct i915_gem_ww_ctx *ctx); int __must_check i915_gem_ww_ctx_backoff(struct i915_gem_ww_ctx *ctx); void i915_gem_ww_unlock_single(struct drm_i915_gem_object *obj); -/* Internal functions used by the inlines! Don't use. */ +/* Internal function used by the inlines! Don't use. */ static inline int __i915_gem_ww_fini(struct i915_gem_ww_ctx *ww, int err) { - ww->loop = 0; if (err == -EDEADLK) { err = i915_gem_ww_ctx_backoff(ww); if (!err) - ww->loop = 1; + err = -EDEADLK; } - if (!ww->loop) + if (err != -EDEADLK) i915_gem_ww_ctx_fini(ww); return err; } -static inline void -__i915_gem_ww_init(struct i915_gem_ww_ctx *ww, bool intr) -{ - i915_gem_ww_ctx_init(ww, intr); - ww->loop = 1; -} - -#define for_i915_gem_ww(_ww, _err, _intr) \ - for (__i915_gem_ww_init(_ww, _intr); (_ww)->loop; \ - _err = __i915_gem_ww_fini(_ww, _err)) - +#define for_i915_gem_ww(_ww, _err, _intr) \ + for (i915_gem_ww_ctx_init(_ww, _intr), (_err) = -EDEADLK; \ + (_err) == -EDEADLK; \ + (_err) = __i915_gem_ww_fini(_ww, _err)) #endif
It's only used by the for_i915_gem_ww() macro and we can use the (typically) on-stack _err variable in its place. v2: - Don't clear the _err variable when entering the loop (Matthew Auld, Maarten Lankhorst). - Use parentheses around the _err macro argument. - Fix up comment. Cc: Matthew Auld <matthew.william.auld@gmail.com> Suggested-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/gpu/drm/i915/i915_gem_ww.h | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-)