mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 18:39:59 +00:00
Code Issues Releases Wiki Activity

drm/i915: Only add the lazy request if we end up waiting for it.

Browse source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2010-11-10 20:40:02 +00:00
parent 33d2323711
commit 5d97eb69bd
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/gpu/drm/i915/i915_gem.c
View file

@ -1664,9 +1664,7 @@ i915_gem_next_request_seqno(struct drm_device *dev,
struct intel_ring_buffer *ring)
{
drm_i915_private_t *dev_priv = dev->dev_private;
ring->outstanding_lazy_request = true;
return dev_priv->next_seqno;
return ring->outstanding_lazy_request = dev_priv->next_seqno;
}
static void
@ -2072,7 +2070,7 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno,
if (atomic_read(&dev_priv->mm.wedged))
return -EAGAIN;
if (ring->outstanding_lazy_request) {
if (seqno == ring->outstanding_lazy_request) {
struct drm_i915_gem_request *request;
request = kzalloc(sizeof(*request), GFP_KERNEL);
@ -2087,7 +2085,6 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno,
seqno = request->seqno;
}
BUG_ON(seqno == dev_priv->next_seqno);
if (!i915_seqno_passed(ring->get_seqno(ring), seqno)) {
if (HAS_PCH_SPLIT(dev))
@ -3973,7 +3970,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
i915_retire_commands(dev, ring);
if (i915_add_request(dev, file, request, ring))
ring->outstanding_lazy_request = true;
i915_gem_next_request_seqno(dev, ring);
else
request = NULL;

2
drivers/gpu/drm/i915/intel_ringbuffer.h
View file

@ -87,7 +87,7 @@ struct intel_ring_buffer {
/**
* Do we have some not yet emitted requests outstanding?
*/
bool outstanding_lazy_request;
u32 outstanding_lazy_request;
wait_queue_head_t irq_queue;
drm_local_map_t map;