From 09cbced0a38c9541aa3cadd647375760f1ffc10d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Tue, 19 Sep 2023 20:18:58 +0300 Subject: [PATCH] iris: use intel_needs_workaround for Wa_14014414195 part 2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit 3ec953ed755 left couple of extra things, these changes are based on a patch from Francisco Jerez. Signed-off-by: Tapani Pälli Reviewed-by: Lionel Landwerlin Part-of: --- src/gallium/drivers/iris/iris_state.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c index 14166de..5d165f8 100644 --- a/src/gallium/drivers/iris/iris_state.c +++ b/src/gallium/drivers/iris/iris_state.c @@ -2402,7 +2402,8 @@ iris_create_sampler_state(struct pipe_context *ctx, /* Fill an extra sampler state structure with anisotropic filtering * disabled used to implement Wa_14014414195. */ - fill_sampler_state(cso->sampler_state_3d, state, 0); + if (intel_needs_workaround(screen->devinfo, 14014414195)) + fill_sampler_state(cso->sampler_state_3d, state, 0); #endif return cso; @@ -3322,9 +3323,11 @@ iris_set_sampler_views(struct pipe_context *ctx, struct iris_sampler_view *view = (void *) pview; #if GFX_VERx10 == 125 - if (is_sampler_view_3d(shs->textures[start + i]) != - is_sampler_view_3d(view)) - ice->state.stage_dirty |= IRIS_STAGE_DIRTY_SAMPLER_STATES_VS << stage; + if (intel_needs_workaround(screen->devinfo, 14014414195)) { + if (is_sampler_view_3d(shs->textures[start + i]) != + is_sampler_view_3d(view)) + ice->state.stage_dirty |= IRIS_STAGE_DIRTY_SAMPLER_STATES_VS << stage; + } #endif if (take_ownership) { -- 2.7.4