All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Move w/a LRI debug message from context-init to driver load
@ 2017-03-01 12:11 Chris Wilson
  2017-03-01 13:18 ` ✗ Fi.CI.BAT: warning for " Patchwork
  2017-03-01 19:23 ` [PATCH] " Tvrtko Ursulin
  0 siblings, 2 replies; 4+ messages in thread
From: Chris Wilson @ 2017-03-01 12:11 UTC (permalink / raw)
  To: intel-gfx

The spam of every context initialisation saying the same thing is annoying
me! Move the information to the setup of the engine.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/intel_engine_cs.c | 38 +++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
index c4d4698f98e7..c58339b22f6a 100644
--- a/drivers/gpu/drm/i915/intel_engine_cs.c
+++ b/drivers/gpu/drm/i915/intel_engine_cs.c
@@ -1009,30 +1009,32 @@ static int glk_init_workarounds(struct intel_engine_cs *engine)
 int init_workarounds_ring(struct intel_engine_cs *engine)
 {
 	struct drm_i915_private *dev_priv = engine->i915;
+	int err;
 
 	WARN_ON(engine->id != RCS);
 
 	dev_priv->workarounds.count = 0;
-	dev_priv->workarounds.hw_whitelist_count[RCS] = 0;
+	dev_priv->workarounds.hw_whitelist_count[engine->id] = 0;
 
 	if (IS_BROADWELL(dev_priv))
-		return bdw_init_workarounds(engine);
-
-	if (IS_CHERRYVIEW(dev_priv))
-		return chv_init_workarounds(engine);
-
-	if (IS_SKYLAKE(dev_priv))
-		return skl_init_workarounds(engine);
-
-	if (IS_BROXTON(dev_priv))
-		return bxt_init_workarounds(engine);
-
-	if (IS_KABYLAKE(dev_priv))
-		return kbl_init_workarounds(engine);
-
-	if (IS_GEMINILAKE(dev_priv))
-		return glk_init_workarounds(engine);
+		err = bdw_init_workarounds(engine);
+	else if (IS_CHERRYVIEW(dev_priv))
+		err = chv_init_workarounds(engine);
+	else if (IS_SKYLAKE(dev_priv))
+		err =  skl_init_workarounds(engine);
+	else if (IS_BROXTON(dev_priv))
+		err = bxt_init_workarounds(engine);
+	else if (IS_KABYLAKE(dev_priv))
+		err = kbl_init_workarounds(engine);
+	else if (IS_GEMINILAKE(dev_priv))
+		err =  glk_init_workarounds(engine);
+	else
+		err = 0;
+	if (err)
+		return err;
 
+	DRM_DEBUG_DRIVER("%s: Number of context specific w/a: %d\n",
+			 engine->name, dev_priv->workarounds.count);
 	return 0;
 }
 
@@ -1066,8 +1068,6 @@ int intel_ring_workarounds_emit(struct drm_i915_gem_request *req)
 	if (ret)
 		return ret;
 
-	DRM_DEBUG_DRIVER("Number of Workarounds emitted: %d\n", w->count);
-
 	return 0;
 }
 
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* ✗ Fi.CI.BAT: warning for drm/i915: Move w/a LRI debug message from context-init to driver load
  2017-03-01 12:11 [PATCH] drm/i915: Move w/a LRI debug message from context-init to driver load Chris Wilson
@ 2017-03-01 13:18 ` Patchwork
  2017-03-01 19:23 ` [PATCH] " Tvrtko Ursulin
  1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2017-03-01 13:18 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx

== Series Details ==

Series: drm/i915: Move w/a LRI debug message from context-init to driver load
URL   : https://patchwork.freedesktop.org/series/20452/
State : warning

== Summary ==

Series 20452v1 drm/i915: Move w/a LRI debug message from context-init to driver load
https://patchwork.freedesktop.org/api/1.0/series/20452/revisions/1/mbox/

Test gem_exec_fence:
        Subgroup await-hang-default:
                incomplete -> PASS       (fi-hsw-4770) fdo#99726
Test gem_exec_suspend:
        Subgroup basic-s4-devices:
                pass       -> DMESG-WARN (fi-bxt-t5700)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:
                dmesg-warn -> PASS       (fi-bsw-n3050)

fdo#99726 https://bugs.freedesktop.org/show_bug.cgi?id=99726

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11 
fi-bsw-n3050     total:278  pass:239  dwarn:0   dfail:0   fail:0   skip:39 
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19 
fi-bxt-t5700     total:278  pass:257  dwarn:1   dfail:0   fail:0   skip:20 
fi-byt-j1900     total:278  pass:251  dwarn:0   dfail:0   fail:0   skip:27 
fi-byt-n2820     total:278  pass:247  dwarn:0   dfail:0   fail:0   skip:31 
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16 
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16 
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50 
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18 
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18 
fi-kbl-7500u     total:278  pass:259  dwarn:1   dfail:0   fail:0   skip:18 
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10 
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17 
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18 
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10 
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28 
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29 

