drm/i915: Move engine HWS setup into dedicated function
Subsystems (2)
PATCH 1/1 drm/i915: Move engine HWS setup into dedicated function
This will make future patches simpler.
--- drivers/gpu/drm/i915/intel_lrc.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +13 -8
@@ -1142,9 +1142,20 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)return ret; } -static int gen8_init_common_ring (struct intel_engine_cs *engine) +static void intel_engine_init_hws (struct intel_engine_cs *engine) {struct drm_i915_private *dev_priv = engine->i915; + +I915_WRITE (RING_HWSTAM (engine->mmio_base),0xffffffff ); +I915_WRITE (RING_MODE_GEN7 (engine), +_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); +I915_WRITE (RING_HWS_PGA (engine->mmio_base), + engine->status_page.ggtt_offset); +POSTING_READ (RING_HWS_PGA (engine->mmio_base)); +} + +static int gen8_init_common_ring (struct intel_engine_cs *engine) +{struct execlist_port *port = engine->execlist_port;unsigned int n;int ret;
@@ -1155,13 +1166,7 @@ static int gen8_init_common_ring(struct intel_engine_cs *engine)intel_engine_reset_breadcrumbs (engine);intel_engine_init_hangcheck (engine); - -I915_WRITE (RING_HWSTAM (engine->mmio_base),0xffffffff ); -I915_WRITE (RING_MODE_GEN7 (engine), -_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); -I915_WRITE (RING_HWS_PGA (engine->mmio_base), - engine->status_page.ggtt_offset); -POSTING_READ (RING_HWS_PGA (engine->mmio_base)); +intel_engine_init_hws (engine);DRM_DEBUG_DRIVER ("Execlists enabled for %s\n" , engine->name);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Move engine HWS setup into dedicated function
== Series Details ==
== Series Details ==
Series: drm/i915: Move engine HWS setup into dedicated function
URL : https://patchwork.freedesktop.org/series/24462/
State : success
== Summary ==
Series 24462v1 drm/i915: Move engine HWS setup into dedicated function
https://patchwork.freedesktop.org/api/1.0/series/24462/revisions/1/mbox/
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:444s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:433s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:582s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:515s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:493s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:484s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:428s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:409s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:418s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:493s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:469s fi-kbl-7500u total:278 pass:255 dwarn:5 dfail:0 fail:0 skip:18 time:464s fi-kbl-7560u total:278 pass:263 dwarn:5 dfail:0 fail:0 skip:10 time:573s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:466s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:578s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:471s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:502s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:447s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:535s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:400s
9b25870f9fa4548ec2bb40e42fa28f35db2189e1 drm-tip: 2017y-05m-15d-15h-47m-31s UTC integration manifest 5d2793e drm/i915: Move engine HWS setup into dedicated function
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4700/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.BAT: success for drm/i915: Move engine HWS setup into dedicated function
Quoted 10 lines · Patchwork
== Series Details ==
Series: drm/i915: Move engine HWS setup into dedicated function
URL : https://patchwork.freedesktop.org/series/24462/
State : success== Summary ==
Series 24462v1 drm/i915: Move engine HWS setup into dedicated function
https://patchwork.freedesktop.org/api/1.0/series/24462/revisions/1/mbox/
This isn't moving just HWS setup, so the new function is a little misnamed.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx