From d8257c53c7efec25e44b99fa0508058235713424 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Tue, 11 Sep 2018 15:00:58 +0300 Subject: gpu: nvgpu: mark usermode submit supported for gv11b Mark usermode submit supported in gv11b and add the characteristics flag to expose the capability to userspace. Bug 200145225 Bug 200541476 Change-Id: Id9dcb0c71c020bd509fbdbffb94a756c69377f20 Signed-off-by: Konsta Holtta Reviewed-on: https://git-master.nvidia.com/r/1795822 Reviewed-by: Alex Waterman Reviewed-by: Terje Bergstrom Reviewed-by: Vijayakumar Subbu Signed-off-by: Debarshi Dutta (cherry picked from commit 37659f5c8e0571655178c50a6296b68e3ebdc4cb in rel-32) Reviewed-on: https://git-master.nvidia.com/r/2170604 GVS: Gerrit_Virtual_Submit Reviewed-by: Bibek Basu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv11b/gv11b.c | 1 + drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c | 2 ++ include/uapi/linux/nvgpu.h | 2 ++ 3 files changed, 5 insertions(+) diff --git a/drivers/gpu/nvgpu/gv11b/gv11b.c b/drivers/gpu/nvgpu/gv11b/gv11b.c index db146095..e7cd17c8 100644 --- a/drivers/gpu/nvgpu/gv11b/gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gv11b.c @@ -35,6 +35,7 @@ int gv11b_init_gpu_characteristics(struct gk20a *g) __nvgpu_set_enabled(g, NVGPU_SUPPORT_RESCHEDULE_RUNLIST, true); __nvgpu_set_enabled(g, NVGPU_SUPPORT_SYNCPOINT_ADDRESS, true); __nvgpu_set_enabled(g, NVGPU_SUPPORT_USER_SYNCPOINT, true); + __nvgpu_set_enabled(g, NVGPU_SUPPORT_USERMODE_SUBMIT, true); return 0; } diff --git a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c index 73c9d084..cb24c30c 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c @@ -201,6 +201,8 @@ static struct nvgpu_flags_mapping flags_mapping[] = { NVGPU_SUPPORT_SYNCPOINT_ADDRESS}, {NVGPU_GPU_FLAGS_SUPPORT_USER_SYNCPOINT, NVGPU_SUPPORT_USER_SYNCPOINT}, + {NVGPU_GPU_FLAGS_SUPPORT_USERMODE_SUBMIT, + NVGPU_SUPPORT_USERMODE_SUBMIT}, {NVGPU_GPU_FLAGS_SUPPORT_IO_COHERENCE, NVGPU_SUPPORT_IO_COHERENCE}, {NVGPU_GPU_FLAGS_SUPPORT_RESCHEDULE_RUNLIST, diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h index 38139524..0488e563 100644 --- a/include/uapi/linux/nvgpu.h +++ b/include/uapi/linux/nvgpu.h @@ -164,6 +164,8 @@ struct nvgpu_gpu_zbc_query_table_args { #define NVGPU_GPU_FLAGS_SUPPORT_USER_SYNCPOINT (1ULL << 28) /* Railgating (powering the GPU off completely) is supported and enabled */ #define NVGPU_GPU_FLAGS_CAN_RAILGATE (1ULL << 29) +/* Usermode submit is available */ +#define NVGPU_GPU_FLAGS_SUPPORT_USERMODE_SUBMIT (1ULL << 30) /* SM LRF ECC is enabled */ #define NVGPU_GPU_FLAGS_ECC_ENABLED_SM_LRF (1ULL << 60) /* SM SHM ECC is enabled */ -- cgit v1.2.2