drm/i915: Extract vfunc setup from logical ring initializers
Subsystems (2)
PATCH 1/3 drm/i915: Extract vfunc setup from logical ring initializers
From: Tvrtko Ursulin <[email protected]>
Majority of them was duplicated code and only render ring currently overrides some of them. We can save some lines of code and also take away the confusion on why bsd2 did not do the seqno coherency workaround. (VCS2 ring does not exist on platforms where workaround is needed but that was not documented in the code.)
--- drivers/gpu/drm/i915/intel_lrc.c | 88 +++++++++++++--------------------------- 1 file changed, 29 insertions(+), 59 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +29 -59
@@ -1942,7 +1942,28 @@ void intel_logical_ring_cleanup(struct intel_engine_cs *ring) ring->dev =NULL ; } -static int logical_ring_init (struct drm_device *dev,struct intel_engine_cs *ring) +static void +logical_ring_default_vfuncs (struct drm_device *dev, +struct intel_engine_cs *ring) +{ +/* Default vfuncs which can be overriden by each engine. */ + ring->init_hw = gen8_init_common_ring; + ring->emit_request = gen8_emit_request; + ring->emit_flush = gen8_emit_flush; + ring->irq_get = gen8_logical_ring_get_irq; + ring->irq_put = gen8_logical_ring_put_irq; + ring->emit_bb_start = gen8_emit_bb_start; +if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) { + ring->get_seqno = bxt_a_get_seqno; + ring->set_seqno = bxt_a_set_seqno; + }else { + ring->get_seqno = gen8_get_seqno; + ring->set_seqno = gen8_set_seqno; + } +} + +static int +logical_ring_init (struct drm_device *dev,struct intel_engine_cs *ring) {int ret;
@@ -2003,24 +2024,16 @@ static int logical_render_ring_init(struct drm_device *dev)if (HAS_L3_DPF (dev)) ring->irq_keep_mask |=GT_RENDER_L3_PARITY_ERROR_INTERRUPT ; +logical_ring_default_vfuncs (dev, ring); + +/* Override some for render ring. */ if (INTEL_INFO (dev)->gen >=9 ) ring->init_hw = gen9_init_render_ring;else ring->init_hw = gen8_init_render_ring; ring->init_context = gen8_init_rcs_context; ring->cleanup = intel_fini_pipe_control; -if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) { - ring->get_seqno = bxt_a_get_seqno; - ring->set_seqno = bxt_a_set_seqno; - }else { - ring->get_seqno = gen8_get_seqno; - ring->set_seqno = gen8_set_seqno; - } - ring->emit_request = gen8_emit_request; ring->emit_flush = gen8_emit_flush_render; - ring->irq_get = gen8_logical_ring_get_irq; - ring->irq_put = gen8_logical_ring_put_irq; - ring->emit_bb_start = gen8_emit_bb_start; ring->dev = dev;
@@ -2060,19 +2073,7 @@ static int logical_bsd_ring_init(struct drm_device *dev) ring->irq_keep_mask =GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; - ring->init_hw = gen8_init_common_ring; -if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) { - ring->get_seqno = bxt_a_get_seqno; - ring->set_seqno = bxt_a_set_seqno; - }else { - ring->get_seqno = gen8_get_seqno; - ring->set_seqno = gen8_set_seqno; - } - ring->emit_request = gen8_emit_request; - ring->emit_flush = gen8_emit_flush; - ring->irq_get = gen8_logical_ring_get_irq; - ring->irq_put = gen8_logical_ring_put_irq; - ring->emit_bb_start = gen8_emit_bb_start; +logical_ring_default_vfuncs (dev, ring);return logical_ring_init (dev, ring); }
@@ -2090,14 +2091,7 @@ static int logical_bsd2_ring_init(struct drm_device *dev) ring->irq_keep_mask =GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT ; - ring->init_hw = gen8_init_common_ring; - ring->get_seqno = gen8_get_seqno; - ring->set_seqno = gen8_set_seqno; - ring->emit_request = gen8_emit_request; - ring->emit_flush = gen8_emit_flush; - ring->irq_get = gen8_logical_ring_get_irq; - ring->irq_put = gen8_logical_ring_put_irq; - ring->emit_bb_start = gen8_emit_bb_start; +logical_ring_default_vfuncs (dev, ring);return logical_ring_init (dev, ring); }
@@ -2115,19 +2109,7 @@ static int logical_blt_ring_init(struct drm_device *dev) ring->irq_keep_mask =GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; - ring->init_hw = gen8_init_common_ring; -if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) { - ring->get_seqno = bxt_a_get_seqno; - ring->set_seqno = bxt_a_set_seqno; - }else { - ring->get_seqno = gen8_get_seqno; - ring->set_seqno = gen8_set_seqno; - } - ring->emit_request = gen8_emit_request; - ring->emit_flush = gen8_emit_flush; - ring->irq_get = gen8_logical_ring_get_irq; - ring->irq_put = gen8_logical_ring_put_irq; - ring->emit_bb_start = gen8_emit_bb_start; +logical_ring_default_vfuncs (dev, ring);return logical_ring_init (dev, ring); }
@@ -2145,19 +2127,7 @@ static int logical_vebox_ring_init(struct drm_device *dev) ring->irq_keep_mask =GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; - ring->init_hw = gen8_init_common_ring; -if (IS_BXT_REVID (dev,0 ,BXT_REVID_A1 )) { - ring->get_seqno = bxt_a_get_seqno; - ring->set_seqno = bxt_a_set_seqno; - }else { - ring->get_seqno = gen8_get_seqno; - ring->set_seqno = gen8_set_seqno; - } - ring->emit_request = gen8_emit_request; - ring->emit_flush = gen8_emit_flush; - ring->irq_get = gen8_logical_ring_get_irq; - ring->irq_put = gen8_logical_ring_put_irq; - ring->emit_bb_start = gen8_emit_bb_start; +logical_ring_default_vfuncs (dev, ring);return logical_ring_init (dev, ring); }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/3 drm/i915: Compact logical ring interrupt initialization
From: Tvrtko Ursulin <[email protected]>
Identically to vfuncs interrupt mask initialization can also be compacted for more readable code.
--- drivers/gpu/drm/i915/intel_lrc.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/intel_lrc.c +13 -20
@@ -1962,6 +1962,13 @@ logical_ring_default_vfuncs(struct drm_device *dev, } } +static inline void +logical_ring_default_irqs (struct intel_engine_cs *ring,unsigned shift) +{ + ring->irq_enable_mask =GT_RENDER_USER_INTERRUPT << shift; + ring->irq_keep_mask =GT_CONTEXT_SWITCH_INTERRUPT << shift; +} +static int logical_ring_init (struct drm_device *dev,struct intel_engine_cs *ring) {
@@ -2017,10 +2024,8 @@ static int logical_render_ring_init(struct drm_device *dev) ring->name ="render ring" ; ring->id =RCS ; ring->mmio_base =RENDER_RING_BASE ; - ring->irq_enable_mask = -GT_RENDER_USER_INTERRUPT <<GEN8_RCS_IRQ_SHIFT ; - ring->irq_keep_mask = -GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_RCS_IRQ_SHIFT ; + +logical_ring_default_irqs (ring,GEN8_RCS_IRQ_SHIFT );if (HAS_L3_DPF (dev)) ring->irq_keep_mask |=GT_RENDER_L3_PARITY_ERROR_INTERRUPT ;
@@ -2068,11 +2073,8 @@ static int logical_bsd_ring_init(struct drm_device *dev) ring->name ="bsd ring" ; ring->id =VCS ; ring->mmio_base =GEN6_BSD_RING_BASE ; - ring->irq_enable_mask = -GT_RENDER_USER_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; - ring->irq_keep_mask = -GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS1_IRQ_SHIFT ; +logical_ring_default_irqs (ring,GEN8_VCS1_IRQ_SHIFT );logical_ring_default_vfuncs (dev, ring);return logical_ring_init (dev, ring);
@@ -2086,11 +2088,8 @@ static int logical_bsd2_ring_init(struct drm_device *dev) ring->name ="bds2 ring" ; ring->id =VCS2 ; ring->mmio_base =GEN8_BSD2_RING_BASE ; - ring->irq_enable_mask = -GT_RENDER_USER_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT ; - ring->irq_keep_mask = -GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VCS2_IRQ_SHIFT ; +logical_ring_default_irqs (ring,GEN8_VCS2_IRQ_SHIFT );logical_ring_default_vfuncs (dev, ring);return logical_ring_init (dev, ring);
@@ -2104,11 +2103,8 @@ static int logical_blt_ring_init(struct drm_device *dev) ring->name ="blitter ring" ; ring->id =BCS ; ring->mmio_base =BLT_RING_BASE ; - ring->irq_enable_mask = -GT_RENDER_USER_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; - ring->irq_keep_mask = -GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_BCS_IRQ_SHIFT ; +logical_ring_default_irqs (ring,GEN8_BCS_IRQ_SHIFT );logical_ring_default_vfuncs (dev, ring);return logical_ring_init (dev, ring);
@@ -2122,11 +2118,8 @@ static int logical_vebox_ring_init(struct drm_device *dev) ring->name ="video enhancement ring" ; ring->id =VECS ; ring->mmio_base =VEBOX_RING_BASE ; - ring->irq_enable_mask = -GT_RENDER_USER_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; - ring->irq_keep_mask = -GT_CONTEXT_SWITCH_INTERRUPT <<GEN8_VECS_IRQ_SHIFT ; +logical_ring_default_irqs (ring,GEN8_VECS_IRQ_SHIFT );logical_ring_default_vfuncs (dev, ring);return logical_ring_init (dev, ring);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/3 drm/i915: Fix bsd2 ring name
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
Chris Wilson noticed the "bds2" typo.
--- drivers/gpu/drm/i915/intel_lrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_lrc.c +1 -1
@@ -2085,7 +2085,7 @@ static int logical_bsd2_ring_init(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_engine_cs *ring = &dev_priv->ring[VCS2 ]; - ring->name ="bds2 ring" ; + ring->name ="bsd2 ring" ; ring->id =VCS2 ; ring->mmio_base =GEN8_BSD2_RING_BASE ;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Majority of them was duplicated code and only render ring currently overrides some of them. We can save some lines of code and also take away the confusion on why bsd2 did not do the seqno coherency workaround. (VCS2 ring does not exist on platforms where workaround is needed but that was not documented in the code.)
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>
All 3,
We can even combine several functions by inheriting the vfuncs from intel_ringbuffer.c, and ~only overloading the init/add_request vfuncs. i.e. call intel_blah_engine_init_execlists after setuping the legacy vfuncs and common init from intel_blah_engine_init. At the same time, we can apply some of the same improvements (such as irq_enable_mask) back to the older gen.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ success: Fi.CI.BAT
In reply to Tvrtko Ursulin== Summary ==
== Summary ==
Built on 06d0112e293dfdea7f796d4085f755898850947b drm-intel-nightly: 2016y-01m-12d-21h-16m-40s UTC integration manifest
Test gem_storedw_loop:
Subgroup basic-render:
dmesg-warn -> PASS (bdw-ultra)
Test kms_flip:
Subgroup basic-flip-vs-dpms:
dmesg-warn -> PASS (skl-i7k-2)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-a-frame-sequence:
fail -> PASS (snb-x220t)bdw-nuci7 total:138 pass:129 dwarn:0 dfail:0 fail:0 skip:9 bdw-ultra total:138 pass:132 dwarn:0 dfail:0 fail:0 skip:6 byt-nuc total:141 pass:123 dwarn:3 dfail:0 fail:0 skip:15 hsw-brixbox total:141 pass:134 dwarn:0 dfail:0 fail:0 skip:7 hsw-gt2 total:141 pass:137 dwarn:0 dfail:0 fail:0 skip:4 hsw-xps12 total:138 pass:133 dwarn:1 dfail:0 fail:0 skip:4 ivb-t430s total:135 pass:122 dwarn:3 dfail:4 fail:0 skip:6 skl-i7k-2 total:141 pass:131 dwarn:2 dfail:0 fail:0 skip:8 snb-dellxps total:141 pass:122 dwarn:5 dfail:0 fail:0 skip:14 snb-x220t total:141 pass:122 dwarn:5 dfail:0 fail:1 skip:13
Results at /archive/results/CI_IGT_test/Patchwork_1156/
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx