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

iris/gen12: Write GFX_AUX_TABLE base address register

Browse source 
Rework:
 * Move last_aux_map_state to iris_batch. (Nanley, Ken)

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jordan Justen 2018-04-27 16:39:30 -07:00
parent f046c6d090
commit 2e6a7ced4d
No known key found for this signature in database
GPG key ID: 37F99F68CAF992EB
5 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,6 +126,8 @@ struct iris_batch {
/** Have we emitted any draw calls to this batch? */
bool contains_draw;
uint32_t last_aux_map_state;
};
void iris_init_batch(struct iris_batch *batch,

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

@ -317,6 +317,10 @@ iris_blorp_exec(struct blorp_batch *blorp_batch,
params->y1 - params->y0, scale);
}
#if GEN_GEN >= 12
genX(emit_aux_map_state)(batch);
#endif
iris_handle_always_flush_cache(batch);
blorp_exec(blorp_batch, params);

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

@ -98,6 +98,7 @@ iris_lost_context_state(struct iris_batch *batch)
ice->state.current_hash_scale = 0;
memset(ice->state.last_grid, 0, sizeof(ice->state.last_grid));
batch->last_surface_base_address = ~0ull;
batch->last_aux_map_state = 0;
ice->vtbl.lost_genx_state(ice, batch);
}

2
src/gallium/drivers/iris/iris_genx_protos.h
View file

@ -41,6 +41,8 @@ void genX(update_pma_fix)(struct iris_context *ice,
struct iris_batch *batch,
bool enable);
void genX(emit_aux_map_state)(struct iris_batch *batch);
/* iris_blorp.c */
void genX(init_blorp)(struct iris_context *ice);

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

@ -98,6 +98,7 @@
#include "drm-uapi/i915_drm.h"
#include "nir.h"
#include "intel/compiler/brw_compiler.h"
#include "intel/common/gen_aux_map.h"
#include "intel/common/gen_l3_config.h"
#include "intel/common/gen_sample_positions.h"
#include "iris_batch.h"
@ -4989,6 +4990,30 @@ iris_viewport_zmin_zmax(const struct pipe_viewport_state *vp, bool halfz,
util_viewport_zmin_zmax(vp, halfz, zmin, zmax);
}
#if GEN_GEN >= 12
void
genX(emit_aux_map_state)(struct iris_batch *batch)
{
struct iris_screen *screen = batch->screen;
void *aux_map_ctx = iris_bufmgr_get_aux_map_context(screen->bufmgr);
if (!aux_map_ctx)
return;
uint32_t aux_map_state_num = gen_aux_map_get_state_num(aux_map_ctx);
if (batch->last_aux_map_state != aux_map_state_num) {
/* If the aux-map state number increased, then we need to rewrite the
* register. Rewriting the register is used to both set the aux-map
* translation table address, and also to invalidate any previously
* cached translations.
*/
uint64_t base_addr = gen_aux_map_get_base(aux_map_ctx);
assert(base_addr != 0 && ALIGN(base_addr, 32 * 1024) == base_addr);
iris_load_register_imm64(batch, GENX(GFX_AUX_TABLE_BASE_ADDR_num),
base_addr);
batch->last_aux_map_state = aux_map_state_num;
}
}
#endif
static void
iris_upload_dirty_render_state(struct iris_context *ice,
struct iris_batch *batch,
@ -5840,6 +5865,10 @@ iris_upload_dirty_render_state(struct iris_context *ice,
if (ice->state.current_hash_scale != 1)
genX(emit_hashing_mode)(ice, batch, UINT_MAX, UINT_MAX, 1);
#if GEN_GEN >= 12
genX(emit_aux_map_state)(batch);
#endif
}
static void
@ -6092,6 +6121,10 @@ iris_upload_compute_state(struct iris_context *ice,
if (ice->state.need_border_colors)
iris_use_pinned_bo(batch, ice->state.border_color_pool.bo, false);
#if GEN_GEN >= 12
genX(emit_aux_map_state)(batch);
#endif
if (dirty & IRIS_DIRTY_CS) {
/* The MEDIA_VFE_STATE documentation for Gen8+ says:
*