Skip to content

Commit e6c1abb

Browse files
mthierrydanvet
authored andcommitted
drm/i915: Warn about missing context state workarounds only once
Otherwise, new platforms without workarounds will hit this warning for every new context created. Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Michel Thierry <michel.thierry@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
1 parent 2f82bbd commit e6c1abb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/gpu/drm/i915/intel_lrc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ static int intel_logical_ring_workarounds_emit(struct intel_engine_cs *ring,
10961096
struct drm_i915_private *dev_priv = dev->dev_private;
10971097
struct i915_workarounds *w = &dev_priv->workarounds;
10981098

1099-
if (WARN_ON(w->count == 0))
1099+
if (WARN_ON_ONCE(w->count == 0))
11001100
return 0;
11011101

11021102
ring->gpu_caches_dirty = true;

drivers/gpu/drm/i915/intel_ringbuffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ static int intel_ring_workarounds_emit(struct intel_engine_cs *ring,
679679
struct drm_i915_private *dev_priv = dev->dev_private;
680680
struct i915_workarounds *w = &dev_priv->workarounds;
681681

682-
if (WARN_ON(w->count == 0))
682+
if (WARN_ON_ONCE(w->count == 0))
683683
return 0;
684684

685685
ring->gpu_caches_dirty = true;

0 commit comments

Comments
 (0)