Skip to content

Commit caaa9e6

Browse files
committed
bump(main/mesa): 26.2.0-devel-20260511
- Sync with upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/e471e83a6581120214a67b91b5b5fa94ae7a5de1 - Remove unofficial support for Adreno 830, as upstream has added official support: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39874 - Remove unofficial support for Adreno 829, as upstream has added official support: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40655 - Remove unofficial support for Adreno 810, as upstream has added official support: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40613 - Remove patch "0019-UBWC_5-and-UBWC_6-support.patch", as upstream has merged it: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40758 - Update unofficial support for Adreno 825 from whitebelyash's patch: whitebelyash/mesa-unified@efb4500
1 parent de57c89 commit caaa9e6

8 files changed

Lines changed: 91 additions & 292 deletions

packages/mesa/0003-fix-for-anon-file.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Fallback to `@TERMUX_PREFIX@/tmp` if env `XDG_RUNTIME_DIR` is not set.
22

33
--- a/src/util/anon_file.c
44
+++ b/src/util/anon_file.c
5-
@@ -122,7 +122,7 @@ get_or_create_user_temp_dir(char* buf, size_t len) {
5+
@@ -125,7 +125,7 @@ get_or_create_user_temp_dir(void) {
66
return buf;
77
}
88

9-
- snprintf(buf, len, "/tmp/xdg-runtime-mesa-%ld", (long)getuid());
10-
+ snprintf(buf, len, "@TERMUX_PREFIX@/tmp/xdg-runtime-mesa-%ld", (long)getuid());
9+
- n = asprintf(&buf, "/tmp/xdg-runtime-mesa-%ld", (long)getuid());
10+
+ n = asprintf(&buf, "@TERMUX_PREFIX@/tmp/xdg-runtime-mesa-%ld", (long)getuid());
11+
if (n < 0)
12+
return NULL;
1113
mesa_logd("%s: XDG_RUNTIME_DIR not set; falling back to temp dir %s",
12-
__func__, buf);
13-
if (stat(buf, &st) == 0) {

packages/mesa/0007-use-mtx_t-operations-in-turnip.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/freedreno/vulkan/tu_shader.cc
22
+++ b/src/freedreno/vulkan/tu_shader.cc
3-
@@ -1980,10 +1980,10 @@
3+
@@ -2686,10 +2686,10 @@ tu_upload_shader(struct tu_device *dev,
44
size += vpc_size;
55
}
66

@@ -13,7 +13,7 @@
1313

1414
if (result != VK_SUCCESS)
1515
return result;
16-
@@ -2013,9 +2013,9 @@
16+
@@ -2719,9 +2719,9 @@ tu_upload_shader(struct tu_device *dev,
1717

1818
result = tu_setup_pvtmem(dev, shader, &pvtmem_config, pvtmem_size, per_wave);
1919
if (result != VK_SUCCESS) {
@@ -25,7 +25,7 @@
2525
return result;
2626
}
2727

28-
@@ -2419,10 +2419,10 @@
28+
@@ -3523,10 +3523,10 @@ tu_empty_shader_create(struct tu_device *dev,
2929
if (!shader)
3030
return VK_ERROR_OUT_OF_HOST_MEMORY;
3131

@@ -38,9 +38,9 @@
3838

3939
if (result != VK_SUCCESS) {
4040
vk_free(&dev->vk.alloc, shader);
41-
@@ -2528,9 +2528,9 @@
42-
{
41+
@@ -3637,9 +3637,9 @@ tu_shader_destroy(struct tu_device *dev,
4342
tu_cs_finish(&shader->cs);
43+
TU_RMV(resource_destroy, dev, &shader->bo);
4444

4545
- pthread_mutex_lock(&dev->pipeline_mutex);
4646
+ mtx_lock(&dev->pipeline_mutex);
@@ -52,7 +52,7 @@
5252
tu_bo_finish(dev, shader->pvtmem_bo);
5353
--- a/src/vulkan/wsi/wsi_common_wayland.c
5454
+++ b/src/vulkan/wsi/wsi_common_wayland.c
55-
@@ -2648,12 +2648,12 @@ wsi_wl_swapchain_wait_for_present2(struct wsi_swapchain *wsi_chain,
55+
@@ -2824,12 +2824,12 @@ wsi_wl_swapchain_wait_for_present2(struct wsi_swapchain *wsi_chain,
5656
return result;
5757

5858
while (1) {

packages/mesa/0019-UBWC_5-and-UBWC_6-support.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

packages/mesa/0020-unofficial-support-adreno-830.patch

Lines changed: 0 additions & 85 deletions
This file was deleted.

packages/mesa/0021-unofficial-support-adreno-810-825-829.patch

Lines changed: 0 additions & 168 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
freedreno/common: enable A825
2+
3+
The source code is from whitebelyash:
4+
https://github.com/whitebelyash/mesa-unified/commit/efb4500439dca28f50bc6c874e271708dca2f821
5+
6+
diff --git a/src/freedreno/common/freedreno_devices.py b/src/freedreno/common/freedreno_devices.py
7+
index 4b2a004af7c..9f9f914c9ec 100644
8+
--- a/src/freedreno/common/freedreno_devices.py
9+
+++ b/src/freedreno/common/freedreno_devices.py
10+
@@ -1423,6 +1423,31 @@ add_gpus([
11+
raw_magic_regs = a8xx_base_raw_magic_regs,
12+
))
13+
14+
+add_gpus([
15+
+ GPUId(chip_id=0x44030000, name="Adreno (TM) 825"),
16+
+ ], A6xxGPUInfo(
17+
+ CHIP.A8XX,
18+
+ [a7xx_base, a7xx_gen3, a8xx_base, a8xx_gen1, GPUProps(
19+
+ # This is probably not an optimal config for gmem/sysmem, but it was working before and I don't have any 825 device to test (neither I have any trace info)
20+
+ sysmem_ccu_color_cache_fraction = CCUColorCacheFraction.FULL.value,
21+
+ sysmem_per_ccu_color_cache_size = 128 * 1024,
22+
+ sysmem_ccu_depth_cache_fraction = CCUColorCacheFraction.THREE_QUARTER.value,
23+
+ sysmem_per_ccu_depth_cache_size = 96 * 1024,
24+
+ )],
25+
+ num_ccu = 4,
26+
+ num_slices = 2,
27+
+ tile_align_w = 96,
28+
+ tile_align_h = 32,
29+
+ tile_max_w = 16416,
30+
+ tile_max_h = 16384,
31+
+ num_vsc_pipes = 32,
32+
+ cs_shared_mem_size = 32 * 1024,
33+
+ wave_granularity = 2,
34+
+ fibers_per_sp = 128 * 2 * 16,
35+
+ magic_regs = dict(),
36+
+ raw_magic_regs = a8xx_base_raw_magic_regs,
37+
+ ))
38+
+
39+
add_gpus([
40+
GPUId(chip_id=0xffff44050A31, name="Adreno (TM) 840"),
41+
], A6xxGPUInfo(

0 commit comments

Comments
 (0)