diff options
| author | Rob Clark <robdclark@chromium.org> | 2020-08-25 09:50:59 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-08-28 11:26:56 -0700 |
| commit | b445b12c0d9b86ed17fbbe513e94bd15ade8080d (patch) | |
| tree | 1995eea5e2f92fde92bab0daeebe955e85d39b0f | |
| parent | 10571677e5429347d4be47eea1f352da351c067d (diff) | |
freedreno/gmemtool: add tile_alignw/h and a650
Fixes: f6f8a190920 ("freedreno/a6xx: split up gmem/tile alignment requirements")
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6461>
(cherry picked from commit 758fdb9f3315d9ee4c31ed90e379f98928acd8b5)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/gmemtool.c | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/.pick_status.json b/.pick_status.json index 4a10eac2247..4328aae65de 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -895,7 +895,7 @@ "description": "freedreno/gmemtool: add tile_alignw/h and a650", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "f6f8a19092027ab0248e216997a5529565ce2e12" }, diff --git a/src/gallium/drivers/freedreno/gmemtool.c b/src/gallium/drivers/freedreno/gmemtool.c index c0862bc5ad9..983936f1a25 100644 --- a/src/gallium/drivers/freedreno/gmemtool.c +++ b/src/gallium/drivers/freedreno/gmemtool.c @@ -82,6 +82,8 @@ struct gpu_info { uint32_t gpu_id; uint32_t gmem_alignw; uint32_t gmem_alignh; + uint32_t tile_alignw; + uint32_t tile_alignh; uint32_t num_vsc_pipes; uint8_t gmem_page_align; uint32_t gmemsize_bytes; @@ -94,11 +96,12 @@ struct gpu_info { /* keep sorted by gpu name: */ static const struct gpu_info gpu_infos[] = { - { "a306", 307, 32, 32, 8, 4, SZ_128K }, - { "a405", 405, 32, 32, 8, 4, SZ_256K }, - { "a530", 530, 64, 32, 16, 4, SZ_1M }, - { "a618", 618, 32, 32, 32, 1, SZ_512K }, - { "a630", 630, 32, 32, 32, 1, SZ_1M }, + { "a306", 307, 32, 32, 32, 32, 8, 4, SZ_128K }, + { "a405", 405, 32, 32, 32, 32, 8, 4, SZ_256K }, + { "a530", 530, 64, 32, 64, 32, 16, 4, SZ_1M }, + { "a618", 618, 16, 4, 32, 32, 32, 1, SZ_512K }, + { "a630", 630, 16, 4, 32, 32, 32, 1, SZ_1M }, + { "a650", 630, 16, 4, 96, 32, 32, 1, SZ_1M + SZ_128K }, }; @@ -167,6 +170,8 @@ main(int argc, char **argv) .gpu_id = gpu_info->gpu_id, .gmem_alignw = gpu_info->gmem_alignw, .gmem_alignh = gpu_info->gmem_alignh, + .tile_alignw = gpu_info->tile_alignw, + .tile_alignh = gpu_info->tile_alignh, .num_vsc_pipes = gpu_info->num_vsc_pipes, .gmemsize_bytes = gpu_info->gmemsize_bytes, }; |