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

ethosu: Let maxblockdeps be arch-specific

Browse source 
As U85 can have up to 7.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39611>
This commit is contained in:
Tomeu Vizoso 2026-02-17 09:11:08 +01:00 • committed by Marge Bot
parent 0af37552a7
commit 91137a9327
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/ethosu/ethosu_cmd.c
View file

@ -15,7 +15,6 @@
#include "ethosu_registers.h"
#include "ethosu_sched.h"
#define MAX_BLOCKDEP 3
#define MAX_OUTSTANDING_DMA_OPS 2
#define MAX_OUTSTANDING_NPU_OPS 2
@ -685,12 +684,13 @@ calc_blockdep(struct ethosu_subgraph *subgraph, struct ethosu_operation *prev_op
if (ifm_overlaps || ifm2_overlaps)
return 0;
return MAX_BLOCKDEP;
return ethosu_screen(subgraph->base.context->screen)->max_concurrent_blocks; /* TODO: Check if there is actually overlap between the FMs */
}
void
ethosu_emit_cmdstream(struct ethosu_subgraph *subgraph)
{
struct ethosu_screen *screen = ethosu_screen(subgraph->base.context->screen);
struct ethosu_operation *prev_op = NULL;
struct util_dynarray outstanding_dma_ops;
struct util_dynarray outstanding_npu_ops;
@ -706,7 +706,7 @@ ethosu_emit_cmdstream(struct ethosu_subgraph *subgraph)
/* Compile */
if (ethosu_is_u65(ethosu_screen(subgraph->base.context->screen)))
if (ethosu_is_u65(screen))
EMIT0(NPU_SET_PARALLEL_MODE, 0x0);
util_dynarray_foreach (&subgraph->operations, struct ethosu_operation, operation) {
@ -733,7 +733,7 @@ ethosu_emit_cmdstream(struct ethosu_subgraph *subgraph)
if (operation->type != ETHOSU_OPERATION_TYPE_DMA) {
unsigned blockdep = calc_blockdep(subgraph, prev_op, operation);
blockdep = MIN2(blockdep, MAX_BLOCKDEP);
blockdep = MIN2(blockdep, screen->max_concurrent_blocks);
EMIT0(NPU_SET_BLOCKDEP, blockdep);
prev_op = operation;

6
src/gallium/drivers/ethosu/ethosu_device.c
View file

@ -233,6 +233,12 @@ ethosu_screen_create(int fd,
if (DBG_ENABLED(ETHOSU_DBG_DISABLE_SRAM))
ethosu_screen->info.sram_size = 0;
if (ethosu_is_u65(ethosu_screen)) {
ethosu_screen->max_concurrent_blocks = 3;
} else {
ethosu_screen->max_concurrent_blocks = 7;
}
screen->get_screen_fd = ethosu_screen_get_fd;
screen->destroy = ethosu_destroy_screen;
screen->context_create = ethosu_create_context;

1
src/gallium/drivers/ethosu/ethosu_device.h
View file

@ -38,6 +38,7 @@ struct ethosu_screen {
int fd;
struct drm_ethosu_npu_info info;
unsigned max_concurrent_blocks;
};
static inline struct ethosu_screen *