fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-15 08:50:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: fix SDMA image address calculation for large images by using uint64_t

Browse source 
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23037>
This commit is contained in:
Marek Olšák 2023-05-15 12:01:52 -04:00 • committed by Marge Bot
parent 4d9942d891
commit 6d69aa38c1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/radeonsi/si_sdma_copy_image.c
View file

@ -122,7 +122,7 @@ bool si_sdma_v4_v5_copy_texture(struct si_context *sctx, struct si_texture *sdst
if (ssrc->surface.is_linear && sdst->surface.is_linear) {
struct radeon_cmdbuf *cs = sctx->sdma_cs;
unsigned bytes = src_pitch * copy_height * bpp;
uint64_t bytes = (uint64_t)src_pitch * copy_height * bpp;
if (!(bytes < (1u << 22)))
return false;
@ -151,7 +151,7 @@ bool si_sdma_v4_v5_copy_texture(struct si_context *sctx, struct si_texture *sdst
unsigned tiled_width = DIV_ROUND_UP(tiled->buffer.b.b.width0, tiled->surface.blk_w);
unsigned tiled_height = DIV_ROUND_UP(tiled->buffer.b.b.height0, tiled->surface.blk_h);
unsigned linear_pitch = linear == ssrc ? src_pitch : dst_pitch;
unsigned linear_slice_pitch = ((uint64_t)linear->surface.u.gfx9.surf_slice_size) / bpp;
uint64_t linear_slice_pitch = linear->surface.u.gfx9.surf_slice_size / bpp;
uint64_t tiled_address = tiled == ssrc ? src_address : dst_address;
uint64_t linear_address = linear == ssrc ? src_address : dst_address;
struct radeon_cmdbuf *cs = sctx->sdma_cs;
@ -358,11 +358,11 @@ bool cik_sdma_copy_texture(struct si_context *sctx, struct si_texture *sdst, str
* starts reading from an address preceding linear_address!!!
*/
start_linear_address =
linear->surface.u.legacy.level[0].offset_256B * 256;
(uint64_t)linear->surface.u.legacy.level[0].offset_256B * 256;
end_linear_address =
linear->surface.u.legacy.level[0].offset_256B * 256 +
bpp * ((copy_height - 1) * linear_pitch + copy_width);
(uint64_t)linear->surface.u.legacy.level[0].offset_256B * 256 +
bpp * ((copy_height - 1) * (uint64_t)linear_pitch + copy_width);
if ((0 + copy_width) % granularity)
end_linear_address += granularity - (0 + copy_width) % granularity;