* [PATCH 2/2] drm/i915: GuC test run
2018-02-21 17:25 [PATCH 1/2] drm/i915/guc: Support engine busy stats Tvrtko Ursulin
@ 2018-02-21 17:25 ` Tvrtko Ursulin
2018-02-21 17:41 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/guc: Support engine busy stats Patchwork
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tvrtko Ursulin @ 2018-02-21 17:25 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
With disabled aggressive idling from IGT. To see how shard run fares.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 3 ---
drivers/gpu/drm/i915/i915_params.h | 2 +-
drivers/gpu/drm/i915/intel_uc.c | 2 ++
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 05b41045b8f9..61da6569ad6c 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -4076,9 +4076,6 @@ i915_drop_caches_set(void *data, u64 val)
i915_gem_shrink_all(dev_priv);
fs_reclaim_release(GFP_KERNEL);
- if (val & DROP_IDLE)
- drain_delayed_work(&dev_priv->gt.idle_work);
-
if (val & DROP_FREED)
i915_gem_drain_freed_objects(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 430f5f9d0ff4..3deae1e22974 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -47,7 +47,7 @@ struct drm_printer;
param(int, disable_power_well, -1) \
param(int, enable_ips, 1) \
param(int, invert_brightness, 0) \
- param(int, enable_guc, 0) \
+ param(int, enable_guc, -1) \
param(int, guc_log_level, 0) \
param(char *, guc_firmware_path, NULL) \
param(char *, huc_firmware_path, NULL) \
diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 9f1bac6398fb..b48056fb769d 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -63,6 +63,8 @@ static int __get_platform_enable_guc(struct drm_i915_private *dev_priv)
enable_guc |= ENABLE_GUC_LOAD_HUC;
/* Any platform specific fine-tuning can be done here */
+ if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
+ enable_guc = 0;
return enable_guc;
}
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread* ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/guc: Support engine busy stats
2018-02-21 17:25 [PATCH 1/2] drm/i915/guc: Support engine busy stats Tvrtko Ursulin
2018-02-21 17:25 ` [PATCH 2/2] drm/i915: GuC test run Tvrtko Ursulin
@ 2018-02-21 17:41 ` Patchwork
2018-02-21 17:56 ` ✗ Fi.CI.BAT: failure " Patchwork
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2018-02-21 17:41 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Support engine busy stats
URL : https://patchwork.freedesktop.org/series/38717/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
661f5ef77993 drm/i915/guc: Support engine busy stats
-:33: WARNING: line over 80 characters
#33: FILE: drivers/gpu/drm/i915/intel_guc_submission.c:727:
+ intel_engine_context_in(last->engine);
total: 0 errors, 1 warnings, 0 checks, 44 lines checked
2acf999e7adf drm/i915: GuC test run
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread* ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/guc: Support engine busy stats
2018-02-21 17:25 [PATCH 1/2] drm/i915/guc: Support engine busy stats Tvrtko Ursulin
2018-02-21 17:25 ` [PATCH 2/2] drm/i915: GuC test run Tvrtko Ursulin
2018-02-21 17:41 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/guc: Support engine busy stats Patchwork
@ 2018-02-21 17:56 ` Patchwork
2018-02-21 19:17 ` ✗ Fi.CI.CHECKPATCH: warning " Patchwork
` (5 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2018-02-21 17:56 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Support engine busy stats
URL : https://patchwork.freedesktop.org/series/38717/
State : failure
== Summary ==
Series 38717v1 series starting with [1/2] drm/i915/guc: Support engine busy stats
https://patchwork.freedesktop.org/api/1.0/series/38717/revisions/1/mbox/
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
pass -> FAIL (fi-gdg-551) fdo#102575
Test kms_chamelium:
Subgroup dp-edid-read:
pass -> FAIL (fi-kbl-7500u) fdo#102505
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (fi-skl-6770hq)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
fail -> PASS (fi-ivb-3520m)
Subgroup suspend-read-crc-pipe-b:
incomplete -> PASS (fi-snb-2520m) fdo#103713
fail -> PASS (fi-ivb-3520m)
Subgroup suspend-read-crc-pipe-c:
fail -> PASS (fi-ivb-3520m)
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#102505 https://bugs.freedesktop.org/show_bug.cgi?id=102505
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:418s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:429s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:372s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:488s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:285s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:480s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:486s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:469s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:458s
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:561s
fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:414s
fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:286s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:506s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:383s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:410s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:451s
fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:413s
fi-kbl-7500u total:288 pass:262 dwarn:1 dfail:0 fail:1 skip:24 time:447s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:487s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:452s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:494s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:592s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:431s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:498s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:515s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:492s
fi-skl-6770hq total:288 pass:267 dwarn:0 dfail:0 fail:1 skip:20 time:483s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:405s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:436s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:521s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:392s
42d073db2a8593a8d1832037ffe0988403031568 drm-tip: 2018y-02m-21d-14h-03m-58s UTC integration manifest
2acf999e7adf drm/i915: GuC test run
661f5ef77993 drm/i915/guc: Support engine busy stats
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8110/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread* ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/guc: Support engine busy stats
2018-02-21 17:25 [PATCH 1/2] drm/i915/guc: Support engine busy stats Tvrtko Ursulin
` (2 preceding siblings ...)
2018-02-21 17:56 ` ✗ Fi.CI.BAT: failure " Patchwork
@ 2018-02-21 19:17 ` Patchwork
2018-02-21 19:31 ` ✗ Fi.CI.BAT: failure " Patchwork
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2018-02-21 19:17 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Support engine busy stats
URL : https://patchwork.freedesktop.org/series/38717/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
dc87ce86e08d drm/i915/guc: Support engine busy stats
-:33: WARNING: line over 80 characters
#33: FILE: drivers/gpu/drm/i915/intel_guc_submission.c:727:
+ intel_engine_context_in(last->engine);
total: 0 errors, 1 warnings, 0 checks, 44 lines checked
bb48a00cb0a5 drm/i915: GuC test run
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread* ✗ Fi.CI.BAT: failure for series starting with [1/2] drm/i915/guc: Support engine busy stats
2018-02-21 17:25 [PATCH 1/2] drm/i915/guc: Support engine busy stats Tvrtko Ursulin
` (3 preceding siblings ...)
2018-02-21 19:17 ` ✗ Fi.CI.CHECKPATCH: warning " Patchwork
@ 2018-02-21 19:31 ` Patchwork
2018-02-22 6:07 ` [PATCH 1/2] " Tvrtko Ursulin
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2018-02-21 19:31 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Support engine busy stats
URL : https://patchwork.freedesktop.org/series/38717/
State : failure
== Summary ==
Series 38717v1 series starting with [1/2] drm/i915/guc: Support engine busy stats
https://patchwork.freedesktop.org/api/1.0/series/38717/revisions/1/mbox/
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
fail -> PASS (fi-gdg-551) fdo#102575
Test drv_module_reload:
Subgroup basic-reload:
pass -> DMESG-FAIL (fi-skl-6260u)
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:413s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:424s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:371s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:478s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:283s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:478s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:483s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:463s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:455s
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:572s
fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:415s
fi-gdg-551 total:288 pass:180 dwarn:0 dfail:0 fail:0 skip:108 time:281s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:505s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:379s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:405s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:454s
fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:409s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:446s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:489s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:451s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:487s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:583s
fi-skl-6260u total:288 pass:267 dwarn:0 dfail:1 fail:0 skip:20 time:427s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:501s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:513s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:487s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:472s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:402s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:428s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:512s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:388s
562a3886d1cd6e2763a022037e6090d7ceb00ee3 drm-tip: 2018y-02m-21d-18h-35m-44s UTC integration manifest
bb48a00cb0a5 drm/i915: GuC test run
dc87ce86e08d drm/i915/guc: Support engine busy stats
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8112/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 1/2] drm/i915/guc: Support engine busy stats
2018-02-21 17:25 [PATCH 1/2] drm/i915/guc: Support engine busy stats Tvrtko Ursulin
` (4 preceding siblings ...)
2018-02-21 19:31 ` ✗ Fi.CI.BAT: failure " Patchwork
@ 2018-02-22 6:07 ` Tvrtko Ursulin
2018-02-22 7:51 ` Chris Wilson
2018-02-22 6:30 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/guc: Support engine busy stats (rev2) Patchwork
` (2 subsequent siblings)
8 siblings, 1 reply; 13+ messages in thread
From: Tvrtko Ursulin @ 2018-02-22 6:07 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Place context in/out hooks into the GuC backend, when contexts are
assigned to ports, and removed from them, in order to be able to
provide engine busy stats in GuC mode.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Testcase: igt/perf_pmu/busy-accuracy-*-*
---
drivers/gpu/drm/i915/intel_guc_submission.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
index 649113c7a3c2..8e99f8fd6da2 100644
--- a/drivers/gpu/drm/i915/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/intel_guc_submission.c
@@ -673,6 +673,7 @@ static void guc_dequeue(struct intel_engine_cs *engine)
struct intel_engine_execlists * const execlists = &engine->execlists;
struct execlist_port *port = execlists->port;
struct i915_request *last = NULL;
+ struct i915_gem_context *last_ctx = NULL;
const struct execlist_port * const last_port =
&execlists->port[execlists->port_mask];
bool submit = false;
@@ -718,8 +719,13 @@ static void guc_dequeue(struct intel_engine_cs *engine)
goto done;
}
- if (submit)
+ if (submit) {
port_assign(port, last);
+ if (last->ctx != last_ctx) {
+ intel_engine_context_in(last->engine);
+ last_ctx = last->ctx;
+ }
+ }
port++;
}
@@ -741,6 +747,8 @@ static void guc_dequeue(struct intel_engine_cs *engine)
execlists->first = rb;
if (submit) {
port_assign(port, last);
+ if (last->ctx != last_ctx)
+ intel_engine_context_in(last->engine);
execlists_set_active(execlists, EXECLISTS_ACTIVE_USER);
guc_submit(engine);
}
@@ -763,6 +771,7 @@ static void guc_submission_tasklet(unsigned long data)
rq = port_request(&port[0]);
while (rq && i915_request_completed(rq)) {
+ intel_engine_context_out(rq->engine);
trace_i915_request_out(rq);
i915_request_put(rq);
@@ -1192,8 +1201,6 @@ int intel_guc_submission_enable(struct intel_guc *guc)
execlists->tasklet.func = guc_submission_tasklet;
engine->park = guc_submission_park;
engine->unpark = guc_submission_unpark;
-
- engine->flags &= ~I915_ENGINE_SUPPORTS_STATS;
}
return 0;
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 1/2] drm/i915/guc: Support engine busy stats
2018-02-22 6:07 ` [PATCH 1/2] " Tvrtko Ursulin
@ 2018-02-22 7:51 ` Chris Wilson
2018-02-22 8:26 ` Tvrtko Ursulin
0 siblings, 1 reply; 13+ messages in thread
From: Chris Wilson @ 2018-02-22 7:51 UTC (permalink / raw)
To: Tvrtko Ursulin, Intel-gfx
Quoting Tvrtko Ursulin (2018-02-22 06:07:32)
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Place context in/out hooks into the GuC backend, when contexts are
> assigned to ports, and removed from them, in order to be able to
> provide engine busy stats in GuC mode.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Testcase: igt/perf_pmu/busy-accuracy-*-*
> ---
> drivers/gpu/drm/i915/intel_guc_submission.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
> index 649113c7a3c2..8e99f8fd6da2 100644
> --- a/drivers/gpu/drm/i915/intel_guc_submission.c
> +++ b/drivers/gpu/drm/i915/intel_guc_submission.c
> @@ -673,6 +673,7 @@ static void guc_dequeue(struct intel_engine_cs *engine)
> struct intel_engine_execlists * const execlists = &engine->execlists;
> struct execlist_port *port = execlists->port;
> struct i915_request *last = NULL;
> + struct i915_gem_context *last_ctx = NULL;
> const struct execlist_port * const last_port =
> &execlists->port[execlists->port_mask];
> bool submit = false;
> @@ -718,8 +719,13 @@ static void guc_dequeue(struct intel_engine_cs *engine)
> goto done;
> }
>
> - if (submit)
> + if (submit) {
> port_assign(port, last);
> + if (last->ctx != last_ctx) {
> + intel_engine_context_in(last->engine);
> + last_ctx = last->ctx;
> + }
> + }
> port++;
> }
>
> @@ -741,6 +747,8 @@ static void guc_dequeue(struct intel_engine_cs *engine)
> execlists->first = rb;
> if (submit) {
> port_assign(port, last);
> + if (last->ctx != last_ctx)
> + intel_engine_context_in(last->engine);
> execlists_set_active(execlists, EXECLISTS_ACTIVE_USER);
> guc_submit(engine);
> }
> @@ -763,6 +771,7 @@ static void guc_submission_tasklet(unsigned long data)
>
> rq = port_request(&port[0]);
> while (rq && i915_request_completed(rq)) {
> + intel_engine_context_out(rq->engine);
If we only emit context_in once for 2 consecutive rq with the same
context, we would need to do the same for context_out.
Will be interesting to see if this explodes, or we may need yet another
test :)
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/2] drm/i915/guc: Support engine busy stats
2018-02-22 7:51 ` Chris Wilson
@ 2018-02-22 8:26 ` Tvrtko Ursulin
2018-02-22 8:31 ` Chris Wilson
0 siblings, 1 reply; 13+ messages in thread
From: Tvrtko Ursulin @ 2018-02-22 8:26 UTC (permalink / raw)
To: Chris Wilson, Tvrtko Ursulin, Intel-gfx
On 22/02/2018 07:51, Chris Wilson wrote:
> Quoting Tvrtko Ursulin (2018-02-22 06:07:32)
>> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>>
>> Place context in/out hooks into the GuC backend, when contexts are
>> assigned to ports, and removed from them, in order to be able to
>> provide engine busy stats in GuC mode.
>>
>> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>> Testcase: igt/perf_pmu/busy-accuracy-*-*
>> ---
>> drivers/gpu/drm/i915/intel_guc_submission.c | 13 ++++++++++---
>> 1 file changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
>> index 649113c7a3c2..8e99f8fd6da2 100644
>> --- a/drivers/gpu/drm/i915/intel_guc_submission.c
>> +++ b/drivers/gpu/drm/i915/intel_guc_submission.c
>> @@ -673,6 +673,7 @@ static void guc_dequeue(struct intel_engine_cs *engine)
>> struct intel_engine_execlists * const execlists = &engine->execlists;
>> struct execlist_port *port = execlists->port;
>> struct i915_request *last = NULL;
>> + struct i915_gem_context *last_ctx = NULL;
>> const struct execlist_port * const last_port =
>> &execlists->port[execlists->port_mask];
>> bool submit = false;
>> @@ -718,8 +719,13 @@ static void guc_dequeue(struct intel_engine_cs *engine)
>> goto done;
>> }
>>
>> - if (submit)
>> + if (submit) {
>> port_assign(port, last);
>> + if (last->ctx != last_ctx) {
>> + intel_engine_context_in(last->engine);
>> + last_ctx = last->ctx;
>> + }
>> + }
>> port++;
>> }
>>
>> @@ -741,6 +747,8 @@ static void guc_dequeue(struct intel_engine_cs *engine)
>> execlists->first = rb;
>> if (submit) {
>> port_assign(port, last);
>> + if (last->ctx != last_ctx)
>> + intel_engine_context_in(last->engine);
>> execlists_set_active(execlists, EXECLISTS_ACTIVE_USER);
>> guc_submit(engine);
>> }
>> @@ -763,6 +771,7 @@ static void guc_submission_tasklet(unsigned long data)
>>
>> rq = port_request(&port[0]);
>> while (rq && i915_request_completed(rq)) {
>> + intel_engine_context_out(rq->engine);
>
> If we only emit context_in once for 2 consecutive rq with the same
> context, we would need to do the same for context_out.
>
> Will be interesting to see if this explodes, or we may need yet another
> test :)
I thought two consecutive requests with the same context is one port, so
one context_in and one context_out. But maybe I'm wrong. Lets wait and
see as you say. :)
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/2] drm/i915/guc: Support engine busy stats
2018-02-22 8:26 ` Tvrtko Ursulin
@ 2018-02-22 8:31 ` Chris Wilson
0 siblings, 0 replies; 13+ messages in thread
From: Chris Wilson @ 2018-02-22 8:31 UTC (permalink / raw)
To: Tvrtko Ursulin, Tvrtko Ursulin, Intel-gfx
Quoting Tvrtko Ursulin (2018-02-22 08:26:58)
>
> On 22/02/2018 07:51, Chris Wilson wrote:
> > Quoting Tvrtko Ursulin (2018-02-22 06:07:32)
> >> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >>
> >> Place context in/out hooks into the GuC backend, when contexts are
> >> assigned to ports, and removed from them, in order to be able to
> >> provide engine busy stats in GuC mode.
> >>
> >> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >> Testcase: igt/perf_pmu/busy-accuracy-*-*
> >> ---
> >> drivers/gpu/drm/i915/intel_guc_submission.c | 13 ++++++++++---
> >> 1 file changed, 10 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/intel_guc_submission.c b/drivers/gpu/drm/i915/intel_guc_submission.c
> >> index 649113c7a3c2..8e99f8fd6da2 100644
> >> --- a/drivers/gpu/drm/i915/intel_guc_submission.c
> >> +++ b/drivers/gpu/drm/i915/intel_guc_submission.c
> >> @@ -673,6 +673,7 @@ static void guc_dequeue(struct intel_engine_cs *engine)
> >> struct intel_engine_execlists * const execlists = &engine->execlists;
> >> struct execlist_port *port = execlists->port;
> >> struct i915_request *last = NULL;
> >> + struct i915_gem_context *last_ctx = NULL;
> >> const struct execlist_port * const last_port =
> >> &execlists->port[execlists->port_mask];
> >> bool submit = false;
> >> @@ -718,8 +719,13 @@ static void guc_dequeue(struct intel_engine_cs *engine)
> >> goto done;
> >> }
> >>
> >> - if (submit)
> >> + if (submit) {
> >> port_assign(port, last);
> >> + if (last->ctx != last_ctx) {
> >> + intel_engine_context_in(last->engine);
> >> + last_ctx = last->ctx;
> >> + }
> >> + }
> >> port++;
> >> }
> >>
> >> @@ -741,6 +747,8 @@ static void guc_dequeue(struct intel_engine_cs *engine)
> >> execlists->first = rb;
> >> if (submit) {
> >> port_assign(port, last);
> >> + if (last->ctx != last_ctx)
> >> + intel_engine_context_in(last->engine);
> >> execlists_set_active(execlists, EXECLISTS_ACTIVE_USER);
> >> guc_submit(engine);
> >> }
> >> @@ -763,6 +771,7 @@ static void guc_submission_tasklet(unsigned long data)
> >>
> >> rq = port_request(&port[0]);
> >> while (rq && i915_request_completed(rq)) {
> >> + intel_engine_context_out(rq->engine);
> >
> > If we only emit context_in once for 2 consecutive rq with the same
> > context, we would need to do the same for context_out.
> >
> > Will be interesting to see if this explodes, or we may need yet another
> > test :)
>
>
> I thought two consecutive requests with the same context is one port, so
> one context_in and one context_out. But maybe I'm wrong. Lets wait and
> see as you say. :)
The difference is we don't do lite-restore in the guc. I think you want
to move context_in to guc_submit().
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/guc: Support engine busy stats (rev2)
2018-02-21 17:25 [PATCH 1/2] drm/i915/guc: Support engine busy stats Tvrtko Ursulin
` (5 preceding siblings ...)
2018-02-22 6:07 ` [PATCH 1/2] " Tvrtko Ursulin
@ 2018-02-22 6:30 ` Patchwork
2018-02-22 6:44 ` ✓ Fi.CI.BAT: success " Patchwork
2018-02-22 9:01 ` ✗ Fi.CI.IGT: failure " Patchwork
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2018-02-22 6:30 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Support engine busy stats (rev2)
URL : https://patchwork.freedesktop.org/series/38717/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
690dfe054013 drm/i915/guc: Support engine busy stats
-:33: WARNING: line over 80 characters
#33: FILE: drivers/gpu/drm/i915/intel_guc_submission.c:725:
+ intel_engine_context_in(last->engine);
total: 0 errors, 1 warnings, 0 checks, 44 lines checked
bffcb2b6b6b0 drm/i915: GuC test run
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread* ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/guc: Support engine busy stats (rev2)
2018-02-21 17:25 [PATCH 1/2] drm/i915/guc: Support engine busy stats Tvrtko Ursulin
` (6 preceding siblings ...)
2018-02-22 6:30 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915/guc: Support engine busy stats (rev2) Patchwork
@ 2018-02-22 6:44 ` Patchwork
2018-02-22 9:01 ` ✗ Fi.CI.IGT: failure " Patchwork
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2018-02-22 6:44 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Support engine busy stats (rev2)
URL : https://patchwork.freedesktop.org/series/38717/
State : success
== Summary ==
Series 38717v2 series starting with [1/2] drm/i915/guc: Support engine busy stats
https://patchwork.freedesktop.org/api/1.0/series/38717/revisions/2/mbox/
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:417s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:421s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:378s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:487s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:286s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:482s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:474s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:456s
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:564s
fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:413s
fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:284s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:506s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:383s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:410s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:441s
fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:409s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:453s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:488s
fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:447s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:492s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:586s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:423s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:500s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:517s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:491s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:481s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:407s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:430s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:529s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:391s
fi-bxt-dsi failed to collect. IGT log at Patchwork_8118/fi-bxt-dsi/run0.log
42016703e66b7b572d4ab651946b715cdbff3050 drm-tip: 2018y-02m-21d-21h-26m-53s UTC integration manifest
bffcb2b6b6b0 drm/i915: GuC test run
690dfe054013 drm/i915/guc: Support engine busy stats
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8118/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread* ✗ Fi.CI.IGT: failure for series starting with [1/2] drm/i915/guc: Support engine busy stats (rev2)
2018-02-21 17:25 [PATCH 1/2] drm/i915/guc: Support engine busy stats Tvrtko Ursulin
` (7 preceding siblings ...)
2018-02-22 6:44 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2018-02-22 9:01 ` Patchwork
8 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2018-02-22 9:01 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] drm/i915/guc: Support engine busy stats (rev2)
URL : https://patchwork.freedesktop.org/series/38717/
State : failure
== Summary ==
Test drv_missed_irq:
pass -> SKIP (shard-apl)
Test drv_selftest:
Subgroup live_guc:
pass -> DMESG-WARN (shard-apl)
Test kms_flip:
Subgroup modeset-vs-vblank-race-interruptible:
fail -> PASS (shard-apl) fdo#103060 +1
Subgroup plain-flip-ts-check-interruptible:
pass -> FAIL (shard-hsw) fdo#100368
Test perf:
Subgroup oa-exponents:
incomplete -> PASS (shard-apl) fdo#102254
Subgroup gen8-unprivileged-single-ctx-counters:
pass -> FAIL (shard-apl)
Test drv_suspend:
Subgroup fence-restore-untiled:
pass -> SKIP (shard-snb)
Test kms_chv_cursor_fail:
Subgroup pipe-b-128x128-top-edge:
dmesg-warn -> PASS (shard-snb) fdo#105185
Test gem_exec_schedule:
Subgroup smoketest-render:
pass -> FAIL (shard-apl)
Subgroup smoketest-all:
pass -> FAIL (shard-apl)
Test prime_self_import:
Subgroup reimport-vs-gem_close-race:
pass -> FAIL (shard-hsw)
Test kms_vblank:
Subgroup pipe-b-ts-continuation-idle:
pass -> DMESG-WARN (shard-hsw)
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102254 https://bugs.freedesktop.org/show_bug.cgi?id=102254
fdo#105185 https://bugs.freedesktop.org/show_bug.cgi?id=105185
shard-apl total:3369 pass:1761 dwarn:2 dfail:0 fail:15 skip:1590 time:12343s
shard-hsw total:3464 pass:1764 dwarn:2 dfail:0 fail:4 skip:1693 time:11859s
shard-snb total:3464 pass:1355 dwarn:1 dfail:0 fail:3 skip:2105 time:6688s
Blacklisted hosts:
shard-kbl total:3335 pass:1829 dwarn:23 dfail:2 fail:21 skip:1456 time:8565s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8118/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread