From f93bc14618ae22a3d3b8030be6ba58d589f0bab8 Mon Sep 17 00:00:00 2001
From: Nanley Chery <nanley.g.chery@intel.com>
Date: Fri, 9 Aug 2019 17:18:48 -0700
Subject: [PATCH] intel: Use 3DSTATE_DEPTH_BUFFER::ControlSurfaceEnable

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---
 src/intel/genxml/gen12.xml             | 1 +
 src/intel/isl/isl_emit_depth_stencil.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index 1e8c0908851..8970ddf51a8 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -1584,6 +1584,7 @@
     <field name="Command SubType" start="27" end="28" type="uint" default="3"/>
     <field name="Command Type" start="29" end="31" type="uint" default="3"/>
     <field name="Surface Pitch" start="32" end="49" type="uint"/>
+    <field name="Control Surface Enable" start="51" end="51" type="bool"/>
     <field name="Depth Buffer Compression Enable" start="53" end="53" type="bool"/>
     <field name="Hierarchical Depth Buffer Enable" start="54" end="54" type="bool"/>
     <field name="Corner Texel Mode" start="55" end="55" type="bool"/>
diff --git a/src/intel/isl/isl_emit_depth_stencil.c b/src/intel/isl/isl_emit_depth_stencil.c
index e28ec836255..c3815a6ac56 100644
--- a/src/intel/isl/isl_emit_depth_stencil.c
+++ b/src/intel/isl/isl_emit_depth_stencil.c
@@ -111,7 +111,7 @@ isl_genX(emit_depth_stencil_hiz_s)(const struct isl_device *dev, void *batch,
 #endif
 
 #if GEN_GEN >= 12
-      db.DepthBufferCompressionEnable =
+      db.ControlSurfaceEnable = db.DepthBufferCompressionEnable =
          info->hiz_usage == ISL_AUX_USAGE_HIZ_CCS;
 #endif
    }
-- 
2.30.2