| Message ID | 1406217891-8912-18-git-send-email-thomas.daniel@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jul 24, 2014 at 05:04:25PM +0100, Thomas Daniel wrote: > From: Oscar Mateo <oscar.mateo@intel.com> > > No mistery here: the seqno is still retrieved from the engine's > HW status page (the one in the default context. For the moment, > I see no reason to worry about other context's HWS page). > > Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> Ok, merged or bikeshedded up to this one. I need a bit a break to recharge, will continue later on. Cheers, Daniel > --- > drivers/gpu/drm/i915/intel_lrc.c | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c > index 7c8b75e..f171fd5 100644 > --- a/drivers/gpu/drm/i915/intel_lrc.c > +++ b/drivers/gpu/drm/i915/intel_lrc.c > @@ -149,6 +149,16 @@ static int gen8_init_render_ring(struct intel_engine_cs *ring) > return ret; > } > > +static u32 gen8_get_seqno(struct intel_engine_cs *ring, bool lazy_coherency) > +{ > + return intel_read_status_page(ring, I915_GEM_HWS_INDEX); > +} > + > +static void gen8_set_seqno(struct intel_engine_cs *ring, u32 seqno) > +{ > + intel_write_status_page(ring, I915_GEM_HWS_INDEX, seqno); > +} > + > void intel_logical_ring_cleanup(struct intel_engine_cs *ring) > { > if (!intel_ring_initialized(ring)) > @@ -221,6 +231,8 @@ static int logical_render_ring_init(struct drm_device *dev) > > ring->init = gen8_init_render_ring; > ring->cleanup = intel_fini_pipe_control; > + ring->get_seqno = gen8_get_seqno; > + ring->set_seqno = gen8_set_seqno; > > return logical_ring_init(dev, ring); > } > @@ -237,6 +249,8 @@ static int logical_bsd_ring_init(struct drm_device *dev) > GT_RENDER_USER_INTERRUPT << GEN8_VCS1_IRQ_SHIFT; > > ring->init = gen8_init_common_ring; > + ring->get_seqno = gen8_get_seqno; > + ring->set_seqno = gen8_set_seqno; > > return logical_ring_init(dev, ring); > } > @@ -253,6 +267,8 @@ static int logical_bsd2_ring_init(struct drm_device *dev) > GT_RENDER_USER_INTERRUPT << GEN8_VCS2_IRQ_SHIFT; > > ring->init = gen8_init_common_ring; > + ring->get_seqno = gen8_get_seqno; > + ring->set_seqno = gen8_set_seqno; > > return logical_ring_init(dev, ring); > } > @@ -269,6 +285,8 @@ static int logical_blt_ring_init(struct drm_device *dev) > GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT; > > ring->init = gen8_init_common_ring; > + ring->get_seqno = gen8_get_seqno; > + ring->set_seqno = gen8_set_seqno; > > return logical_ring_init(dev, ring); > } > @@ -285,6 +303,8 @@ static int logical_vebox_ring_init(struct drm_device *dev) > GT_RENDER_USER_INTERRUPT << GEN8_VECS_IRQ_SHIFT; > > ring->init = gen8_init_common_ring; > + ring->get_seqno = gen8_get_seqno; > + ring->set_seqno = gen8_set_seqno; > > return logical_ring_init(dev, ring); > } > -- > 1.7.9.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 7c8b75e..f171fd5 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -149,6 +149,16 @@ static int gen8_init_render_ring(struct intel_engine_cs *ring) return ret; } +static u32 gen8_get_seqno(struct intel_engine_cs *ring, bool lazy_coherency) +{ + return intel_read_status_page(ring, I915_GEM_HWS_INDEX); +} + +static void gen8_set_seqno(struct intel_engine_cs *ring, u32 seqno) +{ + intel_write_status_page(ring, I915_GEM_HWS_INDEX, seqno); +} + void intel_logical_ring_cleanup(struct intel_engine_cs *ring) { if (!intel_ring_initialized(ring)) @@ -221,6 +231,8 @@ static int logical_render_ring_init(struct drm_device *dev) ring->init = gen8_init_render_ring; ring->cleanup = intel_fini_pipe_control; + ring->get_seqno = gen8_get_seqno; + ring->set_seqno = gen8_set_seqno; return logical_ring_init(dev, ring); } @@ -237,6 +249,8 @@ static int logical_bsd_ring_init(struct drm_device *dev) GT_RENDER_USER_INTERRUPT << GEN8_VCS1_IRQ_SHIFT; ring->init = gen8_init_common_ring; + ring->get_seqno = gen8_get_seqno; + ring->set_seqno = gen8_set_seqno; return logical_ring_init(dev, ring); } @@ -253,6 +267,8 @@ static int logical_bsd2_ring_init(struct drm_device *dev) GT_RENDER_USER_INTERRUPT << GEN8_VCS2_IRQ_SHIFT; ring->init = gen8_init_common_ring; + ring->get_seqno = gen8_get_seqno; + ring->set_seqno = gen8_set_seqno; return logical_ring_init(dev, ring); } @@ -269,6 +285,8 @@ static int logical_blt_ring_init(struct drm_device *dev) GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT; ring->init = gen8_init_common_ring; + ring->get_seqno = gen8_get_seqno; + ring->set_seqno = gen8_set_seqno; return logical_ring_init(dev, ring); } @@ -285,6 +303,8 @@ static int logical_vebox_ring_init(struct drm_device *dev) GT_RENDER_USER_INTERRUPT << GEN8_VECS_IRQ_SHIFT; ring->init = gen8_init_common_ring; + ring->get_seqno = gen8_get_seqno; + ring->set_seqno = gen8_set_seqno; return logical_ring_init(dev, ring); }