Mesa (master): Revert "i965/compaction: Disable compaction on SNB temporarily."

Matt Turner mattst88 at kemper.freedesktop.org
Thu Oct 30 04:38:06 UTC 2014


Module: Mesa
Branch: master
Commit: 600066af93fe60abbfff5be82527b529e1e44916
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=600066af93fe60abbfff5be82527b529e1e44916

Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Oct 29 21:38:39 2014 -0700

Revert "i965/compaction: Disable compaction on SNB temporarily."

This reverts commit cabc93c5adc9ea62be901621eff5ce4cb9574791.

Mark thinks the failures on the SNB GT2 in the lab are actually because
of faulty hardware, not instruction compaction. The GT1 didn't see any
problems after changes to the compaction code.

---

 src/mesa/drivers/dri/i965/brw_eu_compact.c |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_eu_compact.c b/src/mesa/drivers/dri/i965/brw_eu_compact.c
index 048f430..e660ad3 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_compact.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_compact.c
@@ -1311,12 +1311,6 @@ brw_compact_instructions(struct brw_compile *p, int start_offset,
     */
    int old_ip[(p->next_insn_offset - start_offset) / sizeof(brw_compact_inst)];
 
-   /* FIXME: Mark reported that SNB GT2 (GT1 appears fine) is hanging after
-    * commit a36631b74.
-    */
-   if (brw->gen == 6)
-      return;
-
    if (brw->gen == 4 && !brw->is_g4x)
       return;
 




More information about the mesa-commit mailing list