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

amd/virtio: fix amdgpu_sw_info_address_prt_wa_control_bit handling

Browse source 
Fixes: 60b406e233 ("ac/gpu_info: query the PRT workaround control bit from libdrm")
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41381>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2026-05-06 10:17:57 +02:00 • committed by Marge Bot
parent 760ed3e888
commit e3beb262bd
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/amd/common/ac_linux_drm.c
View file

@ -895,10 +895,8 @@ int ac_drm_query_sw_info(ac_drm_device *dev,
enum amdgpu_sw_info info, void *value)
{
#ifdef HAVE_AMDGPU_VIRTIO
if (dev->is_virtio) {
assert(info == amdgpu_sw_info_address32_hi);
if (dev->is_virtio)
return amdvgpu_query_sw_info(dev->vdev, info, value);
}
#endif
return amdgpu_query_sw_info(dev->adev, info, value);
}

13
src/amd/common/virtio/amdgpu_virtio.c
View file

@ -16,6 +16,7 @@
#include <libdrm/amdgpu.h>
#include "amdgpu_virtio_private.h"
#include "drm-uapi/amdgpu_drm.h"
#include "util/log.h"
#include "util/u_math.h"
@ -48,10 +49,14 @@ amdvgpu_query_info(amdvgpu_device_handle dev, struct drm_amdgpu_info *info)
int
amdvgpu_query_sw_info(amdvgpu_device_handle dev, enum amdgpu_sw_info info, void *value)
{
if (info != amdgpu_sw_info_address32_hi)
return -EINVAL;
memcpy(value, &dev->vdev->caps.u.amdgpu.address32_hi, 4);
return 0;
if (info == amdgpu_sw_info_address32_hi) {
memcpy(value, &dev->vdev->caps.u.amdgpu.address32_hi, 4);
return 0;
} else if (info == amdgpu_sw_info_address_prt_wa_control_bit) {
return amdgpu_va_manager_query_sw_info(dev->va_mgr, amdgpu_va_manager_sw_info_address_prt_wa_control_bit, value);
}
assert(false);
return -1;
}
int