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

iris: Use common res fields for imported planes

Browse source 
Instead of putting the aux plane info in the aux fields, just use the
same iris_resource fields for all planes.

Reviewed-by: Jianxun Zhang <jianxun.zhang@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25768>
This commit is contained in:
Nanley Chery 2023-08-07 16:12:06 -04:00 • committed by Marge Bot
parent a0f3c0a246
commit 5f93f97892
1 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1328,6 +1328,12 @@ iris_resource_from_handle(struct pipe_screen *pscreen,
struct iris_screen *screen = (struct iris_screen *)pscreen;
const struct intel_device_info *devinfo = screen->devinfo;
struct iris_bufmgr *bufmgr = screen->bufmgr;
/* The gallium dri layer creates a pipe resource for each plane specified
* by the format and modifier. Once all planes are present, we will merge
* the separate parameters into the iris_resource(s) for the main plane(s).
* Save the modifier import information now to reconstruct later.
*/
struct iris_resource *res = iris_alloc_resource(pscreen, templ);
if (!res)
return NULL;
@ -1359,6 +1365,7 @@ iris_resource_from_handle(struct pipe_screen *pscreen,
res->offset = whandle->offset;
res->external_format = whandle->format;
res->surf.row_pitch_B = whandle->stride;
if (templ->target == PIPE_BUFFER) {
res->surf.tiling = ISL_TILING_LINEAR;
@ -1375,25 +1382,6 @@ iris_resource_from_handle(struct pipe_screen *pscreen,
if (!iris_resource_configure_aux(screen, res, true))
goto fail;
/* The gallium dri layer will create a separate plane resource for the
* aux image. We will merge the separate aux parameters back into a
* single iris_resource.
*/
} else if (isl_drm_modifier_plane_is_clear_color(modifier,
whandle->plane)) {
res->aux.clear_color_offset = whandle->offset;
res->aux.clear_color_bo = res->bo;
res->bo = NULL;
} else {
/* Save modifier import information to reconstruct later. After import,
* this will be available under a second image accessible from the main
* image with res->base.next.
*/
res->aux.surf.row_pitch_B = whandle->stride;
res->aux.offset = whandle->offset;
res->aux.bo = res->bo;
res->bo = NULL;
}
if (whandle->plane == 0) {
@ -1409,25 +1397,24 @@ iris_resource_from_handle(struct pipe_screen *pscreen,
if (isl_drm_modifier_plane_is_clear_color(whandle->modifier,
plane)) {
/* Fill out the clear color fields. */
assert(plane_res->aux.clear_color_bo->size >=
plane_res->aux.clear_color_offset +
assert(plane_res->bo->size >= plane_res->offset +
screen->isl_dev.ss.clear_color_state_size);
iris_bo_reference(plane_res->aux.clear_color_bo);
main_res->aux.clear_color_bo = plane_res->aux.clear_color_bo;
main_res->aux.clear_color_offset = plane_res->aux.clear_color_offset;
iris_bo_reference(plane_res->bo);
main_res->aux.clear_color_bo = plane_res->bo;
main_res->aux.clear_color_offset = plane_res->offset;
main_res->aux.clear_color_unknown = true;
} else if (plane > main_plane) {
/* Fill out some aux surface fields. */
assert(!devinfo->has_flat_ccs);
assert(plane_res->aux.bo->size >=
plane_res->aux.offset + main_res->aux.surf.size_B);
assert(plane_res->bo->size >= plane_res->offset +
main_res->aux.surf.size_B);
assert(main_res->aux.surf.row_pitch_B ==
plane_res->aux.surf.row_pitch_B);
plane_res->surf.row_pitch_B);
iris_bo_reference(plane_res->aux.bo);
main_res->aux.bo = plane_res->aux.bo;
main_res->aux.offset = plane_res->aux.offset;
iris_bo_reference(plane_res->bo);
main_res->aux.bo = plane_res->bo;
main_res->aux.offset = plane_res->offset;
map_aux_addresses(screen, main_res, whandle->format, main_plane);
} else {
/* Fill out fields that are convenient to initialize now. */