From 2f0fbe06e65c5ae6c3e9ab3943a4a7d01ae9dc2f Mon Sep 17 00:00:00 2001 From: Sagar Ghuge Date: Thu, 19 Sep 2019 08:20:34 -0700 Subject: [PATCH 1/1] intel/isl: Don't reconfigure aux surfaces for MCS If aux for MCS is already configured, don't configure again. v2: Fix missing period in commit message (Nanley Chery) Signed-off-by: Sagar Ghuge Reviewed-by: Nanley Chery --- src/intel/isl/isl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index c756fb0c80f..b22cd009e83 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -1773,6 +1773,9 @@ isl_surf_get_mcs_surf(const struct isl_device *dev, if (surf->msaa_layout != ISL_MSAA_LAYOUT_ARRAY) return false; + if (mcs_surf->size_B > 0) + return false; + /* The following are true of all multisampled surfaces */ assert(surf->samples > 1); assert(surf->dim == ISL_SURF_DIM_2D); -- 2.30.2