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

iris: Use the aux BO and surf less during init

Browse source 
res->aux.bo and res->aux.surf will be NULL and zeroed, respectively, for
CCS on XeHP. Move and modify iris_resource_init_aux_buf to support this.

Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13555>
This commit is contained in:
Nanley Chery 2021-10-19 08:12:30 -07:00 • committed by Marge Bot
parent 02bbdb0e92
commit 9acf0316ec
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/drivers/iris/iris_resource.c
View file

@ -856,7 +856,7 @@ static bool
iris_resource_init_aux_buf(struct iris_screen *screen,
struct iris_resource *res)
{
void *map = iris_bo_map(NULL, res->aux.bo, MAP_WRITE | MAP_RAW);
void *map = iris_bo_map(NULL, res->bo, MAP_WRITE | MAP_RAW);
if (!map)
return false;
@ -875,10 +875,10 @@ iris_resource_init_aux_buf(struct iris_screen *screen,
memset((char *)map + res->aux.clear_color_offset, 0,
iris_get_aux_clear_color_state_size(screen));
iris_bo_unmap(res->aux.bo);
iris_bo_unmap(res->bo);
if (iris_get_aux_clear_color_state_size(screen) > 0) {
res->aux.clear_color_bo = res->aux.bo;
res->aux.clear_color_bo = res->bo;
iris_bo_reference(res->aux.clear_color_bo);
}
@ -1109,11 +1109,13 @@ iris_resource_create_with_modifiers(struct pipe_screen *pscreen,
if (!res->bo)
goto fail;
if (res->aux.usage != ISL_AUX_USAGE_NONE &&
!iris_resource_init_aux_buf(screen, res))
goto fail;
if (res->aux.surf.size_B > 0) {
res->aux.bo = res->bo;
iris_bo_reference(res->aux.bo);
if (!iris_resource_init_aux_buf(screen, res))
goto fail;
map_aux_addresses(screen, res, res->surf.format, 0);
}