From 5cb742d228c6816e7fdd1220f4b4ee3378abf3dc Mon Sep 17 00:00:00 2001 From: seshendra Gadagottu Date: Wed, 31 Jan 2018 15:01:05 -0800 Subject: gpu: nvgpu: gv11b: add scg support info in gpu characteristics Indicated support for Simultaneous Compute and Graphics(SCG) in gpu characteristics for gv11b. Bug 2053932 Change-Id: I788e22242083dff775dd4cc5b9aa73c938028536 Signed-off-by: seshendra Gadagottu Reviewed-on: https://git-master.nvidia.com/r/1649805 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 2 ++ drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_gv11b.c | 1 + drivers/gpu/nvgpu/gv11b/gv11b.c | 1 + drivers/gpu/nvgpu/include/nvgpu/enabled.h | 4 +++- 4 files changed, 7 insertions(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index b751a337..398823f3 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c @@ -172,6 +172,8 @@ static struct nvgpu_flags_mapping flags_mapping[] = { NVGPU_ECC_ENABLED_LTC}, {NVGPU_GPU_FLAGS_SUPPORT_TSG_SUBCONTEXTS, NVGPU_SUPPORT_TSG_SUBCONTEXTS}, + {NVGPU_GPU_FLAGS_SUPPORT_SCG, + NVGPU_SUPPORT_SCG}, }; static u64 nvgpu_ctrl_ioctl_gpu_characteristics_flags(struct gk20a *g) diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_gv11b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_gv11b.c index 749e9e81..285268a6 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_gv11b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gv11b/vgpu_gv11b.c @@ -35,6 +35,7 @@ int vgpu_gv11b_init_gpu_characteristics(struct gk20a *g) __nvgpu_set_enabled(g, NVGPU_SUPPORT_TSG_SUBCONTEXTS, true); __nvgpu_set_enabled(g, NVGPU_SUPPORT_IO_COHERENCE, true); + __nvgpu_set_enabled(g, NVGPU_SUPPORT_SCG, true); return 0; } diff --git a/drivers/gpu/nvgpu/gv11b/gv11b.c b/drivers/gpu/nvgpu/gv11b/gv11b.c index 709f18df..ab4b7fcd 100644 --- a/drivers/gpu/nvgpu/gv11b/gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gv11b.c @@ -153,5 +153,6 @@ int gv11b_init_gpu_characteristics(struct gk20a *g) gk20a_init_gpu_characteristics(g); __nvgpu_set_enabled(g, NVGPU_SUPPORT_TSG_SUBCONTEXTS, true); __nvgpu_set_enabled(g, NVGPU_SUPPORT_IO_COHERENCE, true); + __nvgpu_set_enabled(g, NVGPU_SUPPORT_SCG, true); return 0; } diff --git a/drivers/gpu/nvgpu/include/nvgpu/enabled.h b/drivers/gpu/nvgpu/include/nvgpu/enabled.h index 4d8dbb08..edf38a6a 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/enabled.h +++ b/drivers/gpu/nvgpu/include/nvgpu/enabled.h @@ -150,10 +150,12 @@ struct gk20a; #define NVGPU_SUPPORT_ASPM 62 /* subcontexts are available */ #define NVGPU_SUPPORT_TSG_SUBCONTEXTS 63 +/* Simultaneous Compute and Graphics (SCG) is available */ +#define NVGPU_SUPPORT_SCG 64 /* * Must be greater than the largest bit offset in the above list. */ -#define NVGPU_MAX_ENABLED_BITS 64 +#define NVGPU_MAX_ENABLED_BITS 65 /** * nvgpu_is_enabled - Check if the passed flag is enabled. -- cgit v1.2.2