diff options
-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 aaa0f1b9d6e..64c07c24e30 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) | |||
396 | char *reset_event[] = { "RESET=1", NULL }; | 396 | char *reset_event[] = { "RESET=1", NULL }; |
397 | char *reset_done_event[] = { "ERROR=0", NULL }; | 397 | char *reset_done_event[] = { "ERROR=0", NULL }; |
398 | 398 | ||
399 | DRM_DEBUG_DRIVER("generating error event\n"); | ||
400 | kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, error_event); | 399 | kobject_uevent_env(&dev->primary->kdev.kobj, KOBJ_CHANGE, error_event); |
401 | 400 | ||
402 | if (atomic_read(&dev_priv->mm.wedged)) { | 401 | if (atomic_read(&dev_priv->mm.wedged)) { |
@@ -574,8 +573,10 @@ static void i915_capture_error_state(struct drm_device *dev) | |||
574 | return; | 573 | return; |
575 | } | 574 | } |
576 | 575 | ||
576 | DRM_DEBUG_DRIVER("generating error event\n"); | ||
577 | |||
577 | error->seqno = | 578 | error->seqno = |
578 | dev_priv->render_ring.get_seqno(dev, &dev_priv->render_ring); | 579 | dev_priv->render_ring.get_seqno(dev, &dev_priv->render_ring); |
579 | error->eir = I915_READ(EIR); | 580 | error->eir = I915_READ(EIR); |
580 | error->pgtbl_er = I915_READ(PGTBL_ER); | 581 | error->pgtbl_er = I915_READ(PGTBL_ER); |
581 | error->pipeastat = I915_READ(PIPEASTAT); | 582 | error->pipeastat = I915_READ(PIPEASTAT); |