drm/i915: Split alloc from init for lrc
Subsystems (2)
PATCH 1/1 drm/i915: Split alloc from init for lrc
Extend init/init_hw split to context init.
- Move context initialisation in to i915_gem_init_hw
- Move one off initialisation for render ring to i915_gem_validate_context
- Move default context initialisation to logical_ring_init
Rename intel_lr_context_deferred_create to intel_lr_context_deferred_alloc, to reflect reduced functionality & alloc/init split.
This patch is intended to split out the allocation of resources & initialisation to allow easier reuse of code for resume/gpu reset.
v2: Removed function ptr wrapping of do_switch_context (Daniel Vetter)
Left ->init_context int intel_lr_context_deferred_alloc (Daniel Vetter)
Remove unnecessary init flag & ring type test. (Daniel Vetter) Improve commit message (Daniel Vetter)
v3: On init/reinit, set the hw next sequence number to the sw next
sequence number. This is set to 1 at driver load time. This prevents the seqno being reset on reinit (Chris Wilson)
v4: Set seqno back to ~0 - 0x1000 at start-of-day, and increment by 0x100
on reset.
This makes it obvious which bbs are which after a reset. (David Gordon & John Harrison)
Rebase.
v5: Rebase. Fixed rebase breakage. Put context pinning in separate
function. Removed code churn. (Thomas Daniel)
Issue: VIZ-4798
--- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 22 ++-- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/intel_lrc.c | 164 ++++++++++++++--------------- drivers/gpu/drm/i915/intel_lrc.h | 4 +- 5 files changed, 99 insertions(+), 94 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -890,7 +890,6 @@ struct intel_context { } legacy_hw_ctx;/* Execlists */ -bool rcs_initialized;struct {struct drm_i915_gem_object *state;struct intel_ringbuffer *ringbuf;
drivers/gpu/drm/i915/i915_gem.c +16 -6
@@ -4613,14 +4613,8 @@ int i915_gem_init_rings(struct drm_device *dev) goto cleanup_vebox_ring; } - ret =i915_gem_set_seqno (dev, ((u32 )~0 -0x1000 )); -if (ret) - goto cleanup_bsd2_ring; -return 0 ; -cleanup_bsd2_ring: -intel_cleanup_ring_buffer (&dev_priv->ring[VCS2 ]); cleanup_vebox_ring:intel_cleanup_ring_buffer (&dev_priv->ring[VECS ]); cleanup_blt_ring:
@@ -4706,6 +4700,14 @@ i915_gem_init_hw(struct drm_device *dev) goto out; } +/* +* Increment the next seqno by 0x100 so we have a visible break +* on re-initialisation +*/ + ret =i915_gem_set_seqno (dev, dev_priv->next_seqno+0x100 ); +if (ret) + goto out; +/* Now it is safe to go back round and do everything else: */ for_each_ring (ring, dev_priv, i) {struct drm_i915_gem_request *req;
@@ -4907,6 +4909,14 @@ i915_gem_load(struct drm_device *dev) dev_priv->num_fence_regs =I915_READ (vgtif_reg (avail_rs.fence_num)); +/* +* Set initial sequence number for requests. +* Using this number allows the wraparound to happen early, +* catching any obvious problems. +*/ + dev_priv->next_seqno = ((u32 )~0 -0x1100 ); + dev_priv->last_seqno = ((u32 )~0 -0x1101 ); +/* Initialize fence registers to zero */ INIT_LIST_HEAD (&dev_priv->mm.fence_list);i915_gem_restore_fences (dev);
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -1009,7 +1009,7 @@ i915_gem_validate_context(struct drm_device *dev, struct drm_file *file, }if (i915.enable_execlists && !ctx->engine[ring->id].state) { -int ret =intel_lr_context_deferred_create (ctx, ring); +int ret =intel_lr_context_deferred_alloc (ctx, ring);if (ret) {DRM_DEBUG ("Could not create LRC %u: %d\n" , ctx_id, ret);return ERR_PTR (ret);
drivers/gpu/drm/i915/intel_lrc.c +80 -84
252 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.h +2 -2
@@ -75,8 +75,8 @@ static inline void intel_logical_ring_emit(struct intel_ringbuffer *ringbuf,#define LRC_STATE_PN (LRC_PPHWSP_PN + 1)void intel_lr_context_free (struct intel_context *ctx); -int intel_lr_context_deferred_create (struct intel_context *ctx, -struct intel_engine_cs *ring); +int intel_lr_context_deferred_alloc (struct intel_context *ctx, +struct intel_engine_cs *ring);void intel_lr_context_unpin (struct drm_i915_gem_request *req);void intel_lr_context_reset (struct drm_device *dev,struct intel_context *ctx);
Signature · 6 lines
2.1.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx