From d7bd8c15d66a438a6680522915f746ce75e8d60c Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Wed, 26 Oct 2016 22:56:53 -0700 Subject: [PATCH] intel/isl: Allow non-2D CCS surfaces The CCS calculations in ISL are already correct for 1-D and 3-D CCS surfaces since they have exactly the same layout as 2-D array surfaces (at least on Sky Lake). The only problem was that we weren't passing in the right dimensionality and we weren't passing in the depth. Reviewed-by: Topi Pohjolainen --- src/intel/isl/isl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index 4d85c3b97fb..82ab68dc65a 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -1492,11 +1492,11 @@ isl_surf_get_ccs_surf(const struct isl_device *dev, } isl_surf_init(dev, ccs_surf, - .dim = ISL_SURF_DIM_2D, + .dim = surf->dim, .format = ccs_format, .width = surf->logical_level0_px.width, .height = surf->logical_level0_px.height, - .depth = 1, + .depth = surf->logical_level0_px.depth, .levels = surf->levels, .array_len = surf->logical_level0_px.array_len, .samples = 1, -- 2.30.2