drm/i915: Warn about missing context state workarounds only once
Subsystems (2)
PATCH 1/1 drm/i915: Warn about missing context state workarounds only once
Otherwise, new platforms without workarounds will hit this warning for every new context created.
--- drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +1 -1
@@ -1164,7 +1164,7 @@ static int intel_logical_ring_workarounds_emit(struct intel_engine_cs *ring,struct drm_i915_private *dev_priv = dev->dev_private;struct i915_workarounds *w = &dev_priv->workarounds; -if (WARN_ON (w->count ==0 )) +if (WARN_ON_ONCE (w->count ==0 ))return 0 ; ring->gpu_caches_dirty = true;
drivers/gpu/drm/i915/intel_ringbuffer.c +1 -1
@@ -669,7 +669,7 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring,struct drm_i915_private *dev_priv = dev->dev_private;struct i915_workarounds *w = &dev_priv->workarounds; -if (WARN_ON (w->count ==0 )) +if (WARN_ON_ONCE (w->count ==0 ))return 0 ; ring->gpu_caches_dirty = true;
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915: Warn about missing context state
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 366/366 366/366
ILK -9 371/371 362/371
SNB 450/450 450/450
IVB -1 498/498 497/498
BYT 289/289 289/289 HSW 564/564 564/564 BDW 417/417 417/417 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied ILK igt_gem_reset_stats_close-pending-fork-render TIMEOUT(25, M37M26)PASS(1, M26) TIMEOUT(1, M26) ILK igt_kms_flip_flip-vs-dpms-off-vs-modeset DMESG_WARN(2, M26)PASS(4, M37M26) DMESG_WARN(1, M26) ILK igt_kms_flip_rcs-flip-vs-panning-interruptible DMESG_WARN(2, M26)PASS(3, M37M26) DMESG_WARN(1, M26) ILK igt_kms_flip_rcs-wf_vblank-vs-modeset DMESG_WARN(2, M26)PASS(5, M37M26) DMESG_WARN(1, M26) *ILK igt_kms_flip_flip-vs-dpms-interruptible PASS(5, M37M26) DMESG_WARN(1, M26) ILK igt_kms_flip_flip-vs-panning DMESG_WARN(1, M26)PASS(2, M37M26) DMESG_WARN(1, M26) ILK igt_kms_flip_plain-flip DMESG_WARN(2, M26)PASS(5, M37M26) DMESG_WARN(1, M26) ILK igt_kms_flip_plain-flip-ts-check-interruptible DMESG_WARN(1, M26)PASS(2, M37M26) DMESG_WARN(1, M26) ILK igt_kms_flip_vblank-vs-hang NSPT(1, M26)TIMEOUT(23, M37M26)PASS(1, M26) TIMEOUT(1, M26) *IVB igt_kms_cursor_crc_cursor-64x64-offscreen PASS(3, M21) DMESG_WARN(1, M21)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Backtraces make me jump and this one is very noisy, please merge. :)
Quoted 29 lines · Michel Thierry
Otherwise, new platforms without workarounds will hit this warning for every new context created.
Cc Tvrtko Ursulin <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +1
-1@@ -1164,7 +1164,7 @@ static int intel_logical_ring_workarounds_emit(struct intel_engine_cs *ring,struct drm_i915_private *dev_priv = dev->dev_private;struct i915_workarounds *w = &dev_priv->workarounds; -if (WARN_ON (w->count ==0 )) +if (WARN_ON_ONCE (w->count ==0 ))return 0 ; ring->gpu_caches_dirty = true;drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0
drivers/gpu/drm/i915/intel_ringbuffer.c static int intel_ring_workarounds_emit(struct intel_engine_cs *ring, · line 675
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +1
-1@@ -669,7 +669,7 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring,struct drm_i915_private *dev_priv = dev->dev_private;struct i915_workarounds *w = &dev_priv->workarounds; -if (WARN_ON (w->count ==0 )) +if (WARN_ON_ONCE (w->count ==0 ))return 0 ; ring->gpu_caches_dirty = true;
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 2 lines · Tvrtko Ursulin
Backtraces make me jump and this one is very noisy, please merge. :)
It's kinda the point ;-)
Quoted 1 line
Reviewed-by Tvrtko Ursulin <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Quoted 43 lines · Michel Thierry
Quoted 29 lines
Otherwise, new platforms without workarounds will hit this warning for every new context created.
Cc Tvrtko Ursulin <[email protected]>Signed-off-by Michel Thierry <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 2 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/intel_lrc.c +1
-1@@ -1164,7 +1164,7 @@ static int intel_logical_ring_workarounds_emit(struct intel_engine_cs *ring,struct drm_i915_private *dev_priv = dev->dev_private;struct i915_workarounds *w = &dev_priv->workarounds; -if (WARN_ON (w->count ==0 )) +if (WARN_ON_ONCE (w->count ==0 ))return 0 ; ring->gpu_caches_dirty = true;drivers/gpu/drm/i915/intel_ringbuffer.c +0
-0drivers/gpu/drm/i915/intel_ringbuffer.c static int intel_ring_workarounds_emit(struct intel_engine_cs *ring, · line 675
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +1
-1@@ -669,7 +669,7 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring,struct drm_i915_private *dev_priv = dev->dev_private;struct i915_workarounds *w = &dev_priv->workarounds; -if (WARN_ON (w->count ==0 )) +if (WARN_ON_ONCE (w->count ==0 ))return 0 ; ring->gpu_caches_dirty = true;_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx