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

iris: Rename surface_base_address to binder_address in a few places

Browse source 
On Gfx11+, we're going to stop changing Surface State Base Address
and instead start changing the Binding Table Pool address instead.

So, rename a few things to track the last binder address, which is
what we're actually changing, regardless of how we program it.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14507>
This commit is contained in:
Kenneth Graunke 2022-01-11 12:36:26 -08:00 • committed by Marge Bot
parent db34c71513
commit ab47cad4fb
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/iris/iris_batch.c
View file

@ -521,7 +521,7 @@ iris_batch_reset(struct iris_batch *batch)
batch->total_chained_batch_size = 0;
batch->contains_draw = false;
batch->contains_fence_signal = false;
batch->decoder.surface_base = batch->last_surface_base_address;
batch->decoder.surface_base = batch->last_binder_address;
create_batch(batch);
assert(batch->bo->index == 0);

4
src/gallium/drivers/iris/iris_batch.h
View file

@ -80,8 +80,8 @@ struct iris_batch {
/** Total size of all chained batches (in bytes). */
unsigned total_chained_batch_size;
/** Last Surface State Base Address set in this hardware context. */
uint64_t last_surface_base_address;
/** Last binder address set in this hardware context. */
uint64_t last_binder_address;
uint32_t ctx_id;
uint32_t exec_flags;

2
src/gallium/drivers/iris/iris_blorp.c
View file

@ -177,7 +177,7 @@ blorp_alloc_binding_table(struct blorp_batch *blorp_batch,
iris_use_pinned_bo(batch, binder->bo, false, IRIS_DOMAIN_NONE);
batch->screen->vtbl.update_surface_base_address(batch, binder);
batch->screen->vtbl.update_binder_address(batch, binder);
}
static uint32_t

2
src/gallium/drivers/iris/iris_context.c
View file

@ -83,7 +83,7 @@ iris_lost_context_state(struct iris_batch *batch)
memset(&ice->shaders.urb, 0, sizeof(ice->shaders.urb));
memset(ice->state.last_block, 0, sizeof(ice->state.last_block));
memset(ice->state.last_grid, 0, sizeof(ice->state.last_grid));
batch->last_surface_base_address = ~0ull;
batch->last_binder_address = ~0ull;
batch->last_aux_map_state = 0;
batch->screen->vtbl.lost_genx_state(ice, batch);
}

4
src/gallium/drivers/iris/iris_draw.c
View file

@ -305,7 +305,7 @@ iris_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info,
iris_binder_reserve_3d(ice);
batch->screen->vtbl.update_surface_base_address(batch, &ice->state.binder);
batch->screen->vtbl.update_binder_address(batch, &ice->state.binder);
iris_handle_always_flush_cache(batch);
@ -411,7 +411,7 @@ iris_launch_grid(struct pipe_context *ctx, const struct pipe_grid_info *grid)
iris_update_grid_size_resource(ice, grid);
iris_binder_reserve_compute(ice);
batch->screen->vtbl.update_surface_base_address(batch, &ice->state.binder);
batch->screen->vtbl.update_binder_address(batch, &ice->state.binder);
if (ice->state.compute_predicate) {
batch->screen->vtbl.load_register_mem64(batch, MI_PREDICATE_RESULT,

4
src/gallium/drivers/iris/iris_screen.h
View file

@ -67,8 +67,8 @@ struct iris_vtable {
unsigned drawid_offset,
const struct pipe_draw_indirect_info *indirect,
const struct pipe_draw_start_count_bias *sc);
void (*update_surface_base_address)(struct iris_batch *batch,
struct iris_binder *binder);
void (*update_binder_address)(struct iris_batch *batch,
struct iris_binder *binder);
void (*upload_compute_state)(struct iris_context *ice,
struct iris_batch *batch,
const struct pipe_grid_info *grid);

10
src/gallium/drivers/iris/iris_state.c
View file

@ -5447,10 +5447,10 @@ iris_restore_compute_saved_bos(struct iris_context *ice,
* Possibly emit STATE_BASE_ADDRESS to update Surface State Base Address.
*/
static void
iris_update_surface_base_address(struct iris_batch *batch,
struct iris_binder *binder)
iris_update_binder_address(struct iris_batch *batch,
struct iris_binder *binder)
{
if (batch->last_surface_base_address == binder->bo->address)
if (batch->last_binder_address == binder->bo->address)
return;
struct isl_device *isl_dev = &batch->screen->isl_dev;
@ -5514,7 +5514,7 @@ iris_update_surface_base_address(struct iris_batch *batch,
flush_after_state_base_change(batch);
iris_batch_sync_region_end(batch);
batch->last_surface_base_address = binder->bo->address;
batch->last_binder_address = binder->bo->address;
}
static inline void
@ -8328,7 +8328,7 @@ genX(init_screen_state)(struct iris_screen *screen)
screen->vtbl.init_render_context = iris_init_render_context;
screen->vtbl.init_compute_context = iris_init_compute_context;
screen->vtbl.upload_render_state = iris_upload_render_state;
screen->vtbl.update_surface_base_address = iris_update_surface_base_address;
screen->vtbl.update_binder_address = iris_update_binder_address;
screen->vtbl.upload_compute_state = iris_upload_compute_state;
screen->vtbl.emit_raw_pipe_control = iris_emit_raw_pipe_control;
screen->vtbl.emit_mi_report_perf_count = iris_emit_mi_report_perf_count;