|
| 1 | +diff -Nru mesa-25.0.1/debian/changelog mesa-25.0.1/debian/changelog |
| 2 | +--- mesa-25.0.1/debian/changelog 2025-03-06 11:07:00.000000000 +0000 |
| 3 | ++++ mesa-25.0.1/debian/changelog 2025-03-06 18:13:37.000000000 +0000 |
| 4 | +@@ -1,3 +1,11 @@ |
| 5 | ++mesa (25.0.1-1qcom1) unstable; urgency=medium |
| 6 | ++ |
| 7 | ++ * patches: add fd_dev_gpu_id-bail-out-on-unsupported-GPU-ids; fixes segfault |
| 8 | ++ when trying to use the (currently unsupported GPU) on Qualcomm RB1; from |
| 9 | ++ upstream gitlab's MR #33830. |
| 10 | ++ |
| 11 | ++ -- Loïc Minier < [email protected]> Thu, 06 Mar 2025 18:13:37 +0000 |
| 12 | ++ |
| 13 | + mesa (25.0.1-1) unstable; urgency=medium |
| 14 | + |
| 15 | + [ Timo Aaltonen ] |
| 16 | +diff -Nru mesa-25.0.1/debian/patches/fd_dev_gpu_id-bail-out-on-unsupported-GPU-ids.diff mesa-25.0.1/debian/patches/fd_dev_gpu_id-bail-out-on-unsupported-GPU-ids.diff |
| 17 | +--- mesa-25.0.1/debian/patches/fd_dev_gpu_id-bail-out-on-unsupported-GPU-ids.diff 1970-01-01 00:00:00.000000000 +0000 |
| 18 | ++++ mesa-25.0.1/debian/patches/fd_dev_gpu_id-bail-out-on-unsupported-GPU-ids.diff 2025-03-06 18:12:57.000000000 +0000 |
| 19 | +@@ -0,0 +1,62 @@ |
| 20 | ++From a255790e7e62904a5470a1edf6fc8aea5d7cc209 Mon Sep 17 00:00:00 2001 |
| 21 | ++From: =?UTF-8?q?Lo=C3=AFc=20Minier?= < [email protected]> |
| 22 | ++Date: Fri, 28 Feb 2025 20:12:11 +0000 |
| 23 | ++Subject: [PATCH] fd_dev_gpu_id: bail out on unsupported GPU ids |
| 24 | ++MIME-Version: 1.0 |
| 25 | ++Content-Type: text/plain; charset=UTF-8 |
| 26 | ++Content-Transfer-Encoding: 8bit |
| 27 | ++ |
| 28 | ++Signed-off-by: Loïc Minier < [email protected]> |
| 29 | ++--- |
| 30 | ++ src/freedreno/common/freedreno_dev_info.h | 9 +++++++++ |
| 31 | ++ src/freedreno/drm/freedreno_pipe.c | 7 +++++++ |
| 32 | ++ 2 files changed, 16 insertions(+) |
| 33 | ++ |
| 34 | ++diff --git a/src/freedreno/common/freedreno_dev_info.h b/src/freedreno/common/freedreno_dev_info.h |
| 35 | ++index b925d778bb5..a3858bc20c3 100644 |
| 36 | ++--- a/src/freedreno/common/freedreno_dev_info.h |
| 37 | +++++ b/src/freedreno/common/freedreno_dev_info.h |
| 38 | ++@@ -9,6 +9,7 @@ |
| 39 | ++ |
| 40 | ++ #include <assert.h> |
| 41 | ++ #include <stdbool.h> |
| 42 | +++#include <stddef.h> |
| 43 | ++ #include <stdint.h> |
| 44 | ++ |
| 45 | ++ #ifdef __cplusplus |
| 46 | ++@@ -379,6 +380,14 @@ fd_dev_gpu_id(const struct fd_dev_id *id) |
| 47 | ++ /* Unmodified dev info as defined in freedreno_devices.py */ |
| 48 | ++ const struct fd_dev_info *fd_dev_info_raw(const struct fd_dev_id *id); |
| 49 | ++ |
| 50 | +++/* Helper to check if GPU is known before going any further */ |
| 51 | +++static uint8_t |
| 52 | +++fd_dev_is_supported(const struct fd_dev_id *id) { |
| 53 | +++ assert(id); |
| 54 | +++ assert(id->gpu_id || id->chip_id); |
| 55 | +++ return fd_dev_info_raw(id) != NULL; |
| 56 | +++} |
| 57 | +++ |
| 58 | ++ /* Final dev info with dbg options and everything else applied. */ |
| 59 | ++ const struct fd_dev_info fd_dev_info(const struct fd_dev_id *id); |
| 60 | ++ |
| 61 | ++diff --git a/src/freedreno/drm/freedreno_pipe.c b/src/freedreno/drm/freedreno_pipe.c |
| 62 | ++index ab53c55152d..8373488368a 100644 |
| 63 | ++--- a/src/freedreno/drm/freedreno_pipe.c |
| 64 | +++++ b/src/freedreno/drm/freedreno_pipe.c |
| 65 | ++@@ -45,6 +45,13 @@ fd_pipe_new2(struct fd_device *dev, enum fd_pipe_id id, uint32_t prio) |
| 66 | ++ fd_pipe_get_param(pipe, FD_CHIP_ID, &val); |
| 67 | ++ pipe->dev_id.chip_id = val; |
| 68 | ++ |
| 69 | +++ if (!fd_dev_is_supported(&pipe->dev_id)) { |
| 70 | +++ ERROR_MSG("unsupported GPU id 0x%" PRIx32 " / chip id 0x%" PRIx64, |
| 71 | +++ pipe->dev_id.gpu_id, |
| 72 | +++ pipe->dev_id.chip_id); |
| 73 | +++ return NULL; |
| 74 | +++ } |
| 75 | +++ |
| 76 | ++ pipe->is_64bit = fd_dev_64b(&pipe->dev_id); |
| 77 | ++ |
| 78 | ++ /* Use the _NOSYNC flags because we don't want the control_mem bo to hold |
| 79 | ++-- |
| 80 | ++2.47.2 |
| 81 | ++ |
| 82 | +diff -Nru mesa-25.0.1/debian/patches/series mesa-25.0.1/debian/patches/series |
| 83 | +--- mesa-25.0.1/debian/patches/series 2025-03-06 11:00:09.000000000 +0000 |
| 84 | ++++ mesa-25.0.1/debian/patches/series 2025-03-06 18:12:57.000000000 +0000 |
| 85 | +@@ -1,3 +1,4 @@ |
| 86 | + path_max.diff |
| 87 | + src_glx_dri_common.h.diff |
| 88 | + disable_ppc64el_assembly.diff |
| 89 | ++fd_dev_gpu_id-bail-out-on-unsupported-GPU-ids.diff |
0 commit comments