fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-03 15:28:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radv: rename master_fd to wsi_master_fd

Browse source 
It's only used for KHR_display.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41802>
This commit is contained in:
Samuel Pitoiset 2026-05-26 14:27:20 +02:00 • committed by Marge Bot
parent ff7c70cb5b
commit 8444977b87
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/amd/vulkan/radv_physical_device.c
View file

@ -2456,7 +2456,7 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm
#else
VkResult result;
int fd = -1;
int master_fd = -1;
int wsi_master_fd = -1;
bool is_virtio = false;
const char *path = drm_device->nodes[DRM_NODE_RENDER];
drmVersionPtr version;
@ -2549,17 +2549,17 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm
}
if (instance->vk.enabled_extensions.KHR_display) {
master_fd = open(drm_device->nodes[DRM_NODE_PRIMARY], O_RDWR | O_CLOEXEC);
if (master_fd >= 0) {
wsi_master_fd = open(drm_device->nodes[DRM_NODE_PRIMARY], O_RDWR | O_CLOEXEC);
if (wsi_master_fd >= 0) {
uint32_t accel_working = 0;
struct drm_amdgpu_info request = {.return_pointer = (uintptr_t)&accel_working,
.return_size = sizeof(accel_working),
.query = AMDGPU_INFO_ACCEL_WORKING};
if (drm_ioctl_write(master_fd, DRM_AMDGPU_INFO, &request, sizeof(struct drm_amdgpu_info)) < 0 ||
if (drm_ioctl_write(wsi_master_fd, DRM_AMDGPU_INFO, &request, sizeof(struct drm_amdgpu_info)) < 0 ||
!accel_working) {
close(master_fd);
master_fd = -1;
close(wsi_master_fd);
wsi_master_fd = -1;
}
}
}
@ -2578,7 +2578,7 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm
goto fail_wsi;
}
pdev->master_fd = master_fd;
pdev->wsi_master_fd = wsi_master_fd;
pdev->use_llvm = instance->debug_flags & RADV_DEBUG_LLVM;
#if !AMD_LLVM_AVAILABLE
@ -2789,8 +2789,8 @@ fail_alloc:
fail_fd:
if (fd != -1)
close(fd);
if (master_fd != -1)
close(master_fd);
if (wsi_master_fd != -1)
close(wsi_master_fd);
return result;
#endif
}
@ -2835,8 +2835,8 @@ radv_physical_device_destroy(struct vk_physical_device *vk_device)
pdev->ws->destroy(pdev->ws);
disk_cache_destroy(pdev->vk.disk_cache);
disk_cache_destroy(pdev->disk_cache_meta);
if (pdev->master_fd != -1)
close(pdev->master_fd);
if (pdev->wsi_master_fd != -1)
close(pdev->wsi_master_fd);
vk_physical_device_finish(&pdev->vk);
vk_free(&instance->vk.alloc, pdev);
}

2
src/amd/vulkan/radv_physical_device.h
View file

@ -81,7 +81,7 @@ struct radv_physical_device {
struct ac_addrlib *addrlib;
int master_fd;
int wsi_master_fd;
struct wsi_device wsi_device;
/* Whether DCC should be enabled for MSAA textures. */

2
src/amd/vulkan/radv_wsi.c
View file

@ -97,7 +97,7 @@ radv_init_wsi(struct radv_physical_device *pdev)
VkResult result =
wsi_device_init(&pdev->wsi_device, radv_physical_device_to_handle(pdev), radv_wsi_proc_addr, &instance->vk.alloc,
pdev->master_fd, &instance->drirc.options, &(struct wsi_device_options){.sw_device = false});
pdev->wsi_master_fd, &instance->drirc.options, &(struct wsi_device_options){.sw_device = false});
if (result != VK_SUCCESS)
return result;