From 869bbf79e1abf438b3510050967e4c3a966784fa Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 1 Oct 2010 13:23:27 +0100 Subject: [PATCH] --- yaml --- r: 218135 b: refs/heads/master c: 2fa772f34042cd4ddfb4ffaf5c24f0ce8c1025e9 h: refs/heads/master i: 218133: 8db290ed4af1fe3c538e24cd9ca242688177fe22 218131: f5461a53f83e7e72320f186d59cf40be0b0b6e06 218127: 58948254abf8653355ad03665840770fda339fef v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_irq.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 10a4dd99ace0..92896ddabc01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc96e9b8e37641d9d15a8a4cdd18ed7680d8f546 +refs/heads/master: 2fa772f34042cd4ddfb4ffaf5c24f0ce8c1025e9 diff --git a/trunk/drivers/gpu/drm/i915/i915_irq.c b/trunk/drivers/gpu/drm/i915/i915_irq.c index aaa0f1b9d6e1..64c07c24e300 100644 --- a/trunk/drivers/gpu/drm/i915/i915_irq.c +++ b/trunk/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);