From 2d3e97e033e4cdff17913914dffb6fee033411c1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 31 Mar 2015 19:45:35 +0200 Subject: [PATCH] package/nvidia-driver: add option to install CUDA MPS server Using CUDA with NVidia requires those two programs if one wants to use more than one program doing CUDA at the same time. This is only available on x86_64. Signed-off-by: "Yann E. MORIN" Cc: Al West Signed-off-by: Thomas Petazzoni --- package/nvidia-driver/Config.in | 13 ++++++++++++- package/nvidia-driver/nvidia-driver.mk | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index a63576cff1..b50e2c353a 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -55,9 +55,20 @@ endif # BR2_PACKAGE_NVIDIA_DRIVER_XORG config BR2_PACKAGE_NVIDIA_DRIVER_CUDA bool "CUDA support" +if BR2_PACKAGE_NVIDIA_DRIVER_CUDA + config BR2_PACKAGE_NVIDIA_DRIVER_OPENCL bool "OpenCL support" - depends on BR2_PACKAGE_NVIDIA_DRIVER_CUDA + +config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS + bool "CUDA MPS server and control" + depends on BR2_x86_64 + help + Say 'y' here if you need to run more than one program + doing CUDA at the same time. The MPS server will be + launched automatically when needed. + +endif # BR2_PACKAGE_NVIDIA_DRIVER_CUDA comment "nvidia kernel module needs a kernel to be built" depends on !BR2_LINUX_KERNEL diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index 454209ac13..a85cc1cd11 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -57,6 +57,9 @@ endif # X drivers ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA),y) NVIDIA_DRIVER_LIBS += libcuda libnvidia-compiler libnvcuvid libnvidia-encode +ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS),y) +NVIDIA_DRIVER_PROGS = nvidia-cuda-mps-control nvidia-cuda-mps-server +endif endif ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_OPENCL),y) @@ -165,6 +168,10 @@ define NVIDIA_DRIVER_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0644 $(@D)/$${m##*/} \ $(TARGET_DIR)/usr/lib/xorg/modules/$${m}; \ done + for p in $(NVIDIA_DRIVER_PROGS); do \ + $(INSTALL) -D -m 0755 $(@D)/$${p} \ + $(TARGET_DIR)/usr/bin/$${p}; \ + done $(NVIDIA_DRIVER_INSTALL_KERNEL_MODULE) endef