fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-15 19:20:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv/video: Use a more reliable way of computing tile sizes

Browse source 
Some apps (old FFmpeg, contemporary CTS) send down pMi{Col,Row}Starts in
SB units, not MI units. Instead of dependening on those values which
could be unreliable, derive the tile sizes in SB using other parameters.

Cc: mesa-stable
Reviewed-by: Ruijing Dong <ruijing.dong@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39492>
(cherry picked from commit c10ebb0fda)
This commit is contained in:
Benjamin Cheng 2026-01-23 11:41:05 -05:00 • committed by Eric Engestrom
parent fd0ec1af2b
commit 4e1f5fda4a
2 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -2014,7 +2014,7 @@
"description": "radv/video: Use a more reliable way of computing tile sizes",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

54
src/amd/vulkan/radv_video.c
View file

@ -2320,22 +2320,6 @@ get_av1_msg(struct radv_device *device, struct radv_video_session *vid, struct v
result.tx_mode = pi->TxMode;
result.reference_mode = (pi->flags.reference_select == 1) ? 2 : 0;
if (pi->pTileInfo) {
result.tile_cols = pi->pTileInfo->TileCols;
result.tile_rows = pi->pTileInfo->TileRows;
result.tile_size_bytes = pi->pTileInfo->tile_size_bytes_minus_1;
result.context_update_tile_id = pi->pTileInfo->context_update_tile_id;
for (i = 0; i < result.tile_cols; i++)
result.tile_col_start_sb[i] = pi->pTileInfo->pMiColStarts[i];
result.tile_col_start_sb[result.tile_cols] =
result.tile_col_start_sb[result.tile_cols - 1] + pi->pTileInfo->pWidthInSbsMinus1[result.tile_cols - 1] + 1;
for (i = 0; i < pi->pTileInfo->TileRows; i++)
result.tile_row_start_sb[i] = pi->pTileInfo->pMiRowStarts[i];
result.tile_row_start_sb[result.tile_rows] =
result.tile_row_start_sb[result.tile_rows - 1] + pi->pTileInfo->pHeightInSbsMinus1[result.tile_rows - 1] + 1;
}
result.max_width = seq_hdr->max_frame_width_minus_1 + 1;
result.max_height = seq_hdr->max_frame_height_minus_1 + 1;
VkExtent2D frameExtent = frame_info->dstPictureResource.codedExtent;
@ -2351,6 +2335,44 @@ get_av1_msg(struct radv_device *device, struct radv_video_session *vid, struct v
result.superres_upscaled_width = frameExtent.width;
if (pi->pTileInfo) {
result.tile_cols = pi->pTileInfo->TileCols;
result.tile_rows = pi->pTileInfo->TileRows;
result.tile_size_bytes = pi->pTileInfo->tile_size_bytes_minus_1;
result.context_update_tile_id = pi->pTileInfo->context_update_tile_id;
/* pMi{Row,Col}Starts is unreliable, some apps send SB, some send MI, so use
* p{Width,Height}InSbsMinus1 instead. But for uniform_tile_spacing_flag,
* those are not defined by spec. */
if (pi->pTileInfo->flags.uniform_tile_spacing_flag) {
const unsigned sb_size = seq_hdr->flags.use_128x128_superblock ? 128 : 64;
const unsigned sb_width = DIV_ROUND_UP(result.width, sb_size);
const unsigned sb_height = DIV_ROUND_UP(result.height, sb_size);
const unsigned tile_width_sb = DIV_ROUND_UP(sb_width, result.tile_cols);
const unsigned tile_height_sb = DIV_ROUND_UP(sb_height, result.tile_rows);
result.tile_col_start_sb[0] = 0;
for (i = 1; i < result.tile_cols; ++i)
result.tile_col_start_sb[i] = result.tile_col_start_sb[i - 1] + tile_width_sb;
result.tile_col_start_sb[i] = sb_width;
result.tile_row_start_sb[0] = 0;
for (i = 1; i < result.tile_rows; ++i)
result.tile_row_start_sb[i] = result.tile_row_start_sb[i - 1] + tile_height_sb;
result.tile_row_start_sb[i] = sb_height;
} else {
result.tile_col_start_sb[0] = 0;
assert(pi->pTileInfo->pMiColStarts[0] == 0);
for (i = 0; i < result.tile_cols; ++i)
result.tile_col_start_sb[i + 1] = result.tile_col_start_sb[i] + pi->pTileInfo->pWidthInSbsMinus1[i] + 1;
result.tile_row_start_sb[0] = 0;
assert(pi->pTileInfo->pMiRowStarts[0] == 0);
for (i = 0; i < result.tile_rows; ++i)
result.tile_row_start_sb[i + 1] = result.tile_row_start_sb[i] + pi->pTileInfo->pHeightInSbsMinus1[i] + 1;
}
}
result.order_hint_bits = seq_hdr->order_hint_bits_minus_1 + 1;
/* The VCN FW will evict references that aren't specified in