Module: Mesa Branch: main Commit: e3b7fad356352a90acc7b148f898edb6b034ab57 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3b7fad356352a90acc7b148f898edb6b034ab57
Author: Frank Binns <[email protected]> Date: Thu Jul 28 10:23:54 2022 +0100 pvr: get free list min size from the runtime info Signed-off-by: Frank Binns <[email protected]> Reviewed-by: Karmjit Mahil <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17850> --- src/imagination/include/hwdef/rogue_hw_utils.h | 17 ----------------- src/imagination/vulkan/pvr_job_render.c | 6 ++++-- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/imagination/include/hwdef/rogue_hw_utils.h b/src/imagination/include/hwdef/rogue_hw_utils.h index 0679fe4f7b3..4db0eb86689 100644 --- a/src/imagination/include/hwdef/rogue_hw_utils.h +++ b/src/imagination/include/hwdef/rogue_hw_utils.h @@ -102,23 +102,6 @@ rogue_get_isp_samples_per_tile_xy(const struct pvr_device_info *dev_info, } } -static inline uint64_t -rogue_get_min_free_list_size(const struct pvr_device_info *dev_info) -{ - uint64_t min_num_pages; - - if (PVR_HAS_FEATURE(dev_info, roguexe)) { - if (PVR_HAS_QUIRK(dev_info, 66011)) - min_num_pages = 40U; - else - min_num_pages = 25U; - } else { - min_num_pages = 50U; - } - - return min_num_pages << ROGUE_BIF_PM_PHYSICAL_PAGE_SHIFT; -} - static inline uint32_t rogue_get_max_num_vdm_pds_tasks(const struct pvr_device_info *dev_info) { diff --git a/src/imagination/vulkan/pvr_job_render.c b/src/imagination/vulkan/pvr_job_render.c index 80949db8e1f..5b6458e2eab 100644 --- a/src/imagination/vulkan/pvr_job_render.c +++ b/src/imagination/vulkan/pvr_job_render.c @@ -1051,6 +1051,8 @@ pvr_render_target_dataset_create(struct pvr_device *device, uint32_t layers, struct pvr_rt_dataset **const rt_dataset_out) { + struct pvr_device_runtime_info *runtime_info = + &device->pdevice->dev_runtime_info; const struct pvr_device_info *dev_info = &device->pdevice->dev_info; struct pvr_winsys_rt_dataset_create_info rt_dataset_create_info; struct pvr_rt_mtile_info mtile_info; @@ -1084,8 +1086,8 @@ pvr_render_target_dataset_create(struct pvr_device *device, * details. */ result = pvr_free_list_create(device, - rogue_get_min_free_list_size(dev_info), - rogue_get_min_free_list_size(dev_info), + runtime_info->min_free_list_size, + runtime_info->min_free_list_size, 0 /* grow_size */, 0 /* grow_threshold */, rt_dataset->global_free_list,
