AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3dv: rename drm device fields so they are more explict

Browse Source 
Also, remove references to the master_fd. This is only useful for
VK_KHR_display which we are not currently implementing.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
This commit is contained in:
Iago Toral Quiroga
2020-01-23 11:59:28 +01:00
committed by Marge Bot
parent 356cf8261e
commit 9a72a79d1c
5 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/broadcom/vulkan/v3dv_queue.c
+12 -12
View File
@@ -91,11 +91,11 @@ process_semaphores_to_signal(struct v3dv_device *device,
sem->fd = -1;
int fd;
drmSyncobjExportSyncFile(device->fd, device->last_job_sync, &fd);
drmSyncobjExportSyncFile(device->render_fd, device->last_job_sync, &fd);
if (fd == -1)
return VK_ERROR_DEVICE_LOST;
int ret = drmSyncobjImportSyncFile(device->fd, sem->sync, fd);
int ret = drmSyncobjImportSyncFile(device->render_fd, sem->sync, fd);
if (ret)
return VK_ERROR_DEVICE_LOST;
@@ -118,11 +118,11 @@ process_fence_to_signal(struct v3dv_device *device, VkFence _fence)
fence->fd = -1;
int fd;
drmSyncobjExportSyncFile(device->fd, device->last_job_sync, &fd);
drmSyncobjExportSyncFile(device->render_fd, device->last_job_sync, &fd);
if (fd == -1)
return VK_ERROR_DEVICE_LOST;
int ret = drmSyncobjImportSyncFile(device->fd, fence->sync, fd);
int ret = drmSyncobjImportSyncFile(device->render_fd, fence->sync, fd);
if (ret)
return VK_ERROR_DEVICE_LOST;
@@ -184,7 +184,7 @@ queue_submit_job(struct v3dv_job *job, bool do_wait)
struct v3dv_device *device = job->cmd_buffer->device;
v3dv_clif_dump(device, job, &submit);
int ret = v3dv_ioctl(device->fd, DRM_IOCTL_V3D_SUBMIT_CL, &submit);
int ret = v3dv_ioctl(device->render_fd, DRM_IOCTL_V3D_SUBMIT_CL, &submit);
static bool warned = false;
if (ret && !warned) {
fprintf(stderr, "Draw call returned %s. Expect corruption.\n",
@@ -277,7 +277,7 @@ v3dv_CreateSemaphore(VkDevice _device,
sem->fd = -1;
int ret = drmSyncobjCreate(device->fd, 0, &sem->sync);
int ret = drmSyncobjCreate(device->render_fd, 0, &sem->sync);
if (ret) {
vk_free2(&device->alloc, pAllocator, sem);
return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -299,7 +299,7 @@ v3dv_DestroySemaphore(VkDevice _device,
if (sem == NULL)
return;
drmSyncobjDestroy(device->fd, sem->sync);
drmSyncobjDestroy(device->render_fd, sem->sync);
if (sem->fd != -1)
close(sem->fd);
@@ -326,7 +326,7 @@ v3dv_CreateFence(VkDevice _device,
unsigned flags = 0;
if (pCreateInfo->flags & VK_FENCE_CREATE_SIGNALED_BIT)
flags |= DRM_SYNCOBJ_CREATE_SIGNALED;
int ret = drmSyncobjCreate(device->fd, flags, &fence->sync);
int ret = drmSyncobjCreate(device->render_fd, flags, &fence->sync);
if (ret) {
vk_free2(&device->alloc, pAllocator, fence);
return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -350,7 +350,7 @@ v3dv_DestroyFence(VkDevice _device,
if (fence == NULL)
return;
drmSyncobjDestroy(device->fd, fence->sync);
drmSyncobjDestroy(device->render_fd, fence->sync);
if (fence->fd != -1)
close(fence->fd);
@@ -364,7 +364,7 @@ v3dv_GetFenceStatus(VkDevice _device, VkFence _fence)
V3DV_FROM_HANDLE(v3dv_device, device, _device);
V3DV_FROM_HANDLE(v3dv_fence, fence, _fence);
int ret = drmSyncobjWait(device->fd, &fence->sync, 1,
int ret = drmSyncobjWait(device->render_fd, &fence->sync, 1,
0, DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT, NULL);
if (ret == -ETIME)
return VK_NOT_READY;
@@ -389,7 +389,7 @@ v3dv_ResetFences(VkDevice _device, uint32_t fenceCount, const VkFence *pFences)
syncobjs[i] = fence->sync;
}
int ret = drmSyncobjReset(device->fd, syncobjs, fenceCount);
int ret = drmSyncobjReset(device->render_fd, syncobjs, fenceCount);
vk_free(&device->alloc, syncobjs);
@@ -424,7 +424,7 @@ v3dv_WaitForFences(VkDevice _device,
int ret;
do {
ret = drmSyncobjWait(device->fd, syncobjs, fenceCount,
ret = drmSyncobjWait(device->render_fd, syncobjs, fenceCount,
timeout, flags, NULL);
} while (ret == -ETIME && gettime_ns() < abs_timeout);