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

panvk: Use vk_device::drm_fd instead of going back to the physical device

Browse Source 
There's no reason to dereference the physical device if we can use
the value stored in vk_device, plus it gets rid of a few
panfrost_device_fd() call sites, which will help us transition away
from panfrost_device.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Constantine Shablya <constantine.shablya@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26698>
This commit is contained in:
Boris Brezillon
2023-12-12 12:23:24 +01:00
committed by Marge Bot
parent 92fa7468a1
commit ea4dc54d72
2 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/panfrost/vulkan/panvk_device.c
View File

@@ -805,8 +805,6 @@ static VkResult
panvk_queue_init(struct panvk_device *device, struct panvk_queue *queue, panvk_queue_init(struct panvk_device *device, struct panvk_queue *queue,
int idx, const VkDeviceQueueCreateInfo *create_info) int idx, const VkDeviceQueueCreateInfo *create_info)
{ {
const struct panfrost_device *pdev = &device->physical_device->pdev;
VkResult result = vk_queue_init(&queue->vk, &device->vk, create_info, idx); VkResult result = vk_queue_init(&queue->vk, &device->vk, create_info, idx);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
@@ -816,8 +814,7 @@ panvk_queue_init(struct panvk_device *device, struct panvk_queue *queue,
.flags = DRM_SYNCOBJ_CREATE_SIGNALED, .flags = DRM_SYNCOBJ_CREATE_SIGNALED,
}; };
int ret = int ret = drmIoctl(device->vk.drm_fd, DRM_IOCTL_SYNCOBJ_CREATE, &create);
drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_SYNCOBJ_CREATE, &create);
if (ret) { if (ret) {
vk_queue_finish(&queue->vk); vk_queue_finish(&queue->vk);
return VK_ERROR_OUT_OF_HOST_MEMORY; return VK_ERROR_OUT_OF_HOST_MEMORY;
@@ -994,7 +991,6 @@ panvk_QueueWaitIdle(VkQueue _queue)
if (panvk_device_is_lost(queue->device)) if (panvk_device_is_lost(queue->device))
return VK_ERROR_DEVICE_LOST; return VK_ERROR_DEVICE_LOST;
const struct panfrost_device *pdev = &queue->device->physical_device->pdev;
struct drm_syncobj_wait wait = { struct drm_syncobj_wait wait = {
.handles = (uint64_t)(uintptr_t)(&queue->sync), .handles = (uint64_t)(uintptr_t)(&queue->sync),
.count_handles = 1, .count_handles = 1,
@@ -1003,7 +999,7 @@ panvk_QueueWaitIdle(VkQueue _queue)
}; };
int ret; int ret;
ret = drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_SYNCOBJ_WAIT, &wait); ret = drmIoctl(queue->vk.base.device->drm_fd, DRM_IOCTL_SYNCOBJ_WAIT, &wait);
assert(!ret); assert(!ret);
return VK_SUCCESS; return VK_SUCCESS;
@@ -1270,7 +1266,6 @@ panvk_CreateEvent(VkDevice _device, const VkEventCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, VkEvent *pEvent) const VkAllocationCallbacks *pAllocator, VkEvent *pEvent)
{ {
VK_FROM_HANDLE(panvk_device, device, _device); VK_FROM_HANDLE(panvk_device, device, _device);
const struct panfrost_device *pdev = &device->physical_device->pdev;
struct panvk_event *event = vk_object_zalloc( struct panvk_event *event = vk_object_zalloc(
&device->vk, pAllocator, sizeof(*event), VK_OBJECT_TYPE_EVENT); &device->vk, pAllocator, sizeof(*event), VK_OBJECT_TYPE_EVENT);
if (!event) if (!event)
@@ -1280,8 +1275,7 @@ panvk_CreateEvent(VkDevice _device, const VkEventCreateInfo *pCreateInfo,
.flags = 0, .flags = 0,
}; };
int ret = int ret = drmIoctl(device->vk.drm_fd, DRM_IOCTL_SYNCOBJ_CREATE, &create);
drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_SYNCOBJ_CREATE, &create);
if (ret) if (ret)
return VK_ERROR_OUT_OF_HOST_MEMORY; return VK_ERROR_OUT_OF_HOST_MEMORY;
@@ -1297,13 +1291,12 @@ panvk_DestroyEvent(VkDevice _device, VkEvent _event,
{ {
VK_FROM_HANDLE(panvk_device, device, _device); VK_FROM_HANDLE(panvk_device, device, _device);
VK_FROM_HANDLE(panvk_event, event, _event); VK_FROM_HANDLE(panvk_event, event, _event);
const struct panfrost_device *pdev = &device->physical_device->pdev;
if (!event) if (!event)
return; return;
struct drm_syncobj_destroy destroy = {.handle = event->syncobj}; struct drm_syncobj_destroy destroy = {.handle = event->syncobj};
drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_SYNCOBJ_DESTROY, &destroy); drmIoctl(device->vk.drm_fd, DRM_IOCTL_SYNCOBJ_DESTROY, &destroy);
vk_object_free(&device->vk, pAllocator, event); vk_object_free(&device->vk, pAllocator, event);
} }
@@ -1313,7 +1306,6 @@ panvk_GetEventStatus(VkDevice _device, VkEvent _event)
{ {
VK_FROM_HANDLE(panvk_device, device, _device); VK_FROM_HANDLE(panvk_device, device, _device);
VK_FROM_HANDLE(panvk_event, event, _event); VK_FROM_HANDLE(panvk_event, event, _event);
const struct panfrost_device *pdev = &device->physical_device->pdev;
bool signaled; bool signaled;
struct drm_syncobj_wait wait = { struct drm_syncobj_wait wait = {
@@ -1323,7 +1315,7 @@ panvk_GetEventStatus(VkDevice _device, VkEvent _event)
.flags = DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT, .flags = DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT,
}; };
int ret = drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_SYNCOBJ_WAIT, &wait); int ret = drmIoctl(device->vk.drm_fd, DRM_IOCTL_SYNCOBJ_WAIT, &wait);
if (ret) { if (ret) {
if (errno == ETIME) if (errno == ETIME)
signaled = false; signaled = false;
@@ -1342,7 +1334,6 @@ panvk_SetEvent(VkDevice _device, VkEvent _event)
{ {
VK_FROM_HANDLE(panvk_device, device, _device); VK_FROM_HANDLE(panvk_device, device, _device);
VK_FROM_HANDLE(panvk_event, event, _event); VK_FROM_HANDLE(panvk_event, event, _event);
const struct panfrost_device *pdev = &device->physical_device->pdev;
struct drm_syncobj_array objs = { struct drm_syncobj_array objs = {
.handles = (uint64_t)(uintptr_t)&event->syncobj, .handles = (uint64_t)(uintptr_t)&event->syncobj,
@@ -1354,7 +1345,7 @@ panvk_SetEvent(VkDevice _device, VkEvent _event)
* command executes. * command executes.
* https://www.khronos.org/registry/vulkan/specs/1.2/html/chap6.html#commandbuffers-submission-progress * https://www.khronos.org/registry/vulkan/specs/1.2/html/chap6.html#commandbuffers-submission-progress
*/ */
if (drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_SYNCOBJ_SIGNAL, &objs)) if (drmIoctl(device->vk.drm_fd, DRM_IOCTL_SYNCOBJ_SIGNAL, &objs))
return VK_ERROR_DEVICE_LOST; return VK_ERROR_DEVICE_LOST;
return VK_SUCCESS; return VK_SUCCESS;
@@ -1365,13 +1356,12 @@ panvk_ResetEvent(VkDevice _device, VkEvent _event)
{ {
VK_FROM_HANDLE(panvk_device, device, _device); VK_FROM_HANDLE(panvk_device, device, _device);
VK_FROM_HANDLE(panvk_event, event, _event); VK_FROM_HANDLE(panvk_event, event, _event);
const struct panfrost_device *pdev = &device->physical_device->pdev;
struct drm_syncobj_array objs = { struct drm_syncobj_array objs = {
.handles = (uint64_t)(uintptr_t)&event->syncobj, .handles = (uint64_t)(uintptr_t)&event->syncobj,
.count_handles = 1}; .count_handles = 1};
if (drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_SYNCOBJ_RESET, &objs)) if (drmIoctl(device->vk.drm_fd, DRM_IOCTL_SYNCOBJ_RESET, &objs))
return VK_ERROR_DEVICE_LOST; return VK_ERROR_DEVICE_LOST;
return VK_SUCCESS; return VK_SUCCESS;

27
src/panfrost/vulkan/panvk_vX_device.c
View File

@@ -67,13 +67,12 @@ panvk_queue_submit_batch(struct panvk_queue *queue, struct panvk_batch *batch,
.jc = batch->jc.first_job, .jc = batch->jc.first_job,
}; };
ret = ret = drmIoctl(dev->vk.drm_fd, DRM_IOCTL_PANFROST_SUBMIT, &submit);
drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_PANFROST_SUBMIT, &submit);
assert(!ret); assert(!ret);
if (debug & (PANVK_DEBUG_TRACE | PANVK_DEBUG_SYNC)) { if (debug & (PANVK_DEBUG_TRACE | PANVK_DEBUG_SYNC)) {
ret = drmSyncobjWait(panfrost_device_fd(pdev), &submit.out_sync, 1, ret = drmSyncobjWait(dev->vk.drm_fd, &submit.out_sync, 1, INT64_MAX, 0,
INT64_MAX, 0, NULL); NULL);
assert(!ret); assert(!ret);
} }
@@ -103,12 +102,11 @@ panvk_queue_submit_batch(struct panvk_queue *queue, struct panvk_batch *batch,
submit.in_sync_count = nr_in_fences; submit.in_sync_count = nr_in_fences;
} }
ret = ret = drmIoctl(dev->vk.drm_fd, DRM_IOCTL_PANFROST_SUBMIT, &submit);
drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_PANFROST_SUBMIT, &submit);
assert(!ret); assert(!ret);
if (debug & (PANVK_DEBUG_TRACE | PANVK_DEBUG_SYNC)) { if (debug & (PANVK_DEBUG_TRACE | PANVK_DEBUG_SYNC)) {
ret = drmSyncobjWait(panfrost_device_fd(pdev), &submit.out_sync, 1, ret = drmSyncobjWait(dev->vk.drm_fd, &submit.out_sync, 1, INT64_MAX, 0,
INT64_MAX, 0, NULL); NULL);
assert(!ret); assert(!ret);
} }
@@ -129,7 +127,7 @@ panvk_queue_submit_batch(struct panvk_queue *queue, struct panvk_batch *batch,
static void static void
panvk_queue_transfer_sync(struct panvk_queue *queue, uint32_t syncobj) panvk_queue_transfer_sync(struct panvk_queue *queue, uint32_t syncobj)
{ {
const struct panfrost_device *pdev = &queue->device->physical_device->pdev; struct panvk_device *dev = queue->device;
int ret; int ret;
struct drm_syncobj_handle handle = { struct drm_syncobj_handle handle = {
@@ -138,14 +136,12 @@ panvk_queue_transfer_sync(struct panvk_queue *queue, uint32_t syncobj)
.fd = -1, .fd = -1,
}; };
ret = drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD, ret = drmIoctl(dev->vk.drm_fd, DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD, &handle);
&handle);
assert(!ret); assert(!ret);
assert(handle.fd >= 0); assert(handle.fd >= 0);
handle.handle = syncobj; handle.handle = syncobj;
ret = drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE, ret = drmIoctl(dev->vk.drm_fd, DRM_IOCTL_SYNCOBJ_FD_TO_HANDLE, &handle);
&handle);
assert(!ret); assert(!ret);
close(handle.fd); close(handle.fd);
@@ -176,7 +172,7 @@ static void
panvk_signal_event_syncobjs(struct panvk_queue *queue, panvk_signal_event_syncobjs(struct panvk_queue *queue,
struct panvk_batch *batch) struct panvk_batch *batch)
{ {
const struct panfrost_device *pdev = &queue->device->physical_device->pdev; struct panvk_device *dev = queue->device;
util_dynarray_foreach(&batch->event_ops, struct panvk_event_op, op) { util_dynarray_foreach(&batch->event_ops, struct panvk_event_op, op) {
switch (op->type) { switch (op->type) {
@@ -191,8 +187,7 @@ panvk_signal_event_syncobjs(struct panvk_queue *queue,
.handles = (uint64_t)(uintptr_t)&event->syncobj, .handles = (uint64_t)(uintptr_t)&event->syncobj,
.count_handles = 1}; .count_handles = 1};
int ret = int ret = drmIoctl(dev->vk.drm_fd, DRM_IOCTL_SYNCOBJ_RESET, &objs);
drmIoctl(panfrost_device_fd(pdev), DRM_IOCTL_SYNCOBJ_RESET, &objs);
assert(!ret); assert(!ret);
break; break;
} }