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

freedreno/drm: Allow FD_BO_PREP_FLUSH without _NOSYNC

Browse source 
This provides the upper layer (gallium, etc) a way to ensure that
rendering involving the bo has been flushed all the way to the kernel.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10530>
This commit is contained in:
Rob Clark 2021-04-29 11:31:25 -07:00
parent dbdc979320
commit 5181f40670
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/freedreno/drm/freedreno_bo.c
View file

@ -453,21 +453,24 @@ fd_bo_map(struct fd_bo *bo)
int
fd_bo_cpu_prep(struct fd_bo *bo, struct fd_pipe *pipe, uint32_t op)
{
if (op & FD_BO_PREP_NOSYNC) {
if (op & (FD_BO_PREP_NOSYNC | FD_BO_PREP_FLUSH)) {
simple_mtx_lock(&table_lock);
enum fd_bo_state state = fd_bo_state(bo);
simple_mtx_unlock(&table_lock);
switch (state) {
case FD_BO_STATE_IDLE:
if (state == FD_BO_STATE_IDLE)
return 0;
case FD_BO_STATE_BUSY:
if (op & FD_BO_PREP_FLUSH)
bo_flush(bo);
if (op & FD_BO_PREP_FLUSH)
bo_flush(bo);
/* If we have *only* been asked to flush, then we aren't really
* interested about whether shared buffers are busy, so avoid
* the kernel ioctl.
*/
if ((state == FD_BO_STATE_BUSY) ||
(op == FD_BO_PREP_FLUSH))
return -EBUSY;
case FD_BO_STATE_UNKNOWN:
break;
}
}
/* In case the bo is referenced by a deferred submit, flush up to the
@ -475,7 +478,10 @@ fd_bo_cpu_prep(struct fd_bo *bo, struct fd_pipe *pipe, uint32_t op)
*/
bo_flush(bo);
return bo->funcs->cpu_prep(bo, pipe, op);
/* FD_BO_PREP_FLUSH is purely a frontend flag, and is not seen/handled
* by backend or kernel:
*/
return bo->funcs->cpu_prep(bo, pipe, op & ~FD_BO_PREP_FLUSH);
}
void