From 8dd3853f23443e1f1a7cfd1a2f9d300e5d232cea Mon Sep 17 00:00:00 2001 From: Sagar Ghuge Date: Thu, 4 Sep 2025 17:21:23 -0700 Subject: [PATCH] isl: Respect driconf option for EnableSamplerRoutetoLSC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For EnableSamplerRoutetoLSC, we do check driconf option. Buffer state setup is just missing that option so add check for that too. Fixes: 7934b70f ("isl/iris/anv: provide drirc toggle intel_sampler_route_to_lsc") Cc: mesa-stable Signed-off-by: Sagar Ghuge Reviewed-by: Tapani Pälli Reviewed-by: Nanley Chery Reviewed-by: Caleb Callaway Part-of: (cherry picked from commit 99cd6ffd1ffce18325b7b491b90b2b87c6b27e7f) --- .pick_status.json | 2 +- src/intel/isl/isl_surface_state.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index de3668fd45d..98774dd0e3f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5884,7 +5884,7 @@ "description": "isl: Respect driconf option for EnableSamplerRoutetoLSC", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7934b70ff1e5785b30c8a3635ebb84f5786688b7", "notes": null diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c index 1ad7339d452..9f33f682f10 100644 --- a/src/intel/isl/isl_surface_state.c +++ b/src/intel/isl/isl_surface_state.c @@ -1071,6 +1071,12 @@ isl_genX(buffer_fill_state_s)(const struct isl_device *dev, void *state, #if GFX_VERx10 >= 200 s.EnableSamplerRoutetoLSC = isl_format_support_sampler_route_to_lsc(info->format); + /* Per-application override. + * + * Bspec 57023: "Enable Sampler Route to LSC" programming note states that, + * this bit can be set for surface type SURFTYPE_2D or SURFTYPE_BUFFER. + */ + s.EnableSamplerRoutetoLSC &= dev->sampler_route_to_lsc; #endif /* if GFX_VERx10 >= 200 */ s.SurfaceBaseAddress = info->address;