summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_irq.c
diff options
context:
space:
mode:
authorOscar Mateo2014-05-22 15:13:36 +0200
committerDaniel Vetter2014-05-22 23:30:18 +0200
commit93b0a4e0b26e80d8ddf476024e834e675850df81 (patch)
treed548d6ad86885f230ae3cab68f9050d9c5fd0442 /drivers/gpu/drm/i915/i915_irq.c
parentdrm/i915: Split the ringbuffers from the rings (2/3) (diff)
downloadkernel-qcow2-linux-93b0a4e0b26e80d8ddf476024e834e675850df81.tar.gz
kernel-qcow2-linux-93b0a4e0b26e80d8ddf476024e834e675850df81.tar.xz
kernel-qcow2-linux-93b0a4e0b26e80d8ddf476024e834e675850df81.zip
drm/i915: Split the ringbuffers from the rings (3/3)
Manual cleanup after the previous Coccinelle script. Yes, I could write another Coccinelle script to do this but I don't want labor-replacing robots making an honest programmer's work obsolete (also, I'm lazy). Signed-off-by: Oscar Mateo <oscar.mateo@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r--drivers/gpu/drm/i915/i915_irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 152ba128405b..28bae6e4a424 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1219,7 +1219,7 @@ static void ironlake_rps_change_irq_handler(struct drm_device *dev)
static void notify_ring(struct drm_device *dev,
struct intel_engine_cs *ring)
{
- if (ring->buffer->obj == NULL)
+ if (!intel_ring_initialized(ring))
return;
trace_i915_gem_request_complete(ring);