From 72e04a62486a74daf9cfedd3f784904c5573a3f3 Mon Sep 17 00:00:00 2001
From: Jordan Justen <jordan.l.justen@intel.com>
Date: Tue, 29 Jun 2021 01:52:16 -0700
Subject: [PATCH] intel/gfx7: Change GPGPU Mode to bool

Suggested-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11564>
---
 src/gallium/drivers/crocus/crocus_state.c     | 2 +-
 src/intel/blorp/blorp_genX_exec.h             | 2 +-
 src/intel/genxml/gen7.xml                     | 2 +-
 src/intel/genxml/gen75.xml                    | 2 +-
 src/mesa/drivers/dri/i965/genX_state_upload.c | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/crocus/crocus_state.c b/src/gallium/drivers/crocus/crocus_state.c
index 273a259ef7f..f142a7187ec 100644
--- a/src/gallium/drivers/crocus/crocus_state.c
+++ b/src/gallium/drivers/crocus/crocus_state.c
@@ -8092,7 +8092,7 @@ crocus_upload_compute_state(struct crocus_context *ice,
             Resettingrelativetimerandlatchingtheglobaltimestamp;
          vfe.BypassGatewayControl = true;
 #if GFX_VER == 7
-         vfe.GPGPUMode = 1;
+         vfe.GPGPUMode = true;
 #endif
 #if GFX_VER == 8
          vfe.BypassGatewayControl = true;
diff --git a/src/intel/blorp/blorp_genX_exec.h b/src/intel/blorp/blorp_genX_exec.h
index 9cb89224466..3aaadae5299 100644
--- a/src/intel/blorp/blorp_genX_exec.h
+++ b/src/intel/blorp/blorp_genX_exec.h
@@ -2169,7 +2169,7 @@ blorp_exec_compute(struct blorp_batch *batch, const struct blorp_params *params)
       vfe.BypassGatewayControl = BypassingOpenGatewayCloseGatewayprotocol;
 #endif
 #if GFX_VER == 7
-      vfe.GPGPUMode = 1;
+      vfe.GPGPUMode = true;
 #endif
       vfe.URBEntryAllocationSize = GFX_VER >= 8 ? 2 : 0;
 
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index cb09a052265..d7367382342 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -1931,7 +1931,7 @@
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Per Thread Scratch Space" start="32" end="35" type="uint"/>
     <field name="Scratch Space Base Pointer" start="42" end="63" type="address"/>
-    <field name="GPGPU Mode" start="66" end="66" type="uint"/>
+    <field name="GPGPU Mode" start="66" end="66" type="bool"/>
     <field name="Gateway MMIO Access Control" start="67" end="68" type="uint">
       <value name="No MMIO read/write allowed" value="0"/>
       <value name="MMIO read/write to any address" value="2"/>
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index e682d397ebf..1f29e2e24ec 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -2305,7 +2305,7 @@
     <field name="Per Thread Scratch Space" start="32" end="35" type="uint"/>
     <field name="Stack Size" start="36" end="39" type="uint"/>
     <field name="Scratch Space Base Pointer" start="42" end="63" type="address"/>
-    <field name="GPGPU Mode" start="66" end="66" type="uint"/>
+    <field name="GPGPU Mode" start="66" end="66" type="bool"/>
     <field name="Bypass Gateway Control" start="70" end="70" type="uint">
       <value name="Maintaining OpenGateway/ForwardMsg/CloseGateway protocol (legacy mode)" value="0"/>
       <value name="Bypassing OpenGateway/CloseGateway protocol" value="1"/>
diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c
index 511c194662f..f34b5823289 100644
--- a/src/mesa/drivers/dri/i965/genX_state_upload.c
+++ b/src/mesa/drivers/dri/i965/genX_state_upload.c
@@ -4332,7 +4332,7 @@ genX(upload_cs_state)(struct brw_context *brw)
       vfe.BypassGatewayControl = BypassingOpenGatewayCloseGatewayprotocol;
 #endif
 #if GFX_VER == 7
-      vfe.GPGPUMode = 1;
+      vfe.GPGPUMode = true;
 #endif
 
       /* We are uploading duplicated copies of push constant uniforms for each