From 05ed5acd07fc6ac45e272c169fef2ee28a112560 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 24 Apr 2026 11:02:20 +1000 Subject: [PATCH] nouveau: drop sector promotion. Just like the fix for nvk, just drop this in the GL driver as well. Cc: mesa-stable Reviewed-by: Karol Herbst Reviewed-by: Mel Henning (cherry picked from commit 3f5d54ab8ca608566a75900d22b909ad84925c44) Part-of: --- .pick_status.json | 2 +- src/gallium/drivers/nouveau/nv50/nv50_tex.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_tex.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6068a2465b3..eb7f250b9f5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2134,7 +2134,7 @@ "description": "nouveau: drop sector promotion.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/nouveau/nv50/nv50_tex.c b/src/gallium/drivers/nouveau/nv50/nv50_tex.c index 7ed4d4783d6..5a222c8d9cf 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_tex.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_tex.c @@ -120,7 +120,7 @@ nv50_create_texture_view(struct pipe_context *pipe, depth = view->pipe.u.tex.last_layer - view->pipe.u.tex.first_layer + 1; } - tic[2] = 0x10001000 | G80_TIC_2_BORDER_SOURCE_COLOR; + tic[2] = 0x00001000 | G80_TIC_2_BORDER_SOURCE_COLOR; if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) tic[2] |= G80_TIC_2_SRGB_CONVERSION; diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c index c7d990faeeb..11d88092c74 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_tex.c @@ -117,8 +117,7 @@ gm107_create_texture_view(struct pipe_context *pipe, address = mt->base.address; tic[3] = GM107_TIC2_3_LOD_ANISO_QUALITY_2; - tic[4] = GM107_TIC2_4_SECTOR_PROMOTION_PROMOTE_TO_2_V; - tic[4] |= GM107_TIC2_4_BORDER_SIZE_SAMPLER_COLOR; + tic[4] = GM107_TIC2_4_BORDER_SIZE_SAMPLER_COLOR; if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) tic[4] |= GM107_TIC2_4_SRGB_CONVERSION; @@ -332,7 +331,7 @@ gf100_create_texture_view(struct pipe_context *pipe, address = mt->base.address; - tic[2] = 0x10001000 | G80_TIC_2_BORDER_SOURCE_COLOR; + tic[2] = 0x00001000 | G80_TIC_2_BORDER_SOURCE_COLOR; if (desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) tic[2] |= G80_TIC_2_SRGB_CONVERSION;