From: Anuj Phogat Date: Wed, 26 Jun 2019 20:18:38 +0000 (-0700) Subject: i965/icl: Fix WA_1606682166 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db093d028c6383d8905620da1eef244db0b3b1ce;p=mesa.git 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 Reviewed-by: Kenneth Graunke --- 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 =