From 0a6842c1bd18e1b2b7ef5e969b9f5df891604815 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 31 Mar 2016 18:38:21 -0700 Subject: [PATCH] isl/surface_state: Set the correct pitch for W-tiled surfaces Reviewed-by: Nanley Chery --- src/intel/isl/isl_surface_state.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c index 6afe45d650e..cac59fab78e 100644 --- a/src/intel/isl/isl_surface_state.c +++ b/src/intel/isl/isl_surface_state.c @@ -261,7 +261,6 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, .Height = info->surf->logical_level0_px.height - 1, .Depth = 0, /* TEMPLATE */ - .SurfacePitch = info->surf->row_pitch - 1, .RenderTargetViewExtent = 0, /* TEMPLATE */ .MinimumArrayElement = 0, /* TEMPLATE */ @@ -295,6 +294,19 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, #endif }; + if (info->surf->tiling == ISL_TILING_W) { + /* From the Broadwell PRM documentation for this field: + * + * "If the surface is a stencil buffer (and thus has Tile Mode set + * to TILEMODE_WMAJOR), the pitch must be set to 2x the value + * computed based on width, as the stencil buffer is stored with + * two rows interleaved." + */ + s.SurfacePitch = info->surf->row_pitch * 2 - 1; + } else { + s.SurfacePitch = info->surf->row_pitch - 1; + } + if (info->view->usage & ISL_SURF_USAGE_STORAGE_BIT) { s.SurfaceFormat = isl_lower_storage_image_format(dev, info->view->format); } else { -- 2.30.2