diff options
| author | Christian König <christian.koenig@amd.com> | 2022-09-29 13:05:56 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2022-11-03 12:45:20 +0100 |
| commit | 1b2d5eda5ad785d0dd13484141b78d2ac366c169 (patch) | |
| tree | 4c3f4885e4af7ef8c81f4593d4483676d0b81adc /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | f7d66fb2ea43a3016e78a700a2ca6c77a74579f9 (diff) | |
| download | linux-1b2d5eda5ad785d0dd13484141b78d2ac366c169.tar.bz2 | |
drm/amdgpu: move explicit sync check into the CS
This moves the memory allocation out of the critical code path.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221014084641.128280-8-christian.koenig@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index aa6f6c428dbc..d45b86bcf7fa 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -449,8 +449,19 @@ static int amdgpu_syncobj_lookup_and_add(struct amdgpu_cs_parser *p, } r = amdgpu_sync_fence(&p->gang_leader->sync, fence); - dma_fence_put(fence); + if (r) + goto error; + + /* + * When we have an explicit dependency it might be necessary to insert a + * pipeline sync to make sure that all caches etc are flushed and the + * next job actually sees the results from the previous one. + */ + if (fence->context == p->gang_leader->base.entity->fence_context) + r = amdgpu_sync_fence(&p->gang_leader->explicit_sync, fence); +error: + dma_fence_put(fence); return r; } |