OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno: replace all dup() with os_dupfd_cloexec()

Browse Source 
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5369>
This commit is contained in:
Eric Engestrom
2020-06-05 10:22:47 +02:00
committed by Marge Bot
parent bd5cf70d3d
commit 9ca2a4e6fc
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedreno/drm/freedreno_device.c
View File

@@ -28,6 +28,8 @@
#include <sys/stat.h>
#include <unistd.h>
#include "util/os_file.h"
#include "freedreno_drmif.h"
#include "freedreno_priv.h"
@@ -90,7 +92,7 @@ out:
*/
struct fd_device * fd_device_new_dup(int fd)
{
int dup_fd = dup(fd);
int dup_fd = os_dupfd_cloexec(fd);
struct fd_device *dev = fd_device_new(dup_fd);
if (dev)
dev->closefd = 1;

8
src/freedreno/vulkan/tu_android.c
View File

@@ -33,6 +33,8 @@
#include "drm-uapi/drm_fourcc.h"
#include "util/os_file.h"
static int
tu_hal_open(const struct hw_module_t *mod,
const char *id,
@@ -154,7 +156,7 @@ tu_image_from_gralloc(VkDevice device_h,
.sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR,
.pNext = &ded_alloc,
.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT,
.fd = dup(dma_buf),
.fd = os_dupfd_cloexec(dma_buf),
};
result =
@@ -293,7 +295,7 @@ tu_AcquireImageANDROID(VkDevice device,
if (semaphore != VK_NULL_HANDLE) {
int semaphore_fd =
nativeFenceFd >= 0 ? dup(nativeFenceFd) : nativeFenceFd;
nativeFenceFd >= 0 ? os_dupfd_cloexec(nativeFenceFd) : nativeFenceFd;
semaphore_result = tu_ImportSemaphoreFdKHR(
device, &(VkImportSemaphoreFdInfoKHR) {
.sType = VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR,
@@ -304,7 +306,7 @@ tu_AcquireImageANDROID(VkDevice device,
}
if (fence != VK_NULL_HANDLE) {
int fence_fd = nativeFenceFd >= 0 ? dup(nativeFenceFd) : nativeFenceFd;
int fence_fd = nativeFenceFd >= 0 ? os_dupfd_cloexec(nativeFenceFd) : nativeFenceFd;
fence_result = tu_ImportFenceFdKHR(
device, &(VkImportFenceFdInfoKHR) {
.sType = VK_STRUCTURE_TYPE_IMPORT_FENCE_FD_INFO_KHR,

5
src/gallium/drivers/freedreno/freedreno_fence.c
View File

@@ -26,6 +26,7 @@
#include <libsync.h>
#include "util/os_file.h"
#include "util/u_inlines.h"
#include "freedreno_fence.h"
@@ -122,7 +123,7 @@ void fd_create_fence_fd(struct pipe_context *pctx,
enum pipe_fd_type type)
{
assert(type == PIPE_FD_TYPE_NATIVE_SYNC);
*pfence = fence_create(fd_context(pctx), NULL, 0, dup(fd));
*pfence = fence_create(fd_context(pctx), NULL, 0, os_dupfd_cloexec(fd));
}
void fd_fence_server_sync(struct pipe_context *pctx,
@@ -146,7 +147,7 @@ int fd_fence_get_fd(struct pipe_screen *pscreen,
struct pipe_fence_handle *fence)
{
fence_flush(fence);
return dup(fence->fence_fd);
return os_dupfd_cloexec(fence->fence_fd);
}
struct pipe_fence_handle * fd_fence_create(struct fd_batch *batch)