From: Sagar Ghuge <sagar.ghuge@intel.com>
Date: Thu, 19 Sep 2019 15:20:34 +0000 (-0700)
Subject: intel/isl: Don't reconfigure aux surfaces for MCS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2f0fbe06e65c5ae6c3e9ab3943a4a7d01ae9dc2f;p=mesa.git

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 <sagar.ghuge@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
---

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);