73ef819d4281caf11663007299032aee4a388ad6 drm-tip: 2017y-03m-01d-11h-16m-44s UTC integration manifest
c41c63a drm/i915: Move w/a LRI debug message from context-init to driver load

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4014/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Move w/a LRI debug message from context-init to driver load
  2017-03-01 12:11 [PATCH] drm/i915: Move w/a LRI debug message from context-init to driver load Chris Wilson
  2017-03-01 13:18 ` ✗ Fi.CI.BAT: warning for " Patchwork
@ 2017-03-01 19:23 ` Tvrtko Ursulin
  2017-03-01 20:34   ` Chris Wilson
  1 sibling, 1 reply; 4+ messages in thread
From: Tvrtko Ursulin @ 2017-03-01 19:23 UTC (permalink / raw)
  To: Chris Wilson, intel-gfx


On 01/03/2017 12:11, Chris Wilson wrote:
> The spam of every context initialisation saying the same thing is annoying
> me! Move the information to the setup of the engine.

Yes I've noticed this ugly side effect of code consolidation. :)

> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_engine_cs.c | 38 +++++++++++++++++-----------------
>  1 file changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_engine_cs.c b/drivers/gpu/drm/i915/intel_engine_cs.c
> index c4d4698f98e7..c58339b22f6a 100644
> --- a/drivers/gpu/drm/i915/intel_engine_cs.c
> +++ b/drivers/gpu/drm/i915/intel_engine_cs.c
> @@ -1009,30 +1009,32 @@ static int glk_init_workarounds(struct intel_engine_cs *engine)
>  int init_workarounds_ring(struct intel_engine_cs *engine)
>  {
>  	struct drm_i915_private *dev_priv = engine->i915;
> +	int err;
>
>  	WARN_ON(engine->id != RCS);
>
>  	dev_priv->workarounds.count = 0;
> -	dev_priv->workarounds.hw_whitelist_count[RCS] = 0;
> +	dev_priv->workarounds.hw_whitelist_count[engine->id] = 0;
>
>  	if (IS_BROADWELL(dev_priv))
> -		return bdw_init_workarounds(engine);
> -
> -	if (IS_CHERRYVIEW(dev_priv))
> -		return chv_init_workarounds(engine);
> -
> -	if (IS_SKYLAKE(dev_priv))
> -		return skl_init_workarounds(engine);
> -
> -	if (IS_BROXTON(dev_priv))
> -		return bxt_init_workarounds(engine);
> -
> -	if (IS_KABYLAKE(dev_priv))
> -		return kbl_init_workarounds(engine);
> -
> -	if (IS_GEMINILAKE(dev_priv))
> -		return glk_init_workarounds(engine);
> +		err = bdw_init_workarounds(engine);
> +	else if (IS_CHERRYVIEW(dev_priv))
> +		err = chv_init_workarounds(engine);
> +	else if (IS_SKYLAKE(dev_priv))
> +		err =  skl_init_workarounds(engine);
> +	else if (IS_BROXTON(dev_priv))
> +		err = bxt_init_workarounds(engine);
> +	else if (IS_KABYLAKE(dev_priv))
> +		err = kbl_init_workarounds(engine);
> +	else if (IS_GEMINILAKE(dev_priv))
> +		err =  glk_init_workarounds(engine);
> +	else
> +		err = 0;
> +	if (err)
> +		return err;
>
> +	DRM_DEBUG_DRIVER("%s: Number of context specific w/a: %d\n",
> +			 engine->name, dev_priv->workarounds.count);
>  	return 0;
>  }
>
> @@ -1066,8 +1068,6 @@ int intel_ring_workarounds_emit(struct drm_i915_gem_request *req)
>  	if (ret)
>  		return ret;
>
> -	DRM_DEBUG_DRIVER("Number of Workarounds emitted: %d\n", w->count);
> -
>  	return 0;
>  }
>
>

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

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Move w/a LRI debug message from context-init to driver load
  2017-03-01 19:23 ` [PATCH] " Tvrtko Ursulin
@ 2017-03-01 20:34   ` Chris Wilson
  0 siblings, 0 replies; 4+ messages in thread
From: Chris Wilson @ 2017-03-01 20:34 UTC (permalink / raw)
  To: Tvrtko Ursulin; +Cc: intel-gfx

On Wed, Mar 01, 2017 at 07:23:36PM +0000, Tvrtko Ursulin wrote:
> 
> On 01/03/2017 12:11, Chris Wilson wrote:
> >The spam of every context initialisation saying the same thing is annoying
> >me! Move the information to the setup of the engine.
> 
> Yes I've noticed this ugly side effect of code consolidation. :)
> 
> >Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
[snip]
> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Thanks, now to hope nothing emerges from noise...
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-03-01 20:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-01 12:11 [PATCH] drm/i915: Move w/a LRI debug message from context-init to driver load Chris Wilson
2017-03-01 13:18 ` ✗ Fi.CI.BAT: warning for " Patchwork
2017-03-01 19:23 ` [PATCH] " Tvrtko Ursulin
2017-03-01 20:34   ` Chris Wilson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.