drm/i915: Simplify intel_engines_init
Subsystems (2)
Tvrtko Ursulin
maintainerPATCH 1/2 drm/i915: Simplify intel_engines_init
From: Tvrtko Ursulin <[email protected]>
We do not want to carry on over missing constructors and don't need a duplicated engine mask checking which is already done in the setup phase.
--- drivers/gpu/drm/i915/intel_engine_cs.c | 36 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 24 deletions(-)
drivers/gpu/drm/i915/intel_engine_cs.c +12 -24
@@ -291,11 +291,9 @@ int intel_engines_init_mmio(struct drm_i915_private *dev_priv)*/ int intel_engines_init (struct drm_i915_private *dev_priv) { -struct intel_device_info *device_info =mkwrite_device_info (dev_priv);struct intel_engine_cs *engine;enum intel_engine_id id, err_id; -unsigned int mask =0 ; -int err =0 ; +int err;for_each_engine (engine, dev_priv, id) { const struct engine_class_info *class_info =
@@ -306,40 +304,30 @@ int intel_engines_init(struct drm_i915_private *dev_priv) init = class_info->init_execlists; else init = class_info->init_legacy; -if (!init) { -kfree (engine); - dev_priv->engine[id] =NULL ; -continue ; - } + + err = -EINVAL ; + err_id = id; + +if (GEM_WARN_ON (!init)) + goto cleanup; err =init (engine); -if (err) { - err_id = id; +if (err) goto cleanup; - }GEM_BUG_ON (!engine->submit_request); - mask |=ENGINE_MASK (id); } -/* -* Catch failures to update intel_engines table when the new engines -* are added to the driver by a warning and disabling the forgotten -* engines. -*/ -if (WARN_ON (mask !=INTEL_INFO (dev_priv)->ring_mask)) - device_info->ring_mask = mask; - - device_info->num_rings =hweight32 (mask); -return 0 ; cleanup:for_each_engine (engine, dev_priv, id) { -if (id >= err_id) +if (id >= err_id) {kfree (engine); -else + dev_priv->engine[id] =NULL ; + }else { dev_priv->gt.cleanup_engine (engine); + } }return err; }
Signature · 6 lines
2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH 2/2 drm/i915: Do not re-calculate num_rings locally
From: Tvrtko Ursulin <[email protected]>
It is available in INTEL_INFO so use it.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -3
@@ -2140,7 +2140,7 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, engine->emit_breadcrumb = gen6_sema_emit_breadcrumb; - num_rings =hweight32 (INTEL_INFO (dev_priv)->ring_mask) -1 ; + num_rings =INTEL_INFO (dev_priv)->num_rings -1 ;if (INTEL_GEN (dev_priv) >=8 ) { engine->emit_breadcrumb_sz += num_rings *6 ; }else {
@@ -2184,8 +2184,7 @@ int intel_init_render_ring_buffer(struct intel_engine_cs *engine) engine->semaphore.signal = gen8_rcs_signal; - num_rings = -hweight32 (INTEL_INFO (dev_priv)->ring_mask) -1 ; + num_rings =INTEL_INFO (dev_priv)->num_rings -1 ; engine->emit_breadcrumb_sz += num_rings *8 ; } }else if (INTEL_GEN (dev_priv) >=6 ) {
Signature · 6 lines
2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Do not re-calculate num_rings locally
Quoting Tvrtko Ursulin (2017-06-16 14:03:39)
Quoted 3 lines
From: Tvrtko Ursulin <[email protected]>
It is available in
INTEL_INFOso use it.
We used hweight() because num_rings previously wasn't set in time. Can you cite the commit that changed the order allowing us to use num_rings here.
Quoted 1 line
Signed-off-by Tvrtko Ursulin <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
maintainerPATCH v2 2/2 drm/i915: Do not re-calculate num_rings locally
From: Tvrtko Ursulin <[email protected]>
Since bb8f0f5abdd7 ("drm/i915: Split intel_engine allocation and initialisation") intel_info->num_rings is set early in the load sequence and so available to be used direclty in the 2nd load phase.
--- drivers/gpu/drm/i915/intel_ringbuffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -3
@@ -2140,7 +2140,7 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, engine->emit_breadcrumb = gen6_sema_emit_breadcrumb; - num_rings =hweight32 (INTEL_INFO (dev_priv)->ring_mask) -1 ; + num_rings =INTEL_INFO (dev_priv)->num_rings -1 ;if (INTEL_GEN (dev_priv) >=8 ) { engine->emit_breadcrumb_sz += num_rings *6 ; }else {
@@ -2184,8 +2184,7 @@ int intel_init_render_ring_buffer(struct intel_engine_cs *engine) engine->semaphore.signal = gen8_rcs_signal; - num_rings = -hweight32 (INTEL_INFO (dev_priv)->ring_mask) -1 ; + num_rings =INTEL_INFO (dev_priv)->num_rings -1 ; engine->emit_breadcrumb_sz += num_rings *8 ; } }else if (INTEL_GEN (dev_priv) >=6 ) {
Signature · 6 lines
2.9.4 _______________________________________________ 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/2] drm/i915: Simplify intel_engines_init
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Simplify intel_engines_init
URL : https://patchwork.freedesktop.org/series/25907/
State : success
== Summary ==
Series 25907v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/25907/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> FAIL (fi-snb-2600) fdo#100215fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:472s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:486s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:589s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:550s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:495s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:488s fi-glk-2a total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:592s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:430s fi-hsw-4770r total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:16 time:419s fi-ilk-650 total:278 pass:227 dwarn:0 dfail:0 fail:0 skip:50 time:466s fi-ivb-3520m total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:18 time:496s fi-ivb-3770 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:18 time:519s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:476s fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:586s fi-kbl-r total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 time:579s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:485s fi-skl-6700hq total:278 pass:228 dwarn:1 dfail:0 fail:27 skip:22 time:435s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:517s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:513s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:509s fi-snb-2520m total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:28 time:627s fi-snb-2600 total:278 pass:246 dwarn:0 dfail:0 fail:2 skip:29 time:404s
8d8ba40466f9442b52349da887fb7f03040bc116 drm-tip: 2017y-06m-16d-13h-56m-34s UTC integration manifest 23da3eb drm/i915: Do not re-calculate num_rings locally
c43bfff drm/i915: Simplify intel_engines_init
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4969/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Tvrtko Ursulin (2017-06-16 14:03:38)
Quoted 5 lines
From: Tvrtko Ursulin <[email protected]>
We do not want to carry on over missing constructors and don't need a duplicated engine mask checking which is already done in the setup phase.
Fair enough. No reason for this check after hw enabling.
Quoted 1 line
Signed-off-by Tvrtko Ursulin <[email protected]>
-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/2] drm/i915: Simplify intel_engines_init (rev2)
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Simplify intel_engines_init (rev2)
URL : https://patchwork.freedesktop.org/series/25907/
State : success
== Summary ==
Series 25907v2 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/25907/revisions/2/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
fail -> PASS (fi-snb-2600) fdo#100215
Test kms_pipe_crc_basic:
Subgroup bad-nb-words-1:
pass -> DMESG-WARN (fi-skl-6700hq) fdo#101154 +19fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#101154 https://bugs.freedesktop.org/show_bug.cgi?id=101154
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:470s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:487s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:571s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:548s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:492s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:483s fi-glk-2a total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:587s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:430s fi-hsw-4770r total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:16 time:421s fi-ilk-650 total:278 pass:227 dwarn:0 dfail:0 fail:0 skip:50 time:458s fi-ivb-3520m total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:18 time:490s fi-ivb-3770 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:18 time:521s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:477s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:571s fi-kbl-r total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 time:575s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:483s fi-skl-6700hq total:278 pass:224 dwarn:5 dfail:16 fail:11 skip:22 time:470s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:514s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:499s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:509s fi-snb-2520m total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:28 time:621s fi-snb-2600 total:278 pass:247 dwarn:0 dfail:0 fail:1 skip:29 time:400s
508325c380d12aaccd410adc935e24f70acf69a8 drm-tip: 2017y-06m-19d-09h-05m-32s UTC integration manifest b655f01 drm/i915: Do not re-calculate num_rings locally
4bbc96e drm/i915: Simplify intel_engines_init
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4981/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Simplify intel_engines_init (rev2)
Quoted 44 lines · Patchwork
== Series Details ==
Series: series starting with [1/2] drm/i915: Simplify
intel_engines_init(rev2)
URL : https://patchwork.freedesktop.org/series/25907/
State : success== Summary ==
Series 25907v2 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/25907/revisions/2/mbox/Test
kms_cursor_legacy:Subgroup basic-busy-flip-before-cursor-legacy: fail -> PASS (fi-snb-2600) fdo#100215 Test kms_pipe_crc_basic: Subgroup bad-nb-words-1: pass -> DMESG-WARN (fi-skl-6700hq) fdo#101154 +19fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#101154 https://bugs.freedesktop.org/show_bug.cgi?id=101154fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:470s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:487s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:571s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:548s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:492s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:483s fi-glk-2a total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:587s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:430s fi-hsw-4770r total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:16 time:421s fi-ilk-650 total:278 pass:227 dwarn:0 dfail:0 fail:0 skip:50 time:458s fi-ivb-3520m total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:18 time:490s fi-ivb-3770 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:18 time:521s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:477s fi-kbl-7560u total:278 pass:267 dwarn:1 dfail:0 fail:0 skip:10 time:571s fi-kbl-r total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 time:575s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:483s fi-skl-6700hq total:278 pass:224 dwarn:5 dfail:16 fail:11 skip:22 time:470s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:514s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:499s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:509s fi-snb-2520m total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:28 time:621s fi-snb-2600 total:278 pass:247 dwarn:0 dfail:0 fail:1 skip:29 time:400s
Quoted 3 lines
508325c380d12aaccd410adc935e24f70acf69a8drm-tip: 2017y-06m-19d-09h-05m-32s UTC integration manifest b655f01 drm/i915: Do not re-calculatenum_ringslocally
4bbc96e drm/i915: Simplifyintel_engines_init
Pushed, thanks for the review!
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx