iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/etnaviv: stop using dma_resv_excl_fence v2

Browse Source 
We can get the excl fence together with the shared ones as well.

v2: rename the member to fences as well

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Russell King <linux+etnaviv@armlinux.org.uk>
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: etnaviv@lists.freedesktop.org
Link: https://patchwork.freedesktop.org/patch/msgid/20220321135856.1331-5-christian.koenig@amd.com
This commit is contained in:
Christian König 2021-11-03 09:34:29 +01:00
parent e0fd83dbe9
commit 0941a4e3c6
3 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/etnaviv/etnaviv_gem.h
View File

@ -80,9 +80,8 @@ struct etnaviv_gem_submit_bo {
u64 va;
struct etnaviv_gem_object *obj;
struct etnaviv_vram_mapping *mapping;
struct dma_fence *excl;
unsigned int nr_shared;
struct dma_fence **shared;
unsigned int nr_fences;
struct dma_fence **fences;
};
/* Created per submit-ioctl, to track bo's and cmdstream bufs, etc,

14
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
View File

@ -188,15 +188,11 @@ static int submit_fence_sync(struct etnaviv_gem_submit *submit)
if (submit->flags & ETNA_SUBMIT_NO_IMPLICIT)
continue;
if (bo->flags & ETNA_SUBMIT_BO_WRITE) {
ret = dma_resv_get_fences(robj, true, &bo->nr_shared,
&bo->shared);
if (ret)
return ret;
} else {
bo->excl = dma_fence_get(dma_resv_excl_fence(robj));
}
ret = dma_resv_get_fences(robj,
bo->flags & ETNA_SUBMIT_BO_WRITE,
&bo->nr_fences, &bo->fences);
if (ret)
return ret;
}
return ret;

24
drivers/gpu/drm/etnaviv/etnaviv_sched.c
View File

@ -39,31 +39,21 @@ etnaviv_sched_dependency(struct drm_sched_job *sched_job,
struct etnaviv_gem_submit_bo *bo = &submit->bos[i];
int j;
if (bo->excl) {
fence = bo->excl;
bo->excl = NULL;
if (!dma_fence_is_signaled(fence))
return fence;
dma_fence_put(fence);
}
for (j = 0; j < bo->nr_shared; j++) {
if (!bo->shared[j])
for (j = 0; j < bo->nr_fences; j++) {
if (!bo->fences[j])
continue;
fence = bo->shared[j];
bo->shared[j] = NULL;
fence = bo->fences[j];
bo->fences[j] = NULL;
if (!dma_fence_is_signaled(fence))
return fence;
dma_fence_put(fence);
}
kfree(bo->shared);
bo->nr_shared = 0;
bo->shared = NULL;
kfree(bo->fences);
bo->nr_fences = 0;
bo->fences = NULL;
}
return NULL;