From 9feccbbe729aea80c834f1e95c3259b91433ddc8 Mon Sep 17 00:00:00 2001 From: Yong Zhao Date: Fri, 3 Mar 2017 14:50:59 -0500 Subject: [PATCH 1233/4131] Hybrid-kfd-adaption: Disable cross_memory_copy feature The feature relies on mm_access() to be exported by kernel code, but all the current upstream kernels have not make it exported. We have to disable the feautre for hybrid driver compatibility. Change-Id: I8a316414114252d8250c47b73f047e43db46eef2 Signed-off-by: Yong Zhao --- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index 52d120c..bad4783 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -1876,6 +1876,13 @@ static int kfd_ioctl_get_tile_config(struct file *filep, return 0; } +#if defined(BUILD_AS_DKMS) +static int kfd_ioctl_cross_memory_copy(struct file *filep, + struct kfd_process *local_p, void *data) +{ + return 0; +} +#else static int kfd_ioctl_cross_memory_copy(struct file *filep, struct kfd_process *local_p, void *data) { @@ -2116,6 +2123,7 @@ static int kfd_ioctl_cross_memory_copy(struct file *filep, args->bytes_copied = total_copied; return err; } +#endif #define AMDKFD_IOCTL_DEF(ioctl, _func, _flags) \ [_IOC_NR(ioctl)] = {.cmd = ioctl, .func = _func, .flags = _flags, .cmd_drv = 0, .name = #ioctl} -- 2.7.4