dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

drm/i915: Simplify flushing activity on the ring 

As we now always preallocate the seqno before writing to the ring, we
can trivially test if we have any pending activity on the ring by
inspecting the olr. This makes it then possible to flush operations that
are not normally associated with a request, like power-management.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Chris Wilson 2012-11-27 16:22:53 +00:00 committed by Daniel Vetter
parent 9d7730914f
commit b662a06632
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/i915_gem.c
View File

@ -2485,13 +2485,9 @@ static int i915_ring_idle(struct intel_ring_buffer *ring)
u32 seqno;
int ret;
/* We need to add any requests required to flush the objects */
if (!list_empty(&ring->active_list)) {
seqno = list_entry(ring->active_list.prev,
struct drm_i915_gem_object,
ring_list)->last_read_seqno;
ret = i915_gem_check_olr(ring, seqno);
/* We need to add any requests required to flush the objects and ring */
if (ring->outstanding_lazy_request) {
ret = i915_add_request(ring, NULL, NULL);
if (ret)
return ret;
}