Skip to content

Remove the outstanding_lazy_request

[email protected] intel-gfx 1 version Applied

Status from this message: Queued for -next, thanks for the patch.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest53 patches 71 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/53drm/i915: Rename 'flags' to 'dispatch_flags' for better code readingdrivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_lrc.c drivers/gpu/drm/i915/intel_lrc.h +2 more+41 -352 replies
1/53drm/i915: Remove ironlake rc6 supportdrivers/gpu/drm/i915/i915_debugfs.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_display.c +2 more+0 -1734 replies
2/53drm/i915: Add missing trace point to LRC execbuff code pathdrivers/gpu/drm/i915/intel_lrc.c+2 -01 reply
3/53drm/i915: Cache ringbuf pointer in request structuredrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_lrc.c +1 more+8 -162 replies
4/53drm/i915: Merged the many do_execbuf() parameters into a structuredrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_lrc.c +1 more+67 -511 reply
4/53drm/i915: Merged the many do_execbuf() parameters into a structuredrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_lrc.c +1 more+71 -530 replies
5/53drm/i915: Add return code check to i915_gem_execbuffer_retire_commands()drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_lrc.c+9 -152 replies
6/53drm/i915: Wrap request allocation with a function pointerdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_lrc.c +3 more+14 -62 replies
7/53drm/i915: Early alloc request in execbuffdrivers/gpu/drm/i915/i915_gem_execbuffer.c+10 -31 reply
8/53drm/i915: Update alloc_request to return the allocated requestdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_lrc.c +3 more+27 -126 replies
9/53drm/i915: Add request to execbuf params and add explicit cleanupdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c+12 -21 reply
10/53drm/i915: Update the dispatch tracepoint to use params->requestdrivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_lrc.c+2 -21 reply
11/53drm/i915: Update move_to_gpu() to take a request structuredrivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_lrc.c+9 -111 reply
12/53drm/i915: Update execbuffer_move_to_active() to take a request structuredrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_lrc.c+5 -51 reply
13/53drm/i915: Add flag to i915_add_request() to skip the cache flushdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_execbuffer.c +2 more+19 -190 replies
14/53drm/i915: Update pin_to_display_plane() to do explicit request managementdrivers/gpu/drm/i915/i915_gem.c+18 -32 replies
15/53drm/i915: Update i915_gem_object_sync() to take a request structuredrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 more+7 -61 reply
16/53drm/i915: Update i915_gpu_idle() to manage its own requestdrivers/gpu/drm/i915/i915_gem.c+17 -11 reply
17/53drm/i915: Split i915_ppgtt_init_hw() in half - generic and per ringdrivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/i915_gem_gtt.h+32 -192 replies
18/53drm/i915: Moved the for_each_ring loop outside of i915_gem_context_enable()drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_context.c+23 -291 reply
19/53drm/i915: Add explicit request management to i915_gem_init_hw()drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_render_state.c +1 more+25 -71 reply
20/53drm/i915: Update ppgtt_init_ring() & context_enable() to take requestsdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_context.c +2 more+11 -102 replies
21/53drm/i915: Set context in request from creation even in legacy modedrivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_ringbuffer.c+3 -81 reply
21/53drm/i915: Set context in request from creation even in legacy modedrivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_ringbuffer.c+4 -80 replies
22/53drm/i915: Update i915_switch_context() to take a request structuredrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_context.c +1 more+12 -161 reply
23/53drm/i915: Update do_switch() to take a request structuredrivers/gpu/drm/i915/i915_gem_context.c+9 -81 reply
24/53drm/i915: Update deferred context creation to do explicit request managementdrivers/gpu/drm/i915/intel_lrc.c+16 -11 reply
25/53drm/i915: Update init_context() to take a request structuredrivers/gpu/drm/i915/i915_gem_context.c drivers/gpu/drm/i915/intel_lrc.c drivers/gpu/drm/i915/intel_ringbuffer.c +1 more+10 -131 reply
26/53drm/i915: Update render_state_init() to take a request structuredrivers/gpu/drm/i915/i915_gem_render_state.c drivers/gpu/drm/i915/i915_gem_render_state.h drivers/gpu/drm/i915/intel_lrc.c +1 more+21 -231 reply
27/53drm/i915: Update overlay code to do explicit request managementdrivers/gpu/drm/i915/intel_overlay.c+48 -161 reply
28/53drm/i915: Update queue_flip() to do explicit request managementdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_ringbuffer.c +1 more+30 -182 replies
29/53drm/i915: Update add_request() to take a request structuredrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_execbuffer.c +4 more+24 -231 reply
30/53drm/i915: Update [vma|object]_move_to_active() to take request structuresdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_context.c +3 more+13 -141 reply
31/53drm/i915: Update l3_remap to take a request structuredrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_context.c+5 -41 reply
32/53drm/i915: Update mi_set_context() to take a request structuredrivers/gpu/drm/i915/i915_gem_context.c+4 -51 reply
33/53drm/i915: Update a bunch of execbuffer heplers to take request structuresdrivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_lrc.c drivers/gpu/drm/i915/intel_ringbuffer.c +1 more+14 -121 reply
34/53drm/i915: Update workarounds_emit() to take request structuresdrivers/gpu/drm/i915/intel_lrc.c drivers/gpu/drm/i915/intel_ringbuffer.c+10 -101 reply
35/53drm/i915: Update flush_all_caches() to take request structuresdrivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_lrc.c drivers/gpu/drm/i915/intel_lrc.h +2 more+13 -141 reply
36/53drm/i915: Update switch_mm() to take a request structuredrivers/gpu/drm/i915/i915_gem_context.c drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/i915_gem_gtt.h+16 -111 reply
37/53drm/i915: Update ring->flush() to take a requests structuredrivers/gpu/drm/i915/i915_gem_context.c drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/intel_ringbuffer.c +1 more+24 -161 reply
38/53drm/i915: Update some flush helpers to take request structuresdrivers/gpu/drm/i915/intel_ringbuffer.c+16 -131 reply
39/53drm/i915: Update ring->emit_flush() to take a request structuredrivers/gpu/drm/i915/intel_lrc.c drivers/gpu/drm/i915/intel_ringbuffer.h+9 -111 reply
40/53drm/i915: Update ring->add_request() to take a request structuredrivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_ringbuffer.c drivers/gpu/drm/i915/intel_ringbuffer.h+14 -161 reply
41/53drm/i915: Update ring->emit_request() to take a request structuredrivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_lrc.c drivers/gpu/drm/i915/intel_ringbuffer.h+5 -71 reply
42/53drm/i915: Update ring->dispatch_execbuffer() to take a request structuredrivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/i915_gem_render_state.c drivers/gpu/drm/i915/intel_ringbuffer.c +1 more+16 -111 reply
43/53drm/i915: Update ring->emit_bb_start() to take a request structuredrivers/gpu/drm/i915/intel_lrc.c drivers/gpu/drm/i915/intel_ringbuffer.h+6 -91 reply
44/53drm/i915: Update ring->sync_to() to take a request structuredrivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_ringbuffer.c drivers/gpu/drm/i915/intel_ringbuffer.h+7 -51 reply
45/53drm/i915: Update ring->signal() to take a request structuredrivers/gpu/drm/i915/intel_ringbuffer.c drivers/gpu/drm/i915/intel_ringbuffer.h+11 -111 reply
46/53drm/i915: Update cacheline_align() to take a request structuredrivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_ringbuffer.c drivers/gpu/drm/i915/intel_ringbuffer.h+4 -31 reply
47/53drm/i915: Update ironlake_enable_rc6() to do explicit request managementdrivers/gpu/drm/i915/intel_pm.c+21 -100 replies
48/53drm/i915: Update intel_ring_begin() to take a request structuredrivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_context.c drivers/gpu/drm/i915/i915_gem_execbuffer.c +6 more+54 -581 reply
49/53drm/i915: Make intel_logical_ring_begin() staticdrivers/gpu/drm/i915/intel_lrc.c drivers/gpu/drm/i915/intel_lrc.h+197 -2001 reply
50/53drm/i915: Update intel_logical_ring_begin() to take a request structuredrivers/gpu/drm/i915/intel_lrc.c+15 -181 reply
51/53drm/i915: Remove the now obsolete intel_ring_get_request()drivers/gpu/drm/i915/intel_ringbuffer.h+0 -71 reply
52/53drm/i915: Remove the now obsolete 'outstanding_lazy_request'drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/intel_lrc.c +2 more+6 -414 replies
53/53drm/i915: Move the request/file and request/pid association to creation timedrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_execbuffer.c+44 -201 reply

