fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 15:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

iris: Implement Wa_14019708328

Browse source 
As all screens shares the same bufmgr and vm_id in Xe KMD, we can
create a single dummy_aux_bo and re-use in all screens.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29619>
This commit is contained in:
José Roberto de Souza 2023-08-16 10:18:49 -07:00 • committed by Marge Bot
parent f7e3aecb87
commit 2fc79af07f
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/drivers/iris/iris_bufmgr.c
View file

@ -240,6 +240,8 @@ struct iris_bufmgr {
struct pb_slabs bo_slabs[NUM_SLAB_ALLOCATORS];
struct iris_border_color_pool border_color_pool;
struct iris_bo *dummy_aux_bo;
};
static simple_mtx_t global_bufmgr_list_mutex = SIMPLE_MTX_INITIALIZER;
@ -1803,6 +1805,8 @@ iris_bufmgr_destroy_global_vm(struct iris_bufmgr *bufmgr)
static void
iris_bufmgr_destroy(struct iris_bufmgr *bufmgr)
{
iris_bo_unreference(bufmgr->dummy_aux_bo);
iris_destroy_border_color_pool(&bufmgr->border_color_pool);
/* Free aux-map buffers */
@ -2441,8 +2445,20 @@ iris_bufmgr_create(struct intel_device_info *devinfo, int fd, bool bo_reuse)
iris_init_border_color_pool(bufmgr, &bufmgr->border_color_pool);
if (intel_needs_workaround(devinfo, 14019708328)) {
bufmgr->dummy_aux_bo = iris_bo_alloc(bufmgr, "dummy_aux", 4096, 4096,
IRIS_MEMZONE_OTHER, BO_ALLOC_PLAIN);
if (!bufmgr->dummy_aux_bo)
goto error_dummy_aux;
}
return bufmgr;
error_dummy_aux:
iris_destroy_border_color_pool(&bufmgr->border_color_pool);
intel_aux_map_finish(bufmgr->aux_map_ctx);
_mesa_hash_table_destroy(bufmgr->handle_table, NULL);
_mesa_hash_table_destroy(bufmgr->name_table, NULL);
error_slabs_init:
for (unsigned i = 0; i < NUM_SLAB_ALLOCATORS; i++) {
if (!bufmgr->bo_slabs[i].groups)
@ -2624,3 +2640,9 @@ iris_bufmgr_get_bind_timeline(struct iris_bufmgr *bufmgr)
{
return &bufmgr->bind_timeline;
}
uint64_t
iris_bufmgr_get_dummy_aux_address(struct iris_bufmgr *bufmgr)
{
return bufmgr->dummy_aux_bo ? bufmgr->dummy_aux_bo->address : 0;
}

1
src/gallium/drivers/iris/iris_bufmgr.h
View file

@ -655,6 +655,7 @@ uint32_t iris_bufmgr_get_global_vm_id(struct iris_bufmgr *bufmgr);
bool iris_bufmgr_use_global_vm_id(struct iris_bufmgr *bufmgr);
struct intel_bind_timeline *iris_bufmgr_get_bind_timeline(struct iris_bufmgr *bufmgr);
bool iris_bufmgr_compute_engine_supported(struct iris_bufmgr *bufmgr);
uint64_t iris_bufmgr_get_dummy_aux_address(struct iris_bufmgr *bufmgr);
enum iris_madvice {
IRIS_MADVICE_WILL_NEED = 0,

1
src/gallium/drivers/iris/iris_screen.c
View file

@ -850,6 +850,7 @@ iris_screen_create(int fd, const struct pipe_screen_config *config)
screen->precompile = debug_get_bool_option("shader_precompile", true);
isl_device_init(&screen->isl_dev, screen->devinfo);
screen->isl_dev.dummy_aux_address = iris_bufmgr_get_dummy_aux_address(screen->bufmgr);
iris_compiler_init(screen);