fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-20 14:20:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ac/info: use u_sync_provider instead of DRM_CAP_SYNCOBJ(_TIMELINE)

Browse source 
So we get the correct results regardless of the backend (amdgpu,
virtio nctx, vpipe, null).

Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Acked-by: Rob Clark <robdclark@chromium.org>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34470>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2025-04-15 09:32:26 +02:00 • committed by Marge Bot
parent df1224c8b2
commit ddf73e76a9
1 changed files with 5 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/amd/common/ac_gpu_info.c
View file

@ -10,6 +10,7 @@
#include "ac_surface.h"
#include "ac_fake_hw_db.h"
#include "ac_linux_drm.h"
#include "util/u_sync_provider.h"
#include "addrlib/src/amdgpu_asic_addr.h"
#include "sid.h"
@ -301,14 +302,6 @@ drmGetFormatModifierName(uint64_t modifier)
#define CIK_TILE_MODE_COLOR_2D 14
static bool has_timeline_syncobj(int fd)
{
uint64_t value;
if (drmGetCap(fd, DRM_CAP_SYNCOBJ_TIMELINE, &value))
return false;
return value ? true : false;
}
static bool has_modifiers(int fd)
{
uint64_t value;
@ -553,16 +546,9 @@ ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
return AC_QUERY_GPU_INFO_FAIL;
}
uint64_t cap;
/* In the vpipe case, the fd will be < 0 and we can't do direct ioctls.
* Assume syncobjs are supported in this case.
*/
if (!is_virtio_vpipe) {
r = drmGetCap(fd, DRM_CAP_SYNCOBJ, &cap);
if (r != 0 || cap == 0) {
fprintf(stderr, "amdgpu: syncobj support is missing but is required.\n");
return AC_QUERY_GPU_INFO_FAIL;
}
if (ac_drm_device_get_sync_provider(dev)->wait == NULL) {
fprintf(stderr, "amdgpu: syncobj support is missing but is required.\n");
return AC_QUERY_GPU_INFO_FAIL;
}
/* Query hardware and driver information. */
@ -1009,7 +995,7 @@ ac_query_gpu_info(int fd, void *dev_p, struct radeon_info *info,
info->has_userptr = !info->is_virtio;
info->has_syncobj = true;
info->has_timeline_syncobj = !info->is_virtio && has_timeline_syncobj(fd);
info->has_timeline_syncobj = ac_drm_device_get_sync_provider(dev)->timeline_wait != NULL;
info->has_fence_to_handle = true;
info->has_vm_always_valid = !info->is_virtio;
info->has_bo_metadata = true;