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)
Issue: VIZ-4798
--- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 12 +-- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +- drivers/gpu/drm/i915/intel_lrc.c | 147 ++++++++++++++--------------- drivers/gpu/drm/i915/intel_lrc.h | 4 +- 5 files changed, 80 insertions(+), 87 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -880,7 +880,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 +5 -7
@@ -4603,14 +4603,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:
@@ -4629,6 +4623,7 @@ i915_gem_init_hw(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_engine_cs *ring;int ret, i, j; +struct drm_i915_gem_request *req;if (INTEL_INFO (dev)->gen <6 && !intel_enable_gtt ())return -EIO ;
@@ -4680,9 +4675,12 @@ i915_gem_init_hw(struct drm_device *dev) goto out; } + ret =i915_gem_set_seqno (dev, ((u32 )~0 -0x1000 )); +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;WARN_ON (!ring->default_context);
drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 -1
@@ -994,6 +994,7 @@ i915_gem_validate_context(struct drm_device *dev, struct drm_file *file, {struct intel_context *ctx =NULL ;struct i915_ctx_hang_stats *hs; +int ret;if (ring->id !=RCS && ctx_id !=DEFAULT_CONTEXT_HANDLE )return ERR_PTR (-EINVAL );
@@ -1009,7 +1010,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); + 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 +71 -76
227 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.h +2 -2
@@ -69,8 +69,8 @@ static inline void intel_logical_ring_emit(struct intel_ringbuffer *ringbuf,/* Logical Ring Contexts */ 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
Quoted 69 lines · Nick Hoath
Extend
init/init_hwsplit to context init.
- Move context initialisation in toi915_gem_init_hw
- Move one off initialisation for render ring toi915_gem_validate_context
- Move default context initialisation tological_ring_initRename
intel_lr_context_deferred_createtointel_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 intintel_lr_context_deferred_alloc(Daniel Vetter) Remove unnecessary init flag & ring type test. (Daniel Vetter) Improve commit message (Daniel Vetter)Issue: VIZ-4798
Signed-off-by Nick Hoath <[email protected]>Cc Daniel Vetter <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 12 +-- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +- drivers/gpu/drm/i915/intel_lrc.c | 147 ++++++++++++++--------------- drivers/gpu/drm/i915/intel_lrc.h | 4 +- 5 files changed, 80 insertions(+), 87 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -880,7 +880,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 +1
-6@@ -4603,14 +4603,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:@@ -4629,6 +4623,7 @@ i915_gem_init_hw(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_engine_cs *ring;int ret, i, j; +struct drm_i915_gem_request *req;if (INTEL_INFO (dev)->gen <6 && !intel_enable_gtt ())return -EIO ;
drivers/gpu/drm/i915/i915_gem.c i915_gem_init_hw(struct drm_device *dev) · line 4680
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem.c +3
-0@@ -4680,9 +4675,12 @@ i915_gem_init_hw(struct drm_device *dev) goto out; } + ret =i915_gem_set_seqno (dev, ((u32 )~0 -0x1000 )); +if (ret) + goto out;
This is the wrong location. Just kill set_seqno, the experiment has run its course and we now have a n igt to exercise seqno wraparound. -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
Quoted 73 lines · Chris Wilson
Quoted 72 lines · Nick Hoath
Extend
init/init_hwsplit to context init.
- Move context initialisation in toi915_gem_init_hw
- Move one off initialisation for render ring toi915_gem_validate_context
- Move default context initialisation tological_ring_initRename
intel_lr_context_deferred_createtointel_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 intintel_lr_context_deferred_alloc(Daniel Vetter) Remove unnecessary init flag & ring type test. (Daniel Vetter) Improve commit message (Daniel Vetter)Issue: VIZ-4798
Signed-off-by Nick Hoath <[email protected]>Cc Daniel Vetter <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 12 +-- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 +- drivers/gpu/drm/i915/intel_lrc.c | 147 ++++++++++++++--------------- drivers/gpu/drm/i915/intel_lrc.h | 4 +- 5 files changed, 80 insertions(+), 87 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-1@@ -880,7 +880,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 +1
-6@@ -4603,14 +4603,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:@@ -4629,6 +4623,7 @@ i915_gem_init_hw(struct drm_device *dev)struct drm_i915_private *dev_priv = dev->dev_private;struct intel_engine_cs *ring;int ret, i, j; +struct drm_i915_gem_request *req;if (INTEL_INFO (dev)->gen <6 && !intel_enable_gtt ())return -EIO ;@@ -4680,9 +4675,12 @@ i915_gem_init_hw(struct drm_device *dev) goto out; }
Quoted 6 lines
drivers/gpu/drm/i915/i915_gem.c i915_gem_init_hw(struct drm_device *dev) · line 4680
Quoted 3 lines
drivers/gpu/drm/i915/i915_gem.c +3
-0+ ret =i915_gem_set_seqno (dev, ((u32 )~0 -0x1000 )); +if (ret) + goto out;This is the wrong location. Just kill
set_seqno, the experiment has run its course and we now have a n igt to exercise seqno wraparound.
It has to be here as the seqno has to be initialised before it is used to create requests for the initialisation. According to the commit history, the seqno has to be initialised to non-zero for proper functioning. Is this no longer true? Maybe it should just be set to 1 instead of ~0-0x1000
Quoted 2 lines
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Nick Hoath
Quoted 2 lines
This is the wrong location. Just kill
set_seqno, the experiment has run its course and we now have a n igt to exercise seqno wraparound.It has to be here as the seqno has to be initialised before it is used to create requests for the initialisation.
It is the wrong location as init_hw() is called as part of resume and reset, both times where we don't want to actually touch seqno.
Quoted 3 lines
According to the commit history, the seqno has to be initialised to non-zero for proper functioning. Is this no longer true? Maybe it should just be set to 1 instead of ~0-0x1000
Nope. It was set to non-zero purely to test wraparound, or rather the call to set_seqno was added purely to test wraparound. Nowadays, we can just set it to 1 and use explicit testing to catch bugs. -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
Quoted 8 lines · Chris Wilson
Quoted 4 lines · Nick Hoath
Quoted 2 lines
This is the wrong location. Just kill
set_seqno, the experiment has run its course and we now have a n igt to exercise seqno wraparound.It has to be here as the seqno has to be initialised before it is used to create requests for the initialisation.
It is the wrong location as
init_hw()is called as part of resume and reset, both times where we don't want to actually touch seqno.
Hm I thought it also makes sure to update the hws to avoid the driver getting confused, which is probably something we should be doing on resume (since the hws is in stolen) because hibernate.
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Daniel Vetter
Quoted 6 lines · Chris Wilson
Quoted 4 lines · Nick Hoath
Quoted 2 lines
This is the wrong location. Just kill
set_seqno, the experiment has run its course and we now have a n igt to exercise seqno wraparound.It has to be here as the seqno has to be initialised before it is used to create requests for the initialisation.
Quoted 6 lines
Quoted 2 lines
It is the wrong location as
init_hw()is called as part of resume and reset, both times where we don't want to actually touch seqno.Hm I thought it also makes sure to update the hws to avoid the driver getting confused, which is probably something we should be doing on resume (since the hws is in stolen) because hibernate.
The hws page can't be in stolen since we need CPU access to it and the powers-that-be have said no.
-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
Task id: 7229 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
ILK -1 302/302 301/302
SNB 315/315 315/315 IVB 336/336 336/336 BYT 283/283 283/283 HSW 378/378 378/378
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*ILK igt@kms_flip@flip-vs-dpms-interruptible PASS(1) DMESG_WARN(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx