From 44ab26d0c9bd95f8d15ead5b92f743ee13296aef Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Mon, 16 Jul 2018 13:03:09 -0700 Subject: [PATCH] i965/misc: Use depth/stencil surf's tiling on gen4-5 Make the 3D engine aware of the depth/stencil surface's tiling before doing any render operations. Fixes fbe01625f6bf2cef6742e1ff0d3d44a2afec003e ("i965/miptree: Share tiling_flags in miptree_create"). Reported-by: Mark Janes Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107248 Tested-by: Mark Janes Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_misc_state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_misc_state.c b/src/mesa/drivers/dri/i965/brw_misc_state.c index 9a663b1d61c..5cf704ff0e9 100644 --- a/src/mesa/drivers/dri/i965/brw_misc_state.c +++ b/src/mesa/drivers/dri/i965/brw_misc_state.c @@ -267,6 +267,7 @@ brw_emit_depth_stencil_hiz(struct brw_context *brw, uint32_t depthbuffer_format = BRW_DEPTHFORMAT_D32_FLOAT; uint32_t depth_offset = 0; uint32_t width = 1, height = 1; + bool tiled_surface = true; /* If there's a packed depth/stencil bound to stencil only, we need to * emit the packed depth/stencil buffer packet. @@ -282,6 +283,7 @@ brw_emit_depth_stencil_hiz(struct brw_context *brw, depth_offset = brw->depthstencil.depth_offset; width = depth_irb->Base.Base.Width; height = depth_irb->Base.Base.Height; + tiled_surface = depth_mt->surf.tiling != ISL_TILING_LINEAR; } const struct gen_device_info *devinfo = &brw->screen->devinfo; @@ -292,7 +294,7 @@ brw_emit_depth_stencil_hiz(struct brw_context *brw, OUT_BATCH((depth_mt ? depth_mt->surf.row_pitch - 1 : 0) | (depthbuffer_format << 18) | (BRW_TILEWALK_YMAJOR << 26) | - (1 << 27) | + (tiled_surface << 27) | (depth_surface_type << 29)); if (depth_mt) { -- 2.30.2