From: Emil Velikov <emil.velikov@collabora.com>
Date: Tue, 11 Oct 2016 17:26:17 +0000 (+0100)
Subject: isl/gen7: remove unneeded ISL_DEV_GEN check
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eac752e54b5ec1b8d75d8c22c730af8c9c2a3007;p=mesa.git

isl/gen7: remove unneeded ISL_DEV_GEN check

The function gen7_format_needs_valign2 has two callers - the gen7 only
gen7_choose_valign_el() and isl_gen6_filter_tiling(). The latter of
which already guarding the invocation appropriately.

To be extra cautious add a couple of asserts alongside the removal of the
runtime check.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Chad Versace <chadversary@chromium.org>
---

diff --git a/src/intel/isl/isl_gen7.c b/src/intel/isl/isl_gen7.c
index 76213f814a5..b6a86d23f37 100644
--- a/src/intel/isl/isl_gen7.c
+++ b/src/intel/isl/isl_gen7.c
@@ -155,9 +155,7 @@ static bool
 gen7_format_needs_valign2(const struct isl_device *dev,
                           enum isl_format format)
 {
-   /* This workaround applies only to gen7 */
-   if (ISL_DEV_GEN(dev) > 7)
-      return false;
+   assert(ISL_DEV_GEN(dev) == 7);
 
    /* From the Ivybridge PRM (2012-05-31), Volume 4, Part 1, Section 2.12.1,
     * RENDER_SURFACE_STATE Surface Vertical Alignment:
@@ -391,6 +389,8 @@ isl_gen7_choose_image_alignment_el(const struct isl_device *dev,
                                    enum isl_msaa_layout msaa_layout,
                                    struct isl_extent3d *image_align_el)
 {
+   assert(ISL_DEV_GEN(dev) == 7);
+
    /* Handled by isl_choose_image_alignment_el */
    assert(info->format != ISL_FORMAT_HIZ);