Mesa (master): i965/icl: Fix WA_1606682166

[GitLab Mirror]

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

Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Wed Jun 26 13:18:38 2019 -0700

i965/icl: Fix WA_1606682166

An earlier change was setting the SamplerCount = 0 for Gen 11
under #if GEN_GEN < 7. This commit fixes the problem.

This WA has also been added to the linux kernel.

Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/drivers/dri/i965/genX_state_upload.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c
index f182683d8a8..2baeb3b4bb1 100644
--- a/src/mesa/drivers/dri/i965/genX_state_upload.c
+++ b/src/mesa/drivers/dri/i965/genX_state_upload.c
@@ -1943,8 +1943,7 @@ genX(upload_wm)(struct brw_context *brw)
       if (wm_prog_data->base.use_alt_mode)
          wm.FloatingPointMode = FLOATING_POINT_MODE_Alternate;
 
-      /* WA_1606682166 */
-      wm.SamplerCount = (GEN_GEN == 5 || GEN_GEN == 11) ?
+      wm.SamplerCount = GEN_GEN == 5 ?
          0 : DIV_ROUND_UP(stage_state->sampler_count, 4);
 
       wm.BindingTableEntryCount =