From: Jordan Justen <jordan.l.justen@intel.com>
Date: Fri, 11 Mar 2016 01:25:45 +0000 (-0800)
Subject: anv: Add flush_pipeline_before_pipeline_select
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c8ec65a1f5a85dbef3210dc49684fcfed49b7ea2;p=mesa.git

anv: Add flush_pipeline_before_pipeline_select

flush_pipeline_before_pipeline_select adds workarounds required before
switching the pipeline.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---

diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index d0a80f53e63..1ce53a81f1b 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -764,10 +764,31 @@ void genX(CmdDispatchIndirect)(
    anv_batch_emit(batch, GENX(MEDIA_STATE_FLUSH));
 }
 
+static void
+flush_pipeline_before_pipeline_select(struct anv_cmd_buffer *cmd_buffer,
+                                      uint32_t pipeline)
+{
+#if GEN_GEN >= 8 && GEN_GEN < 10
+   /* From the Broadwell PRM, Volume 2a: Instructions, PIPELINE_SELECT:
+    *
+    *   Software must clear the COLOR_CALC_STATE Valid field in
+    *   3DSTATE_CC_STATE_POINTERS command prior to send a PIPELINE_SELECT
+    *   with Pipeline Select set to GPGPU.
+    *
+    * The internal hardware docs recommend the same workaround for Gen9
+    * hardware too.
+    */
+   if (pipeline == GPGPU)
+      anv_batch_emit(&cmd_buffer->batch, GENX(3DSTATE_CC_STATE_POINTERS));
+#endif
+}
+
 void
 genX(flush_pipeline_select_3d)(struct anv_cmd_buffer *cmd_buffer)
 {
    if (cmd_buffer->state.current_pipeline != _3D) {
+      flush_pipeline_before_pipeline_select(cmd_buffer, _3D);
+
       anv_batch_emit(&cmd_buffer->batch, GENX(PIPELINE_SELECT),
 #if GEN_GEN >= 9
                      .MaskBits = 3,
@@ -781,19 +802,7 @@ void
 genX(flush_pipeline_select_gpgpu)(struct anv_cmd_buffer *cmd_buffer)
 {
    if (cmd_buffer->state.current_pipeline != GPGPU) {
-#if GEN_GEN >= 8 && GEN_GEN < 10
-      /* From the Broadwell PRM, Volume 2a: Instructions, PIPELINE_SELECT:
-       *
-       *   Software must clear the COLOR_CALC_STATE Valid field in
-       *   3DSTATE_CC_STATE_POINTERS command prior to send a PIPELINE_SELECT
-       *   with Pipeline Select set to GPGPU.
-       *
-       * The internal hardware docs recommend the same workaround for Gen9
-       * hardware too.
-       */
-      anv_batch_emit(&cmd_buffer->batch,
-                     GENX(3DSTATE_CC_STATE_POINTERS));
-#endif
+      flush_pipeline_before_pipeline_select(cmd_buffer, GPGPU);
 
       anv_batch_emit(&cmd_buffer->batch, GENX(PIPELINE_SELECT),
 #if GEN_GEN >= 9