]> rtime.felk.cvut.cz Git - mcf548x/linux.git/commitdiff
drm/i915: Don't let an oops get triggered from irq_emit without dma init.
authorEric Anholt <eric@anholt.net>
Thu, 16 Apr 2009 20:46:12 +0000 (13:46 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 17 Apr 2009 20:30:50 +0000 (13:30 -0700)
Userland is broken if it's trying this, but we also shouldn't allow oopses.

Signed-off-by: Eric Anholt <eric@anholt.net>
drivers/gpu/drm/i915/i915_irq.c

index ee7ce7b78cf79b9dd0d18033866c83fd2d060d1e..98bb4c878c4ef892a5aeb42b64a335e95eb45b24 100644 (file)
@@ -406,7 +406,7 @@ int i915_irq_emit(struct drm_device *dev, void *data,
        drm_i915_irq_emit_t *emit = data;
        int result;
 
-       if (!dev_priv) {
+       if (!dev_priv || !dev_priv->ring.virtual_start) {
                DRM_ERROR("called with no initialization\n");
                return -EINVAL;
        }