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

v3dv: Switch to v3d_ioctl(..)

Browse Source 
Use the common helper.

Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Reviewed-by: Maíra Canal <mcanal@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32277>
This commit is contained in:
Christian Gmeiner
2024-10-28 22:24:20 +01:00
committed by Marge Bot
parent 0d4313951f
commit 787da655d1
6 changed files with 35 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/broadcom/vulkan/v3dv_bo.c
+7 -7
View File
@@ -157,7 +157,7 @@ bo_free(struct v3dv_device *device,
struct drm_gem_close c;
memset(&c, 0, sizeof(c));
c.handle = handle;
int ret = v3dv_ioctl(device->pdevice->render_fd, DRM_IOCTL_GEM_CLOSE, &c);
int ret = v3d_ioctl(device->pdevice->render_fd, DRM_IOCTL_GEM_CLOSE, &c);
if (ret != 0)
mesa_loge("close object %d: %s\n", handle, strerror(errno));
@@ -246,8 +246,8 @@ v3dv_bo_alloc(struct v3dv_device *device,
.size = size
};
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_CREATE_BO, &create);
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_CREATE_BO, &create);
if (ret != 0) {
if (!list_is_empty(&device->bo_cache.time_list) &&
!cleared_and_retried) {
@@ -291,8 +291,8 @@ v3dv_bo_map_unsynchronized(struct v3dv_device *device,
struct drm_v3d_mmap_bo map;
memset(&map, 0, sizeof(map));
map.handle = bo->handle;
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_MMAP_BO, &map);
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_MMAP_BO, &map);
if (ret != 0) {
mesa_loge("map ioctl failure\n");
return false;
@@ -321,8 +321,8 @@ v3dv_bo_wait(struct v3dv_device *device,
.handle = bo->handle,
.timeout_ns = timeout_ns,
};
return v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_WAIT_BO, &wait) == 0;
return v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_WAIT_BO, &wait) == 0;
}
bool
src/broadcom/vulkan/v3dv_device.c
+5 -5
View File
@@ -741,7 +741,7 @@ v3d_has_feature(struct v3dv_physical_device *device, enum drm_v3d_param feature)
struct drm_v3d_get_param p = {
.param = feature,
};
if (v3dv_ioctl(device->render_fd, DRM_IOCTL_V3D_GET_PARAM, &p) != 0)
if (v3d_ioctl(device->render_fd, DRM_IOCTL_V3D_GET_PARAM, &p) != 0)
return false;
return p.value;
}
@@ -1318,7 +1318,7 @@ create_physical_device(struct v3dv_instance *instance,
device->render_fd = render_fd;
device->display_fd = primary_fd;
if (!v3d_get_device_info(device->render_fd, &device->devinfo, &v3dv_ioctl)) {
if (!v3d_get_device_info(device->render_fd, &device->devinfo, &v3d_ioctl)) {
result = vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,
"Failed to get info from device.");
goto fail;
@@ -1979,7 +1979,7 @@ device_free_wsi_dumb(int32_t display_fd, int32_t dumb_handle)
struct drm_mode_destroy_dumb destroy_dumb = {
.handle = dumb_handle,
};
if (v3dv_ioctl(display_fd, DRM_IOCTL_MODE_DESTROY_DUMB, &destroy_dumb)) {
if (v3d_ioctl(display_fd, DRM_IOCTL_MODE_DESTROY_DUMB, &destroy_dumb)) {
mesa_loge("destroy dumb object %d: %s\n", dumb_handle, strerror(errno));
}
}
@@ -2060,7 +2060,7 @@ device_import_bo(struct v3dv_device *device,
struct drm_v3d_get_bo_offset get_offset = {
.handle = handle,
};
ret = v3dv_ioctl(render_fd, DRM_IOCTL_V3D_GET_BO_OFFSET, &get_offset);
ret = v3d_ioctl(render_fd, DRM_IOCTL_V3D_GET_BO_OFFSET, &get_offset);
if (ret)
return VK_ERROR_INVALID_EXTERNAL_HANDLE;
assert(get_offset.offset != 0);
@@ -2104,7 +2104,7 @@ device_alloc_for_wsi(struct v3dv_device *device,
};
int err;
err = v3dv_ioctl(display_fd, DRM_IOCTL_MODE_CREATE_DUMB, &create_dumb);
err = v3d_ioctl(display_fd, DRM_IOCTL_MODE_CREATE_DUMB, &create_dumb);
if (err < 0)
goto fail_create;
src/broadcom/vulkan/v3dv_private.h
-10
View File
@@ -2552,16 +2552,6 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(v3dv_render_pass, base, VkRenderPass,
VK_DEFINE_NONDISP_HANDLE_CASTS(v3dv_sampler, base, VkSampler,
VK_OBJECT_TYPE_SAMPLER)
static inline int
v3dv_ioctl(int fd, unsigned long request, void *arg)
{
#if USE_V3D_SIMULATOR
return v3d_simulator_ioctl(fd, request, arg);
#else
return drmIoctl(fd, request, arg);
#endif
}
/* Flags OOM conditions in command buffer state.
*
* Note: notice that no-op jobs don't have a command buffer reference.
src/broadcom/vulkan/v3dv_query.c
+9 -9
View File
@@ -43,9 +43,9 @@ kperfmon_create(struct v3dv_device *device,
&pool->perfmon.counters[i * DRM_V3D_MAX_PERF_COUNTERS],
req.ncounters);
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_PERFMON_CREATE,
&req);
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_PERFMON_CREATE,
&req);
if (ret)
mesa_loge("Failed to create perfmon for query %d: %s\n", query,
strerror(errno));
@@ -68,9 +68,9 @@ kperfmon_destroy(struct v3dv_device *device,
.id = pool->queries[query].perf.kperfmon_ids[i]
};
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_PERFMON_DESTROY,
&req);
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_PERFMON_DESTROY,
&req);
if (ret) {
mesa_loge("Failed to destroy perfmon %u: %s\n",
@@ -650,9 +650,9 @@ write_performance_query_result(struct v3dv_device *device,
DRM_V3D_MAX_PERF_COUNTERS])
};
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_PERFMON_GET_VALUES,
&req);
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_PERFMON_GET_VALUES,
&req);
if (ret) {
mesa_loge("failed to get perfmon values: %s\n", strerror(errno));
src/broadcom/vulkan/v3dv_queue.c
+12 -12
View File
@@ -395,8 +395,8 @@ handle_reset_query_cpu_job(struct v3dv_queue *queue,
* submitted work to complete before executing (which we accomplish by using
* V3DV_BARRIER_ALL on them) and that includes reset jobs submitted to the CPU queue.
*/
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_CPU, &submit);
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_CPU, &submit);
free(syncs);
free(kperfmon_ids);
@@ -658,8 +658,8 @@ handle_copy_query_results_cpu_job(struct v3dv_queue *queue,
submit.flags |= DRM_V3D_SUBMIT_EXTENSION;
submit.extensions = (uintptr_t)(void *)&ms;
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_CPU, &submit);
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_CPU, &submit);
free(kperfmon_ids);
free(bo_handles);
@@ -779,7 +779,7 @@ handle_timestamp_query_cpu_job(struct v3dv_queue *queue,
submit.flags |= DRM_V3D_SUBMIT_EXTENSION;
submit.extensions = (uintptr_t)(void *)&ms;
int ret = v3dv_ioctl(device->pdevice->render_fd,
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_CPU, &submit);
free(offsets);
@@ -880,7 +880,7 @@ handle_csd_indirect_cpu_job(struct v3dv_queue *queue,
submit.flags |= DRM_V3D_SUBMIT_EXTENSION;
submit.extensions = (uintptr_t)(void *)&ms;
int ret = v3dv_ioctl(device->pdevice->render_fd,
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_CPU, &submit);
free(bo_handles);
@@ -1010,8 +1010,8 @@ handle_cl_job(struct v3dv_queue *queue,
submit.out_sync = 0;
v3dv_clif_dump(device, job, &submit);
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_CL, &submit);
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_CL, &submit);
static bool warned = false;
if (ret && !warned) {
@@ -1057,8 +1057,8 @@ handle_tfu_job(struct v3dv_queue *queue,
job->tfu.in_sync = 0;
job->tfu.out_sync = 0;
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_TFU, &job->tfu);
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_TFU, &job->tfu);
multisync_free(device, &ms);
queue->last_job_syncs.first[V3DV_QUEUE_TFU] = false;
@@ -1122,8 +1122,8 @@ handle_csd_job(struct v3dv_queue *queue,
job->perf->kperfmon_ids[counter_pass_idx] : 0;
queue->last_perfmon_id = submit->perfmon_id;
int ret = v3dv_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_CSD, submit);
int ret = v3d_ioctl(device->pdevice->render_fd,
DRM_IOCTL_V3D_SUBMIT_CSD, submit);
static bool warned = false;
if (ret && !warned) {
src/broadcom/vulkan/v3dvx_query.c
+2 -2
View File
@@ -48,8 +48,8 @@ v3dX(enumerate_performance_query_counters)(struct v3dv_physical_device *pDevice,
const char *name, *category, *description;
if (devinfo->max_perfcnt) {
int ret = v3dv_ioctl(pDevice->render_fd, DRM_IOCTL_V3D_PERFMON_GET_COUNTER,
&counter);
int ret = v3d_ioctl(pDevice->render_fd, DRM_IOCTL_V3D_PERFMON_GET_COUNTER,
&counter);
if (ret) {
mesa_loge("Failed to get counter description for counter %d: %s\n",
i, strerror(errno));