diff mbox

drm/i915: Warn about missing context state workarounds only once

Message ID 1417011662-14786-1-git-send-email-michel.thierry@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Michel Thierry Nov. 26, 2014, 2:21 p.m. UTC 
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>
---
 drivers/gpu/drm/i915/intel_lrc.c        | 2 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Shuang He Nov. 26, 2014, 11:07 p.m. UTC | #1 
Tested-By: PRC QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
-------------------------------------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 '*'
Tvrtko Ursulin Dec. 15, 2014, 3:40 p.m. UTC | #2 
Backtraces make me jump and this one is very noisy, please merge. :)

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

On 11/26/2014 02:21 PM, Michel Thierry wrote:
> 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>
> ---
>   drivers/gpu/drm/i915/intel_lrc.c        | 2 +-
>   drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> index 4d41f5a..4111cdd 100644
> --- a/drivers/gpu/drm/i915/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/intel_lrc.c
> @@ -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;
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> index 1d01b51..104edf6 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -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;
>
Daniel Vetter Dec. 15, 2014, 3:54 p.m. UTC | #3 
On Mon, Dec 15, 2014 at 03:40:11PM +0000, Tvrtko Ursulin wrote:
> 
> Backtraces make me jump and this one is very noisy, please merge. :)

It's kinda the point ;-)

> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Queued for -next, thanks for the patch.
-Daniel
> 
> On 11/26/2014 02:21 PM, Michel Thierry wrote:
> >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>
> >---
> >  drivers/gpu/drm/i915/intel_lrc.c        | 2 +-
> >  drivers/gpu/drm/i915/intel_ringbuffer.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> >diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
> >index 4d41f5a..4111cdd 100644
> >--- a/drivers/gpu/drm/i915/intel_lrc.c
> >+++ b/drivers/gpu/drm/i915/intel_lrc.c
> >@@ -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;
> >diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
> >index 1d01b51..104edf6 100644
> >--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> >+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> >@@ -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
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 4d41f5a..4111cdd 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -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;
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 1d01b51..104edf6 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -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;