drm/i915/guc: Name the default GuC scheduling policy
Subsystems (2)
PATCH 1/3 drm/i915/guc: Name the default GuC scheduling policy
The default values for the default scheduling policy come from the GuC firmware itself. Transform the magic numbers into defines.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 15 ++++++++++----- drivers/gpu/drm/i915/intel_guc_fwif.h | 6 +++++- 2 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +10 -5
@@ -996,22 +996,27 @@ static void guc_client_free(struct i915_guc_client *client)kfree (client); } +static void guc_policy_init (struct guc_policy *policy) +{ + policy->execution_quantum =POLICY_DEFAULT_EXECUTION_QUANTUM_US ; + policy->preemption_time =POLICY_DEFAULT_PREEMPTION_TIME_US ; + policy->fault_time =POLICY_DEFAULT_FAULT_TIME_US ; + policy->policy_flags =0 ; +} +static void guc_policies_init (struct guc_policies *policies) {struct guc_policy *policy;u32 p, i; - policies->dpc_promote_time =500000 ; + policies->dpc_promote_time =POLICY_DEFAULT_DPC_PROMOTE_TIME_US ; policies->max_num_work_items =POLICY_MAX_NUM_WI ;for (p =0 ; p <GUC_CLIENT_PRIORITY_NUM ; p++) {for (i =GUC_RENDER_ENGINE ; i <GUC_MAX_ENGINES_NUM ; i++) { policy = &policies->policy[p][i]; - policy->execution_quantum =1000000 ; - policy->preemption_time =500000 ; - policy->fault_time =250000 ; - policy->policy_flags =0 ; +guc_policy_init (policy); } }
drivers/gpu/drm/i915/intel_guc_fwif.h +5 -1
@@ -388,7 +388,11 @@ struct guc_ct_buffer_desc {/* Preempt to idle on quantum expiry */ #define POLICY_PREEMPT_TO_IDLE (1<<1) -#define POLICY_MAX_NUM_WI 15 +#define POLICY_MAX_NUM_WI 15 +#define POLICY_DEFAULT_DPC_PROMOTE_TIME_US 500000 +#define POLICY_DEFAULT_EXECUTION_QUANTUM_US 1000000 +#define POLICY_DEFAULT_PREEMPTION_TIME_US 500000 +#define POLICY_DEFAULT_FAULT_TIME_US 250000struct guc_policy {/* Time for one workload to execute. (in micro seconds) */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915/guc: Remove WQ_WORKLOAD_SHIFT define
We never used it in i915 and it's going to be removed in newer GuC firmwares anyway.
--- drivers/gpu/drm/i915/intel_guc_fwif.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/i915/intel_guc_fwif.h +0 -4
@@ -56,10 +56,6 @@#define WQ_LEN_SHIFT 16#define WQ_NO_WCFLUSH_WAIT (1 << 27)#define WQ_PRESENT_WORKLOAD (1 << 28) -#define WQ_WORKLOAD_SHIFT 29 -#define WQ_WORKLOAD_GENERAL (0 << WQ_WORKLOAD_SHIFT) -#define WQ_WORKLOAD_GPGPU (1 << WQ_WORKLOAD_SHIFT) -#define WQ_WORKLOAD_TOUCH (2 << WQ_WORKLOAD_SHIFT)#define WQ_RING_TAIL_SHIFT 20#define WQ_RING_TAIL_MAX 0x7FF/* 2^11 QWords */
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915/guc: Small improvements to guc_wq_item_append
In reply to Oscar MateoSpare some comments and other small style changes.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +7 -8
@@ -469,8 +469,9 @@ static void guc_wq_item_append(struct i915_guc_client *client, {/* wqi_len is in DWords, and does not include the one-word header */ const size_t wqi_size =sizeof (struct guc_wq_item ); -const u32 wqi_len = wqi_size/sizeof (u32) -1 ; +const u32 wqi_len = wqi_size /sizeof (u32) -1 ;struct intel_engine_cs *engine = rq->engine; +struct i915_gem_context *ctx = rq->ctx;struct guc_process_desc *desc =__get_process_desc (client);struct guc_wq_item *wqi;u32 freespace, tail, wq_off;
@@ -479,8 +480,7 @@ static void guc_wq_item_append(struct i915_guc_client *client, freespace =CIRC_SPACE (client->wq_tail, desc->head, client->wq_size);GEM_BUG_ON (freespace < wqi_size); -/* The GuC firmware wants the tail index in QWords, not bytes */ - tail =intel_ring_set_tail (rq->ring, rq->tail) >>3 ; + tail =intel_ring_set_tail (rq->ring, rq->tail) /sizeof (u64);GEM_BUG_ON (tail >WQ_RING_TAIL_MAX );/* For now workqueue item is 4 DWs; workqueue buffer is 2 pages. So we
@@ -505,12 +505,11 @@ static void guc_wq_item_append(struct i915_guc_client *client,/* Now fill in the 4-word work queue item */ wqi->header =WQ_TYPE_INORDER | - (wqi_len <<WQ_LEN_SHIFT ) | - (engine->guc_id <<WQ_TARGET_SHIFT ) | -WQ_NO_WCFLUSH_WAIT ; + (wqi_len <<WQ_LEN_SHIFT ) | + (engine->guc_id <<WQ_TARGET_SHIFT ) | +WQ_NO_WCFLUSH_WAIT ; -/* The GuC wants only the low-order word of the context descriptor */ - wqi->context_desc = (u32 )intel_lr_context_descriptor (rq->ctx, engine); + wqi->context_desc =lower_32_bits (intel_lr_context_descriptor (ctx, engine)); wqi->submit_element_info = tail <<WQ_RING_TAIL_SHIFT ; wqi->fence_id = rq->global_seqno;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/3] drm/i915/guc: Small improvements to guc_wq_item_append
Quoting Oscar Mateo (2017-09-12 22:36:37)
Quoted 4 lines
Spare some comments and other small style changes.
Suggested-by Joonas Lahtinen <[email protected]>Signed-off-by Oscar Mateo <[email protected]>
Series Reviewed-by: Chris Wilson <[email protected]> and pushed, thanks.
-Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915/guc: Name the default GuC scheduling policy
In reply to Oscar Mateo== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/guc: Name the default GuC scheduling policy
URL : https://patchwork.freedesktop.org/series/30241/
State : success
== Summary ==
Series 30241v1 series starting with [1/3] drm/i915/guc: Name the default GuC scheduling policy
https://patchwork.freedesktop.org/api/1.0/series/30241/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
pass -> FAIL (fi-kbl-7500u) fdo#102514
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> PASS (fi-byt-n2820) fdo#101705fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:450s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:456s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:380s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:539s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:270s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:514s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:515s fi-byt-n2820 total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:504s fi-cfl-s total:289 pass:250 dwarn:4 dfail:0 fail:0 skip:35 time:461s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:455s fi-glk-2a total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:599s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:431s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:408s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:440s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:493s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:465s fi-kbl-7500u total:289 pass:263 dwarn:1 dfail:0 fail:1 skip:24 time:483s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:577s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:588s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:554s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:456s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:523s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:508s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:463s fi-skl-x1585l total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:499s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:577s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:1 skip:39 time:429s
c9e787e0e616ba39a2ef195cb24d2e79b628bb9a drm-tip: 2017y-09m-12d-20h-02m-24s UTC integration manifest 665f5492c578 drm/i915/guc: Small improvements to guc_wq_item_appendf59ddce655bf drm/i915/guc: Remove WQ_WORKLOAD_SHIFT definedd99f1dea748 drm/i915/guc: Name the default GuC scheduling policy
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5668/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for series starting with [1/3] drm/i915/guc: Name the default GuC scheduling policy
In reply to Oscar Mateo== Series Details ==
== Series Details ==
Series: series starting with [1/3] drm/i915/guc: Name the default GuC scheduling policy
URL : https://patchwork.freedesktop.org/series/30241/
State : warning
== Summary ==
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912
Test perf:
Subgroup polling:
fail -> PASS (shard-hsw) fdo#102252
Test kms_plane:
Subgroup plane-panning-bottom-right-suspend-pipe-C-planes:
pass -> SKIP (shard-hsw)fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2419 pass:1323 dwarn:1 dfail:0 fail:13 skip:1082 time:9734s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5668/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx