[Bug 74100] [SNB Bisected]igt/gem_reset_stats/close-pending-fork-render causes system hang

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=74100

--- Comment #9 from lu hua <huax.lu at intel.com> ---
patching file drivers/gpu/drm/i915/intel_uncore.c
Hunk #1 FAILED at 989.
1 out of 1 hunk FAILED -- saving rejects to file
drivers/gpu/drm/i915/intel_uncore.c.rej

drivers/gpu/drm/i915/intel_uncore.c :
        if (fw_engine)
                dev_priv->uncore.funcs.force_wake_get(dev_priv, fw_engine);

        if (IS_GEN6(dev) || IS_GEN7(dev))
                dev_priv->uncore.fifo_count =
                        __raw_i915_read32(dev_priv, GTFIFOCTL) &
                        GT_FIFO_FREE_ENTRIES_MASK;

        spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
        return ret;
}

int intel_gpu_reset(struct drm_device *dev)

patch:
@@ -989,9 +989,11 @@  static int gen6_do_reset(struct drm_device *dev)
     if (fw_engine)
         dev_priv->uncore.funcs.force_wake_get(dev_priv, fw_engine);

-    if (IS_GEN6(dev) || IS_GEN7(dev))
-        WARN_ON((__raw_i915_read32(dev_priv, GTFIFOCTL) &
-             GT_FIFO_FREE_ENTRIES_MASK) != 0);
+    if (IS_GEN6(dev) || IS_GEN7(dev)) {
+        if (WARN_ON((__raw_i915_read32(dev_priv, GTFIFOCTL) &
+                 GT_FIFO_FREE_ENTRIES_MASK) != 0))
+            ret = -EIO;
+    }

     dev_priv->uncore.fifo_count = 0;

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are on the CC list for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20140311/eaac982c/attachment.html>