forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915/bdw: GEN-specific logical ring set/get seqno

Browse source 
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>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Oscar Mateo 2014-07-24 17:04:25 +01:00 • committed by Daniel Vetter
commit e94e37ad19
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/gpu/drm/i915/intel_lrc.c
View file

@ -151,6 +151,16 @@ static int gen8_init_render_ring(struct intel_engine_cs *ring)
return ret; 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) void intel_logical_ring_cleanup(struct intel_engine_cs *ring)
{ {
if (!intel_ring_initialized(ring)) if (!intel_ring_initialized(ring))
@ -223,6 +233,8 @@ static int logical_render_ring_init(struct drm_device *dev)
ring->init = gen8_init_render_ring; ring->init = gen8_init_render_ring;
ring->cleanup = intel_fini_pipe_control; ring->cleanup = intel_fini_pipe_control;
ring->get_seqno = gen8_get_seqno;
ring->set_seqno = gen8_set_seqno;
return logical_ring_init(dev, ring); return logical_ring_init(dev, ring);
} }
@ -239,6 +251,8 @@ static int logical_bsd_ring_init(struct drm_device *dev)
GT_RENDER_USER_INTERRUPT << GEN8_VCS1_IRQ_SHIFT; GT_RENDER_USER_INTERRUPT << GEN8_VCS1_IRQ_SHIFT;
ring->init = gen8_init_common_ring; ring->init = gen8_init_common_ring;
ring->get_seqno = gen8_get_seqno;
ring->set_seqno = gen8_set_seqno;
return logical_ring_init(dev, ring); return logical_ring_init(dev, ring);
} }
@ -255,6 +269,8 @@ static int logical_bsd2_ring_init(struct drm_device *dev)
GT_RENDER_USER_INTERRUPT << GEN8_VCS2_IRQ_SHIFT; GT_RENDER_USER_INTERRUPT << GEN8_VCS2_IRQ_SHIFT;
ring->init = gen8_init_common_ring; ring->init = gen8_init_common_ring;
ring->get_seqno = gen8_get_seqno;
ring->set_seqno = gen8_set_seqno;
return logical_ring_init(dev, ring); return logical_ring_init(dev, ring);
} }
@ -271,6 +287,8 @@ static int logical_blt_ring_init(struct drm_device *dev)
GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT; GT_RENDER_USER_INTERRUPT << GEN8_BCS_IRQ_SHIFT;
ring->init = gen8_init_common_ring; ring->init = gen8_init_common_ring;
ring->get_seqno = gen8_get_seqno;
ring->set_seqno = gen8_set_seqno;
return logical_ring_init(dev, ring); return logical_ring_init(dev, ring);
} }
@ -287,6 +305,8 @@ static int logical_vebox_ring_init(struct drm_device *dev)
GT_RENDER_USER_INTERRUPT << GEN8_VECS_IRQ_SHIFT; GT_RENDER_USER_INTERRUPT << GEN8_VECS_IRQ_SHIFT;
ring->init = gen8_init_common_ring; ring->init = gen8_init_common_ring;
ring->get_seqno = gen8_get_seqno;
ring->set_seqno = gen8_set_seqno;
return logical_ring_init(dev, ring); return logical_ring_init(dev, ring);
} }