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

nouveau: add support for SVM migrate

Browse source 
v2 (Ralph): don't allign address as the kernel handles that already
            support migration from GPU to system RAM
v3 (Karol): use DIV_ROUND_UP for sizes not being page aligned

Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6401>
This commit is contained in:
Jérôme Glisse 2018-08-09 15:32:01 -04:00 • committed by Marge Bot
parent f7616c89a4
commit 6e4f7e14af
1 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/gallium/drivers/nouveau/nvc0/nvc0_context.c
View file

@ -28,6 +28,53 @@
#include "nvc0/nvc0_screen.h"
#include "nvc0/nvc0_resource.h"
#include "xf86drm.h"
#include "nouveau_drm.h"
static void
nvc0_svm_migrate(struct pipe_context *pipe, unsigned num_ptrs,
const void* const* ptrs, const size_t *sizes,
bool to_device, bool mem_undefined)
{
struct nvc0_context *nvc0 = nvc0_context(pipe);
struct nouveau_screen *screen = &nvc0->screen->base;
int fd = screen->drm->fd;
unsigned i;
for (i = 0; i < num_ptrs; i++) {
struct drm_nouveau_svm_bind args;
uint64_t cmd, prio, target;
args.va_start = (uint64_t)(uintptr_t)ptrs[i];
if (sizes && sizes[i]) {
args.va_end = (uint64_t)(uintptr_t)ptrs[i] + sizes[i];
args.npages = DIV_ROUND_UP(args.va_end - args.va_start, 0x1000);
} else {
args.va_end = 0;
args.npages = 0;
}
args.stride = 0;
args.reserved0 = 0;
args.reserved1 = 0;
prio = 0;
cmd = NOUVEAU_SVM_BIND_COMMAND__MIGRATE;
target = to_device ? NOUVEAU_SVM_BIND_TARGET__GPU_VRAM : 0;
args.header = cmd << NOUVEAU_SVM_BIND_COMMAND_SHIFT;
args.header |= prio << NOUVEAU_SVM_BIND_PRIORITY_SHIFT;
args.header |= target << NOUVEAU_SVM_BIND_TARGET_SHIFT;
/* This is best effort, so no garanty whatsoever */
drmCommandWrite(fd, DRM_NOUVEAU_SVM_BIND,
&args, sizeof(args));
}
}
static void
nvc0_flush(struct pipe_context *pipe,
struct pipe_fence_handle **fence,
@ -408,6 +455,8 @@ nvc0_create(struct pipe_screen *pscreen, void *priv, unsigned ctxflags)
pipe->launch_grid = (nvc0->screen->base.class_3d >= NVE4_3D_CLASS) ?
nve4_launch_grid : nvc0_launch_grid;
pipe->svm_migrate = nvc0_svm_migrate;
pipe->flush = nvc0_flush;
pipe->texture_barrier = nvc0_texture_barrier;
pipe->memory_barrier = nvc0_memory_barrier;