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

freedreno/drm: Rework APPEND() macro

Browse source 
In particular I wanted the nr_foo increment to be after assignment..
mostly just to track down a potential race.  (This wasn't it, but I
like this color for the bikeshed better.)

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7342>
This commit is contained in:
Rob Clark 2020-11-03 10:18:33 -08:00 • committed by Marge Bot
parent 2625ba064c
commit 13d509c7e6
3 changed files with 37 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/freedreno/drm/msm_priv.h
View file

@ -117,25 +117,25 @@ static inline void get_abs_timeout(struct drm_msm_timespec *tv, uint64_t ns)
* Stupid/simple growable array implementation: * Stupid/simple growable array implementation:
*/ */
static inline void * static inline void
grow(void *ptr, uint16_t nr, uint16_t *max, uint16_t sz) grow(void **ptr, uint16_t nr, uint16_t *max, uint16_t sz)
{ {
if ((nr + 1) > *max) { if ((nr + 1) > *max) {
if ((*max * 2) < (nr + 1)) if ((*max * 2) < (nr + 1))
*max = nr + 5; *max = nr + 5;
else else
*max = *max * 2; *max = *max * 2;
ptr = realloc(ptr, *max * sz); *ptr = realloc(*ptr, *max * sz);
} }
return ptr;
} }
#define DECLARE_ARRAY(type, name) \ #define DECLARE_ARRAY(type, name) \
unsigned short nr_ ## name, max_ ## name; \ unsigned short nr_ ## name, max_ ## name; \
type * name; type * name;
#define APPEND(x, name) ({ \ #define APPEND(x, name, ...) ({ \
(x)->name = grow((x)->name, (x)->nr_ ## name, &(x)->max_ ## name, sizeof((x)->name[0])); \ grow((void **)&(x)->name, (x)->nr_ ## name, &(x)->max_ ## name, sizeof((x)->name[0])); \
(x)->name[(x)->nr_ ## name] = __VA_ARGS__; \
(x)->nr_ ## name ++; \ (x)->nr_ ## name ++; \
}) })

60
src/freedreno/drm/msm_ringbuffer.c
View file

