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

nvk: Add a macro to set MMIO registers via falcons

Browse source 
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Karol Herbst 2023-03-23 15:43:05 +01:00 • committed by Marge Bot
parent 63bb25f87d
commit 837b622dbf
3 changed files with 54 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/nouveau/vulkan/nvk_cmd_draw.c
View file

@ -35,6 +35,44 @@ nvk_cmd_buffer_3d_cls(struct nvk_cmd_buffer *cmd)
return nvk_cmd_buffer_device(cmd)->ctx->eng3d.cls;
}
void
nvk_mme_set_priv_reg(struct mme_builder *b)
{
mme_mthd(b, NV9097_WAIT_FOR_IDLE);
mme_emit(b, mme_zero());
mme_mthd(b, NV9097_SET_MME_SHADOW_SCRATCH(0));
mme_emit(b, mme_zero());
mme_emit(b, mme_load(b));
mme_emit(b, mme_load(b));
/* Not sure if this has to strictly go before SET_FALCON04, but it might.
* We also don't really know what that value indicates and when and how it's
* set.
*/
struct mme_value s26 = mme_state(b, NV9097_SET_MME_SHADOW_SCRATCH(26));
s26 = mme_merge(b, mme_zero(), s26, 0, 8, 0);
mme_mthd(b, NV9097_SET_FALCON04);
mme_emit(b, mme_load(b));
mme_if(b, ieq, s26, mme_imm(2)) {
struct mme_value loop_cond = mme_mov(b, mme_zero());
mme_while(b, ine, loop_cond, mme_imm(1)) {
mme_state_to(b, loop_cond, NV9097_SET_MME_SHADOW_SCRATCH(0));
mme_mthd(b, NV9097_NO_OPERATION);
mme_emit(b, mme_zero());
};
}
mme_if(b, ine, s26, mme_imm(2)) {
mme_loop(b, mme_imm(10)) {
mme_mthd(b, NV9097_NO_OPERATION);
mme_emit(b, mme_zero());
}
}
}
VkResult
nvk_queue_init_context_draw_state(struct nvk_queue *queue)
{
@ -93,6 +131,18 @@ nvk_queue_init_context_draw_state(struct nvk_queue *queue)
free(dw);
}
/* Enable FP hepler invocation memory loads
*
* On older generations we'll let the kernel do it, but starting with GSP we
* have to do it this way.
*/
if (dev->ctx->eng3d.cls >= TURING_A) {
P_1INC(p, NV9097, CALL_MME_MACRO(NVK_MME_SET_PRIV_REG));
P_INLINE_DATA(p, 0);
P_INLINE_DATA(p, BITFIELD_BIT(3));
P_INLINE_DATA(p, 0x419ba4);
}
P_IMMD(p, NV9097, SET_RENDER_ENABLE_C, MODE_TRUE);
P_IMMD(p, NV9097, SET_Z_COMPRESSION, ENABLE_TRUE);

3
src/nouveau/vulkan/nvk_mme.c
View file

@ -16,7 +16,8 @@ static const nvk_mme_builder_func mme_builders[NVK_MME_COUNT] = {
[NVK_MME_WRITE_CS_INVOCATIONS] = nvk_mme_write_cs_invocations,
[NVK_MME_COPY_QUERIES] = nvk_mme_copy_queries,
[NVK_MME_XFB_COUNTER_LOAD] = nvk_mme_xfb_counter_load,
[NVK_MME_XFB_DRAW_INDIRECT] = nvk_mme_xfb_draw_indirect
[NVK_MME_XFB_DRAW_INDIRECT] = nvk_mme_xfb_draw_indirect,
[NVK_MME_SET_PRIV_REG] = nvk_mme_set_priv_reg,
};
uint32_t *

2
src/nouveau/vulkan/nvk_mme.h
View file

@ -20,6 +20,7 @@ enum nvk_mme {
NVK_MME_COPY_QUERIES,
NVK_MME_XFB_COUNTER_LOAD,
NVK_MME_XFB_DRAW_INDIRECT,
NVK_MME_SET_PRIV_REG,
NVK_MME_COUNT,
};
@ -52,5 +53,6 @@ void nvk_mme_write_cs_invocations(struct mme_builder *b);
void nvk_mme_copy_queries(struct mme_builder *b);
void nvk_mme_xfb_counter_load(struct mme_builder *b);
void nvk_mme_xfb_draw_indirect(struct mme_builder *b);
void nvk_mme_set_priv_reg(struct mme_builder *b);
#endif /* NVK_MME_H */