fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

isl: fix 32bit math with 4GB buffer size

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: mesa-stable
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
(cherry picked from commit d956957153)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40092>
This commit is contained in:
Lionel Landwerlin 2025-05-23 16:41:52 +03:00 • committed by Eric Engestrom
parent af97f7fe38
commit 1994d93542
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -5614,7 +5614,7 @@
"description": "isl: fix 32bit math with 4GB buffer size",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

7
src/intel/isl/isl_surface_state.c
View file

@ -1007,10 +1007,11 @@ isl_genX(buffer_fill_state_s)(const struct isl_device *dev, void *state,
!info->is_scratch) {
assert(info->stride_B == 1);
uint64_t aligned_size = isl_align(buffer_size, 4);
buffer_size = aligned_size + (aligned_size - buffer_size);
buffer_size = MIN2(aligned_size + (aligned_size - buffer_size),
dev->max_buffer_size);
}
uint32_t num_elements = buffer_size / info->stride_B;
uint64_t num_elements = buffer_size / info->stride_B;
assert(num_elements > 0);
if (info->format == ISL_FORMAT_RAW) {
@ -1038,7 +1039,7 @@ isl_genX(buffer_fill_state_s)(const struct isl_device *dev, void *state,
* newer are enough to fit 32bit num_elements.
*/
if (num_elements > (1 << 27)) {
mesa_logw("%s: num_elements is too big: %u (buffer size: %"PRIu64")\n",
mesa_logw("%s: num_elements is too big: %"PRIu64" (buffer size: %"PRIu64")\n",
__func__, num_elements, buffer_size);
}
}