@ -150,15 +150,12 @@ append_bo(struct msm_submit *submit, struct fd_bo *bo)
/* found */ /* found */
idx = (uint32_t)(uintptr_t)entry->data; idx = (uint32_t)(uintptr_t)entry->data;
} else { } else {
idx = APPEND(submit, submit_bos); idx = APPEND(submit, submit_bos, (struct drm_msm_gem_submit_bo){
idx = APPEND(submit, bos); .flags = bo->flags & (MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE),
.handle = bo->handle,
submit->submit_bos[idx].flags = bo->flags & .presumed = 0,
(MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE); });
submit->submit_bos[idx].handle = bo->handle; APPEND(submit, bos, fd_bo_ref(bo));
submit->submit_bos[idx].presumed = 0;
submit->bos[idx] = fd_bo_ref(bo);
_mesa_hash_table_insert_pre_hashed(submit->bo_table, hash, bo, _mesa_hash_table_insert_pre_hashed(submit->bo_table, hash, bo,
(void *)(uintptr_t)idx); (void *)(uintptr_t)idx);
@ -464,12 +461,9 @@ finalize_current_cmd(struct fd_ringbuffer *ring)
debug_assert(msm_ring->cmd->ring_bo == msm_ring->ring_bo); debug_assert(msm_ring->cmd->ring_bo == msm_ring->ring_bo);
unsigned idx = APPEND(&msm_ring->u, cmds); msm_ring->cmd->size = offset_bytes(ring->cur, ring->start);
APPEND(&msm_ring->u, cmds, msm_ring->cmd);
msm_ring->u.cmds[idx] = msm_ring->cmd;
msm_ring->cmd = NULL; msm_ring->cmd = NULL;
msm_ring->u.cmds[idx]->size = offset_bytes(ring->cur, ring->start);
} }
static void static void
@ -501,9 +495,7 @@ msm_ringbuffer_emit_reloc(struct fd_ringbuffer *ring,
unsigned reloc_idx; unsigned reloc_idx;
if (ring->flags & _FD_RINGBUFFER_OBJECT) { if (ring->flags & _FD_RINGBUFFER_OBJECT) {
unsigned idx = APPEND(&msm_ring->u, reloc_bos); unsigned idx = APPEND(&msm_ring->u, reloc_bos, fd_bo_ref(reloc->bo));
msm_ring->u.reloc_bos[idx] = fd_bo_ref(reloc->bo);
/* this gets fixed up at submit->flush() time, since this state- /* this gets fixed up at submit->flush() time, since this state-
* object rb can be used with many different submits * object rb can be used with many different submits
@ -520,30 +512,24 @@ msm_ringbuffer_emit_reloc(struct fd_ringbuffer *ring,
pipe = msm_ring->u.submit->pipe; pipe = msm_ring->u.submit->pipe;
} }
struct drm_msm_gem_submit_reloc *r; APPEND(msm_ring->cmd, relocs, (struct drm_msm_gem_submit_reloc){
unsigned idx = APPEND(msm_ring->cmd, relocs); .reloc_idx = reloc_idx,
.reloc_offset = reloc->offset,
r = &msm_ring->cmd->relocs[idx]; .or = reloc->or,
.shift = reloc->shift,
r->reloc_idx = reloc_idx; .submit_offset = offset_bytes(ring->cur, ring->start) + msm_ring->offset,
r->reloc_offset = reloc->offset; });
r->or = reloc->or;
r->shift = reloc->shift;
r->submit_offset = offset_bytes(ring->cur, ring->start) +
msm_ring->offset;
ring->cur++; ring->cur++;
if (pipe->gpu_id >= 500) { if (pipe->gpu_id >= 500) {
idx = APPEND(msm_ring->cmd, relocs); APPEND(msm_ring->cmd, relocs, (struct drm_msm_gem_submit_reloc){
r = &msm_ring->cmd->relocs[idx]; .reloc_idx = reloc_idx,
.reloc_offset = reloc->offset,
r->reloc_idx = reloc_idx; .or = reloc->orhi,
r->reloc_offset = reloc->offset; .shift = reloc->shift - 32,
r->or = reloc->orhi; .submit_offset = offset_bytes(ring->cur, ring->start) + msm_ring->offset,
r->shift = reloc->shift - 32; });
r->submit_offset = offset_bytes(ring->cur, ring->start) +
msm_ring->offset;
ring->cur++; ring->cur++;
} }

22
src/freedreno/drm/msm_ringbuffer_sp.c
View file

@ -126,9 +126,7 @@ msm_submit_append_bo(struct msm_submit_sp *submit, struct fd_bo *bo)
/* found */ /* found */
idx = (uint32_t)(uintptr_t)entry->data; idx = (uint32_t)(uintptr_t)entry->data;
} else { } else {
idx = APPEND(submit, bos); idx = APPEND(submit, bos, fd_bo_ref(bo));
submit->bos[idx] = fd_bo_ref(bo);
_mesa_hash_table_insert_pre_hashed(submit->bo_table, hash, bo, _mesa_hash_table_insert_pre_hashed(submit->bo_table, hash, bo,
(void *)(uintptr_t)idx); (void *)(uintptr_t)idx);
@ -272,7 +270,7 @@ msm_submit_sp_flush(struct fd_submit *submit, int in_fence_fd,
submit_bos[i].handle = msm_submit->bos[i]->handle; submit_bos[i].handle = msm_submit->bos[i]->handle;
submit_bos[i].presumed = 0; submit_bos[i].presumed = 0;
} }
req.bos = VOID2U64(&submit_bos), req.bos = VOID2U64(submit_bos),
req.nr_bos = msm_submit->nr_bos; req.nr_bos = msm_submit->nr_bos;
req.cmds = VOID2U64(cmds), req.cmds = VOID2U64(cmds),
req.nr_cmds = primary->u.nr_cmds; req.nr_cmds = primary->u.nr_cmds;
@ -366,10 +364,10 @@ finalize_current_cmd(struct fd_ringbuffer *ring)
debug_assert(!(ring->flags & _FD_RINGBUFFER_OBJECT)); debug_assert(!(ring->flags & _FD_RINGBUFFER_OBJECT));
struct msm_ringbuffer_sp *msm_ring = to_msm_ringbuffer_sp(ring); struct msm_ringbuffer_sp *msm_ring = to_msm_ringbuffer_sp(ring);
unsigned idx = APPEND(&msm_ring->u, cmds); APPEND(&msm_ring->u, cmds, (struct msm_cmd_sp){
.ring_bo = fd_bo_ref(msm_ring->ring_bo),
msm_ring->u.cmds[idx].ring_bo = fd_bo_ref(msm_ring->ring_bo); .size = offset_bytes(ring->cur, ring->start),
msm_ring->u.cmds[idx].size = offset_bytes(ring->cur, ring->start); });
} }
static void static void
@ -413,8 +411,7 @@ msm_ringbuffer_sp_emit_reloc(struct fd_ringbuffer *ring,
} }
} }
if (!found) { if (!found) {
unsigned idx = APPEND(&msm_ring->u, reloc_bos); APPEND(&msm_ring->u, reloc_bos, fd_bo_ref(reloc->bo));
msm_ring->u.reloc_bos[idx] = fd_bo_ref(reloc->bo);
} }
pipe = msm_ring->u.pipe; pipe = msm_ring->u.pipe;
@ -474,10 +471,7 @@ msm_ringbuffer_sp_emit_reloc_ring(struct fd_ringbuffer *ring,
if (ring->flags & _FD_RINGBUFFER_OBJECT) { if (ring->flags & _FD_RINGBUFFER_OBJECT) {
for (unsigned i = 0; i < msm_target->u.nr_reloc_bos; i++) { for (unsigned i = 0; i < msm_target->u.nr_reloc_bos; i++) {
unsigned idx = APPEND(&msm_ring->u, reloc_bos); APPEND(&msm_ring->u, reloc_bos, fd_bo_ref(msm_target->u.reloc_bos[i]));
msm_ring->u.reloc_bos[idx] =
fd_bo_ref(msm_target->u.reloc_bos[i]);
} }
} else { } else {
// TODO it would be nice to know whether we have already // TODO it would be nice to know whether we have already