From: Emil Velikov <emil.velikov@collabora.com>
Date: Tue, 11 Oct 2016 17:26:15 +0000 (+0100)
Subject: isl/gen6: correctly check msaa layout samples count
X-Git-Tag: upstream/17.1.0~5597
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84f9ef1de4680b48d646841965f963ea2b724ab2;p=platform%2Fupstream%2Fmesa.git

isl/gen6: correctly check msaa layout samples count

Samples == 1 is a valid value, so returning false is plain wrong.
Seeming copy/paste typo introduced since day 1.

Fixes: afdadec77f5 ("isl: Implement isl_surf_init() for gen4-gen9")
Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Chad Versace <chadversary@chromium.org>
---

diff --git a/src/intel/isl/isl_gen6.c b/src/intel/isl/isl_gen6.c
index b30998d..07c08f6 100644
--- a/src/intel/isl/isl_gen6.c
+++ b/src/intel/isl/isl_gen6.c
@@ -35,7 +35,7 @@ gen6_choose_msaa_layout(const struct isl_device *dev,
 
    if (info->samples == 1) {
       *msaa_layout = ISL_MSAA_LAYOUT_NONE;
-      return false;
+      return true;
    }
 
    if (!isl_format_supports_multisampling(dev->info, info->format))