Reviews trailers per patch

41 of 56 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchTomas Elf
SeriesR-b
1/53R-b
1/53R-b
2/53R-b
3/53R-b
4/53R-b
4/53R-b
5/53R-b
6/53R-b
7/53R-b
8/53R-b
9/53R-b
10/53R-b
11/53R-b
12/53R-b
13/53
14/53
15/53R-b
16/53R-b
17/53R-b
18/53R-b
19/53R-b
20/53
21/53
21/53
22/53R-b
23/53
24/53R-b
25/53R-b
26/53R-b
27/53R-b
28/53
29/53R-b
30/53R-b
31/53R-b
32/53R-b
33/53R-b
34/53R-b
35/53R-b
36/53
37/53
38/53R-b
39/53R-b
40/53R-b
41/53R-b
42/53R-b
43/53R-b
44/53
45/53R-b
46/53R-b
47/53
48/53
49/53R-b
50/53
51/53R-b
52/53
53/53

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 00/53] Remove the outstanding_lazy_request

From: John Harrison <[email protected]>

The driver tracks GPU work using request structures. Unfortunately, this tracking is not currently explicit but is done by means of a catch-all request that floats around in the background hoovering up work until it gets submitted. This background request (ring->outstanding_lazy_request or OLR) is created at the point of actually writing to the ring rather than when a particular piece of GPU work is started. This scheme sort of hangs together but causes a number of issues. It can mean that multiple pieces of independent work are lumped together in the same request or that work is not officially submitted until much later than it was created.

