diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-01 13:23:27 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-10-01 14:48:20 +0100 |
| commit | 2fa772f34042cd4ddfb4ffaf5c24f0ce8c1025e9 (patch) | |
| tree | 26aa881ce29bb967bd0afb70e2e924755e70a29a /drivers/gpu/drm/i915/i915_irq.c | |
| parent | dc96e9b8e37641d9d15a8a4cdd18ed7680d8f546 (diff) | |
| download | kernel_samsung_espresso10-2fa772f34042cd4ddfb4ffaf5c24f0ce8c1025e9.zip kernel_samsung_espresso10-2fa772f34042cd4ddfb4ffaf5c24f0ce8c1025e9.tar.gz kernel_samsung_espresso10-2fa772f34042cd4ddfb4ffaf5c24f0ce8c1025e9.tar.bz2 | |
drm/i915: Only print 'generating error event' if we actually are
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index aaa0f1b..64c07c2 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -396,7 +396,6 @@ static void i915_error_work_func(struct work_struct *work) char *reset_event[] = { "RESET=1", NULL }; char *reset_done_event[] = { "ERROR=0", NULL }; - DRM_DEBUG_DRIVER("generating error event\n"); kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, error_event); if (atomic_read(&dev_priv->mm.wedged)) { @@ -574,8 +573,10 @@ static void i915_capture_error_state(struct drm_device *dev) return; } + DRM_DEBUG_DRIVER("generating error event\n"); + error->seqno = - dev_priv->render_ring.get_seqno(dev, &dev_priv->render_ring); + dev_priv->render_ring.get_seqno(dev, &dev_priv->render_ring); error->eir = I915_READ(EIR); error->pgtbl_er = I915_READ(PGTBL_ER); error->pipeastat = I915_READ(PIPEASTAT); |