SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last fixes and improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-07-30 17:58:45 +00:00
parent f960599e67
commit 691f97cc10
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
215 changed files with 1520 additions and 11518 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sys/dev/pci/drm/dma-resv.c
View file

@ -572,6 +572,7 @@ int dma_resv_get_fences(struct dma_resv *obj, enum dma_resv_usage usage,
dma_resv_for_each_fence_unlocked(&cursor, fence) {
if (dma_resv_iter_is_restarted(&cursor)) {
struct dma_fence **new_fences;
unsigned int count;
while (*num_fences)
@ -581,9 +582,9 @@ int dma_resv_get_fences(struct dma_resv *obj, enum dma_resv_usage usage,
/* Eventually re-allocate the array */
#ifdef __linux__
*fences = krealloc_array(*fences, count,
sizeof(void *),
GFP_KERNEL);
new_fences = krealloc_array(*fences, count,
sizeof(void *),
GFP_KERNEL);
#else
nfences = kmalloc(count * sizeof(void *),
GFP_KERNEL);
@ -592,13 +593,17 @@ int dma_resv_get_fences(struct dma_resv *obj, enum dma_resv_usage usage,
(count - 1) * sizeof(void *));
if (nfences) {
kfree(*fences);
*fences = nfences;
new_fences = nfences;
}
#endif
if (count && !*fences) {
if (count && !new_fences) {
kfree(*fences);
*fences = NULL;
*num_fences = 0;
dma_resv_iter_end(&cursor);
return -ENOMEM;
}
*fences = new_fences;
}
(*fences)[(*num_fences)++] = dma_fence_get(fence);