Mesa (master): intel: Fix broxton 2x6 way size computation

[Anuj Phogat]

Module: Mesa
Branch: master
Commit: 8d02916e0c083f57bc7dfd886333f099763bd998
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8d02916e0c083f57bc7dfd886333f099763bd998

Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Tue Jun  6 16:14:19 2017 -0700

intel: Fix broxton 2x6 way size computation

This patch is undoing the changes to way size computation
in broxton 2x6, made by below commit:

Commit: 0d576fbfbe912cf3fb9ab594bb31eb58bccf2138
Author:     Anuj Phogat <anuj.phogat at gmail.com>
i965: Simplify l3 way size computations

By making use of l3_banks field in gen_device_info struct
l3_way_size for gen7+ = 2 * l3_banks.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101306
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Tested-by: Mark Janes <mark.a.janes at intel.com>
Acked-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/intel/common/gen_l3_config.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/intel/common/gen_l3_config.c b/src/intel/common/gen_l3_config.c
index e0825e92d9..2520838e7d 100644
--- a/src/intel/common/gen_l3_config.c
+++ b/src/intel/common/gen_l3_config.c
@@ -255,6 +255,10 @@ static unsigned
 get_l3_way_size(const struct gen_device_info *devinfo)
 {
    assert(devinfo->l3_banks);
+
+   if (devinfo->is_broxton)
+      return 4;
+
    return 2 * devinfo->l3_banks;
 }