commit 9cb84eec8fe2ca6abbf9c5866ef613864b2e1d5f
author Chia-I Wu <olvaffe@gmail.com> Thu Aug 28 10:12:34 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Thu Aug 28 11:22:02 2014 +0800
tree 94fa1bb057cacac19de6411763bd54694d118016
parent d85c1d63fa56f77f5a926df60ce0a1b9828145b9

intel: need only one WA flag so far

We need GEN6_WA_POST_SYNC_FLUSH because we emit the workaround in multiple
places, while we only want the flush to show up in the batch buffer once.  It
is different from the other two workarounds.

icd/intel/cmd_pipeline.c

diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index c909596..dd0cbf6 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -33,7 +33,6 @@
 
 enum {
     GEN6_WA_POST_SYNC_FLUSH     = 1 << 0,
-    GEN6_WA_DS_FLUSH            = 1 << 1,
 };
 
 static void gen6_3DPRIMITIVE(struct intel_cmd *cmd,
@@ -608,6 +607,9 @@
 
 static void gen6_wa_wm_multisample_flush(struct intel_cmd *cmd)
 {
+    if (!cmd->bind.draw_count)
+        return;
+
    CMD_ASSERT(cmd, 6, 6);
 
    gen6_wa_post_sync_flush(cmd);
@@ -631,13 +633,8 @@
     if (!cmd->bind.draw_count)
         return;
 
-    if (cmd->bind.wa_flags & GEN6_WA_DS_FLUSH)
-        return;
-
     CMD_ASSERT(cmd, 6, 7.5);
 
-    cmd->bind.wa_flags |= GEN6_WA_DS_FLUSH;
-
     gen6_wa_post_sync_flush(cmd);
 
     gen6_PIPE_CONTROL(cmd, GEN6_PIPE_CONTROL_DEPTH_STALL, NULL, 0);
@@ -961,10 +958,7 @@
                 &cmd->bind.pipeline.graphics->vs);
         gen7_pcb(cmd, GEN6_RENDER_OPCODE_3DSTATE_CONSTANT_PS,
                 &cmd->bind.pipeline.graphics->fs);
-        // TODO: URB
     } else {
-        /* need multisample flush on gen6 */
-        gen6_wa_wm_multisample_flush(cmd);
         gen6_cc_states(cmd);
         gen6_viewport_states(cmd);
 
@@ -976,8 +970,11 @@
 
     emit_ps_resources(cmd, cmd->bind.pipeline.graphics->fs_rmap);
 
-    /* 3DSTATE_MULTISAMPLE and 3DSTATE_SAMPLE_MASK */
     gen6_wa_post_sync_flush(cmd);
+    /* need multisample flush on gen6 */
+    if (cmd_gen(cmd) == INTEL_GEN(6))
+        gen6_wa_wm_multisample_flush(cmd);
+    /* 3DSTATE_MULTISAMPLE and 3DSTATE_SAMPLE_MASK */
     cmd_batch_reserve(cmd, msaa->cmd_len);
     cmd_batch_write_n(cmd, msaa->cmd, msaa->cmd_len);