This patch series completely removes the OLR and explicitly tracks each piece of work with it's own personal request structure from start to submission.

The patch set seems to fix the "'gem_ringfill --r render' + ctrl-c straight after boot" issue logged as BZ:40112. I haven't done any analysis of that particular issue but the descriptions I've seen appear to blame an inconsistent or mangled OLR.

Note also that by the end of this series, a number of differences between the legacy and execlist code paths have been removed. For example add_request() and emit_request() now have the same signature thus could be merged back to a single function pointer. Merging some of these together would also allow the removal of a bunch of 'if(execlists)' tests where the difference is simply to call the legacy function or the execlist one.

v2: Rebased to newer nightly tree, fixed up a few minor issues, added two extra patches - one to move the LRC ring begin around in the vein of other recent reshuffles, the other to clean up some issues with i915_add_request().

[Patches against drm-intel-nightly tree fetched 13/02/2015]

John Harrison (53):
drm/i915: Rename 'flags' to 'dispatch_flags' for better code reading drm/i915: Add missing trace point to LRC execbuff code path drm/i915: Cache ringbuf pointer in request structure
drm/i915: Merged the many do_execbuf() parameters into a structure drm/i915: Add return code check to i915_gem_execbuffer_retire_commands() drm/i915: Wrap request allocation with a function pointer drm/i915: Early alloc request in execbuff
drm/i915: Update alloc_request to return the allocated request drm/i915: Add request to execbuf params and add explicit cleanup drm/i915: Update the dispatch tracepoint to use params->request drm/i915: Update move_to_gpu() to take a request structure drm/i915: Update execbuffer_move_to_active() to take a request structure drm/i915: Add flag to i915_add_request() to skip the cache flush drm/i915: Update pin_to_display_plane() to do explicit request management drm/i915: Update i915_gem_object_sync() to take a request structure drm/i915: Update i915_gpu_idle() to manage its own request drm/i915: Split i915_ppgtt_init_hw() in half - generic and per ring drm/i915: Moved the for_each_ring loop outside of i915_gem_context_enable() drm/i915: Add explicit request management to i915_gem_init_hw() drm/i915: Update ppgtt_init_ring() & context_enable() to take requests drm/i915: Set context in request from creation even in legacy mode drm/i915: Update i915_switch_context() to take a request structure drm/i915: Update do_switch() to take a request structure drm/i915: Update deferred context creation to do explicit request management drm/i915: Update init_context() to take a request structure drm/i915: Update render_state_init() to take a request structure drm/i915: Update overlay code to do explicit request management drm/i915: Update queue_flip() to do explicit request management drm/i915: Update add_request() to take a request structure drm/i915: Update [vma|object]_move_to_active() to take request structures drm/i915: Update l3_remap to take a request structure
drm/i915: Update mi_set_context() to take a request structure drm/i915: Update a bunch of execbuffer heplers to take request structures drm/i915: Update workarounds_emit() to take request structures drm/i915: Update flush_all_caches() to take request structures drm/i915: Update switch_mm() to take a request structure drm/i915: Update ring->flush() to take a requests structure drm/i915: Update some flush helpers to take request structures drm/i915: Update ring->emit_flush() to take a request structure drm/i915: Update ring->add_request() to take a request structure drm/i915: Update ring->emit_request() to take a request structure drm/i915: Update ring->dispatch_execbuffer() to take a request structure drm/i915: Update ring->emit_bb_start() to take a request structure drm/i915: Update ring->sync_to() to take a request structure drm/i915: Update ring->signal() to take a request structure drm/i915: Update cacheline_align() to take a request structure drm/i915: Update ironlake_enable_rc6() to do explicit request management drm/i915: Update intel_ring_begin() to take a request structure drm/i915: Make intel_logical_ring_begin() static
drm/i915: Update intel_logical_ring_begin() to take a request structure drm/i915: Remove the now obsolete intel_ring_get_request() drm/i915: Remove the now obsolete 'outstanding_lazy_request' drm/i915: Move the request/file and request/pid association to creation time

 drivers/gpu/drm/i915/i915_drv.h              |   72 ++--
 drivers/gpu/drm/i915/i915_gem.c              |  256 +++++++-----
 drivers/gpu/drm/i915/i915_gem_context.c      |   76 ++--
 drivers/gpu/drm/i915/i915_gem_execbuffer.c   |  141 ++++---
 drivers/gpu/drm/i915/i915_gem_gtt.c          |   58 +--
 drivers/gpu/drm/i915/i915_gem_gtt.h          |    3 +-
 drivers/gpu/drm/i915/i915_gem_render_state.c |   16 +-
 drivers/gpu/drm/i915/i915_gem_render_state.h |    2 +-
 drivers/gpu/drm/i915/intel_display.c         |   55 ++-
 drivers/gpu/drm/i915/intel_lrc.c             |  553 +++++++++++++-------------
 drivers/gpu/drm/i915/intel_lrc.h             |   18 +-
 drivers/gpu/drm/i915/intel_overlay.c         |   64 ++-
 drivers/gpu/drm/i915/intel_pm.c              |   33 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c      |  287 ++++++-------
 drivers/gpu/drm/i915/intel_ringbuffer.h      |   51 +--
 15 files changed, 918 insertions(+), 767 deletions(-)
Signature · 6 lines
1.7.9.5

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx