summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys
diff options
context:
space:
mode:
authorNicolai Hähnle <nicolai.haehnle@amd.com>2016-10-04 10:50:55 +0200
committerNicolai Hähnle <nicolai.haehnle@amd.com>2016-10-04 16:37:44 +0200
commitdfc1afda83a22d8e6b23f003748cd78fd089a0ac (patch)
treef37c99fa34c76032019ecfef3d1df86012be3586 /src/gallium/winsys
parent71a5cf6f3b8c6baee8ec71f1a2bef3b2efa5b91a (diff)
downloadexternal_mesa3d-dfc1afda83a22d8e6b23f003748cd78fd089a0ac.zip
external_mesa3d-dfc1afda83a22d8e6b23f003748cd78fd089a0ac.tar.gz
external_mesa3d-dfc1afda83a22d8e6b23f003748cd78fd089a0ac.tar.bz2
winsys/radeon: add buffer_get_reloc_offset
Really fix the bug that was supposed to be fixed by commits 3e7cced4b and a48bf02d: even when virtual addresses are used, the legacy relocation-based method with offsets relative to the kernel's buffer object are used for video submissions. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97969 Reviewed-by: Christian König <christian.koenig@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r--src/gallium/winsys/radeon/drm/radeon_drm_bo.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
index 5818006..a15d559 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_bo.c
@@ -1339,6 +1339,16 @@ static uint64_t radeon_winsys_bo_va(struct pb_buffer *buf)
return ((struct radeon_bo*)buf)->va;
}
+static unsigned radeon_winsys_bo_get_reloc_offset(struct pb_buffer *buf)
+{
+ struct radeon_bo *bo = radeon_bo(buf);
+
+ if (bo->handle)
+ return 0;
+
+ return bo->va - bo->u.slab.real->va;
+}
+
void radeon_drm_bo_init_functions(struct radeon_drm_winsys *ws)
{
ws->base.buffer_set_metadata = radeon_bo_set_metadata;
@@ -1352,5 +1362,6 @@ void radeon_drm_bo_init_functions(struct radeon_drm_winsys *ws)
ws->base.buffer_is_user_ptr = radeon_winsys_bo_is_user_ptr;
ws->base.buffer_get_handle = radeon_winsys_bo_get_handle;
ws->base.buffer_get_virtual_address = radeon_winsys_bo_va;
+ ws->base.buffer_get_reloc_offset = radeon_winsys_bo_get_reloc_offset;
ws->base.buffer_get_initial_domain = radeon_bo_get_initial_domain;
}