nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 09:12:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: MIG attributes enhancement

Browse Source 
This CL covers the following code changes,
1) Added some more documentation for gpu_instance_id
   and gr_instance_id.
2) Used the gr_sys_pipe_id for gr_instance_id.
2) Removed gr_syspipe_id attribute.
4) Removed NVGPU_GPU_FLAGS_SUPPORT_MIG flag.
3) Changed the device node name to use gpu instance id + syspipe id
   combination insted of gpu instance id + gr engine instance id.

Bug 2802347

Change-Id: Id6ca7db5765ab31b5d83472be35dde432c2281ed
Signed-off-by: Lakshmanan M <lm@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2440532
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Rajesh Devaraj <rdevaraj@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Lakshmanan M
2020-11-03 12:55:11 +05:30
committed by Alex Waterman
parent 67a68771d4
commit f8429c8e7c
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/os/linux/ioctl.c
View File

@@ -386,7 +386,7 @@ static const struct nvgpu_mig_static_info nvgpu_default_pci_mig_static_info[] =
{ {
.instance_type = NVGPU_MIG_TYPE_MIG, .instance_type = NVGPU_MIG_TYPE_MIG,
.major_instance_id = 2, .major_instance_id = 2,
.minor_instance_id = 0, .minor_instance_id = 4,
}, },
}; };

5
drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
View File

@@ -283,8 +283,6 @@ static struct nvgpu_flags_mapping flags_mapping[] = {
NVGPU_SUPPORT_I2M}, NVGPU_SUPPORT_I2M},
{NVGPU_GPU_FLAGS_SUPPORT_ZBC, {NVGPU_GPU_FLAGS_SUPPORT_ZBC,
NVGPU_SUPPORT_ZBC}, NVGPU_SUPPORT_ZBC},
{NVGPU_GPU_FLAGS_SUPPORT_MIG,
NVGPU_SUPPORT_MIG},
{NVGPU_GPU_FLAGS_SUPPORT_PROFILER_V2_DEVICE, {NVGPU_GPU_FLAGS_SUPPORT_PROFILER_V2_DEVICE,
NVGPU_SUPPORT_PROFILER_V2_DEVICE}, NVGPU_SUPPORT_PROFILER_V2_DEVICE},
{NVGPU_GPU_FLAGS_SUPPORT_PROFILER_V2_CONTEXT, {NVGPU_GPU_FLAGS_SUPPORT_PROFILER_V2_CONTEXT,
@@ -487,8 +485,7 @@ static long gk20a_ctrl_ioctl_gpu_characteristics(
gpu.per_device_identifier = g->per_device_identifier; gpu.per_device_identifier = g->per_device_identifier;
gpu.gpu_instance_id = gpu_instance->gpu_instance_id; gpu.gpu_instance_id = gpu_instance->gpu_instance_id;
gpu.gr_sys_pipe_id = gpu_instance->gr_syspipe.gr_syspipe_id; gpu.gr_instance_id = gpu_instance->gr_syspipe.gr_syspipe_id;
gpu.gr_instance_id = gpu_instance->gr_syspipe.gr_instance_id;
if (request->gpu_characteristics_buf_size > 0) { if (request->gpu_characteristics_buf_size > 0) {
size_t write_size = sizeof(gpu); size_t write_size = sizeof(gpu);

5
include/uapi/linux/nvgpu.h
View File

@@ -191,9 +191,6 @@ struct nvgpu_gpu_zbc_query_table_args {
#define NVGPU_GPU_FLAGS_SUPPORT_I2M (1ULL << 43) #define NVGPU_GPU_FLAGS_SUPPORT_I2M (1ULL << 43)
/* Flag to indicate whether zbc classes are supported */ /* Flag to indicate whether zbc classes are supported */
#define NVGPU_GPU_FLAGS_SUPPORT_ZBC (1ULL << 44) #define NVGPU_GPU_FLAGS_SUPPORT_ZBC (1ULL << 44)
/* Flag to indicate whether Multi Instance Gpu per GPU physical device
is enabled/disabled. */
#define NVGPU_GPU_FLAGS_SUPPORT_MIG (1ULL << 45)
/* Profiler V2 device objects are supported */ /* Profiler V2 device objects are supported */
#define NVGPU_GPU_FLAGS_SUPPORT_PROFILER_V2_DEVICE (1ULL << 46) #define NVGPU_GPU_FLAGS_SUPPORT_PROFILER_V2_DEVICE (1ULL << 46)
/* Profiler V2 context objects are supported */ /* Profiler V2 context objects are supported */
@@ -329,8 +326,8 @@ struct nvgpu_gpu_characteristics {
__u32 num_sub_partition_per_fbpa; __u32 num_sub_partition_per_fbpa;
__u32 gpu_instance_id; __u32 gpu_instance_id;
__u32 gr_sys_pipe_id;
__u32 gr_instance_id; __u32 gr_instance_id;
__u32 reserved4;
/* Notes: /* Notes:
- This struct can be safely appended with new fields. However, always - This struct can be safely appended with new fields. However, always