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

gpu: nvgpu: Add multi GR gr_config utilty support

Browse Source 
This CL covers the following code changes,
1) Added api to get the gr_config per gr_instance_id basis.
2) Added api to covert from gpu_instance_id to gr_instance_id.
3) Modified nvgpu_gr_exec_with_ret_for_instance() utility to handle
   generic data return type.

JIRA NVGPU-5662
JIRA NVGPU-5663

Change-Id: I4ab732e15cdbda25672975f99e23b5e5d27decb0
Signed-off-by: Lakshmanan M <lm@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2413195
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Lakshmanan M
2020-09-14 16:57:32 +05:30
committed by Alex Waterman
parent ebb66b5d50
commit aef3367ca5
5 changed files with 99 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/nvgpu/common/gr/gr_utils.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -46,6 +46,12 @@ struct nvgpu_gr_config *nvgpu_gr_get_config_ptr(struct gk20a *g)
return gr->config;
}
struct nvgpu_gr_config *nvgpu_gr_get_gr_instance_config_ptr(struct gk20a *g,
u32 gr_instance_id)
{
return g->gr[gr_instance_id].config;
}
struct nvgpu_gr_intr *nvgpu_gr_get_intr_ptr(struct gk20a *g)
{
struct nvgpu_gr *gr = nvgpu_gr_get_cur_instance_ptr(g);

28
drivers/gpu/nvgpu/common/grmgr/grmgr.c
View File

@@ -262,7 +262,7 @@ static inline u32 nvgpu_grmgr_get_gpu_instance_id(struct gk20a *g,
if (gpu_instance_id >= g->mig.num_gpu_instances) {
nvgpu_err(g,
"gpu_instance_id[%u] > num_gpu_instances[%u]",
"gpu_instance_id[%u] >= num_gpu_instances[%u]",
gpu_instance_id, g->mig.num_gpu_instances);
nvgpu_assert(
gpu_instance_id < g->mig.num_gpu_instances);
@@ -314,3 +314,29 @@ u32 nvgpu_grmgr_get_gr_gpc_phys_id(struct gk20a *g, u32 gr_instance_id, u32 gpc_
return gr_syspipe->gpcs[gpc_local_id].physical_id;
}
u32 nvgpu_grmgr_get_gr_instance_id(struct gk20a *g, u32 gpu_instance_id)
{
u32 gr_instance_id = 0U;
/* TODO : Add gr_instance_id for physical device when MIG is enabled. */
if ((nvgpu_is_enabled(g, NVGPU_SUPPORT_MIG)) &&
(gpu_instance_id != 0U)) {
if (gpu_instance_id < g->mig.num_gpu_instances) {
/* 0th entry is physical device gpu instance */
gr_instance_id = nvgpu_safe_sub_u32(
gpu_instance_id, 1U);
} else {
nvgpu_err(g,
"gpu_instance_id[%u] >= num_gpu_instances[%u]",
gpu_instance_id, g->mig.num_gpu_instances);
nvgpu_assert(
gpu_instance_id < g->mig.num_gpu_instances);
}
}
nvgpu_log(g, gpu_dbg_mig, "gpu_instance_id[%u] gr_instance_id[%u]",
gpu_instance_id, gr_instance_id);
return gr_instance_id;
}

58
drivers/gpu/nvgpu/include/nvgpu/gr/gr_instances.h
View File

@@ -116,11 +116,14 @@
#define nvgpu_gr_exec_for_instance(g, gr_instance_id, func) \
({ \
if (nvgpu_is_enabled(g, NVGPU_SUPPORT_MIG)) { \
u32 gr_syspipe_id = nvgpu_gr_get_syspipe_id(g, gr_instance_id); \
nvgpu_grmgr_config_gr_remap_window(g, gr_syspipe_id, true); \
u32 gr_syspipe_id = nvgpu_gr_get_syspipe_id(g, \
gr_instance_id); \
nvgpu_grmgr_config_gr_remap_window(g, gr_syspipe_id, \
true); \
g->mig.cur_gr_instance = gr_instance_id; \
(func); \
nvgpu_grmgr_config_gr_remap_window(g, gr_syspipe_id, false); \
nvgpu_grmgr_config_gr_remap_window(g, gr_syspipe_id, \
false); \
} else { \
(func); \
} \
@@ -130,22 +133,61 @@
#endif
#ifdef CONFIG_NVGPU_MIG
#define nvgpu_gr_exec_with_ret_for_instance(g, gr_instance_id, func) \
#define nvgpu_gr_exec_with_ret_for_instance(g, gr_instance_id, func, type) \
({ \
int err = 0; \
typeof(type) ret; \
if (nvgpu_is_enabled(g, NVGPU_SUPPORT_MIG)) { \
u32 gr_syspipe_id = nvgpu_gr_get_syspipe_id(g, gr_instance_id); \
nvgpu_grmgr_config_gr_remap_window(g, gr_syspipe_id, true); \
g->mig.cur_gr_instance = gr_instance_id; \
err = (func); \
ret = (func); \
nvgpu_grmgr_config_gr_remap_window(g, gr_syspipe_id, false); \
} else { \
err = (func); \
ret = (func); \
} \
ret; \
})
#else
#define nvgpu_gr_exec_with_ret_for_instance(g, gr_instance_id, func, type) \
(func)
#endif
#ifdef CONFIG_NVGPU_MIG
#define nvgpu_gr_exec_with_err_for_instance(g, gr_instance_id, func) \
({ \
int err; \
err = nvgpu_gr_exec_with_ret_for_instance(g, gr_instance_id, \
func, err); \
err; \
})
#else
#define nvgpu_gr_exec_with_ret_for_instance(g, gr_instance_id, func) (func)
#define nvgpu_gr_exec_with_err_for_instance(g, gr_instance_id, func) (func)
#endif
#ifdef CONFIG_NVGPU_MIG
#define nvgpu_gr_get_gpu_instance_config_ptr(g, gpu_instance_id) \
({ \
struct nvgpu_gr_config *gr_config = NULL; \
if (nvgpu_is_enabled(g, NVGPU_SUPPORT_MIG)) { \
u32 gr_instance_id = nvgpu_grmgr_get_gr_instance_id(g, \
gpu_instance_id); \
if (gr_instance_id < g->num_gr_instances) { \
gr_config = \
nvgpu_gr_get_gr_instance_config_ptr(g, \
gr_instance_id); \
} \
} else { \
gr_config = nvgpu_gr_get_config_ptr(g); \
} \
gr_config; \
})
#else
#define nvgpu_gr_get_gpu_instance_config_ptr(g, gr_instance_id) \
({ \
struct nvgpu_gr_config *gr_instance_gr_config = \
nvgpu_gr_get_config_ptr(g); \
gr_instance_gr_config; \
})
#endif
#endif /* NVGPU_GR_INSTANCES_H */

15
drivers/gpu/nvgpu/include/nvgpu/gr/gr_utils.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -86,6 +86,19 @@ struct nvgpu_gr_falcon *nvgpu_gr_get_falcon_ptr(struct gk20a *g);
*/
struct nvgpu_gr_config *nvgpu_gr_get_config_ptr(struct gk20a *g);
/**
* @brief Get GR configuration struct pointer.
*
* @param g [in] Pointer to GPU driver struct.
* @param gr_instance_id [in] Gr instance Id.
*
* This function returns pointer to #nvgpu_gr_config structure.
*
* @return Pointer to GR configuration struct.
*/
struct nvgpu_gr_config *nvgpu_gr_get_gr_instance_config_ptr(struct gk20a *g,
u32 gr_instance_id);
/**
* @brief Get GR interrupt data struct pointer.
*

1
drivers/gpu/nvgpu/include/nvgpu/grmgr.h
View File

@@ -38,6 +38,7 @@ u32 nvgpu_grmgr_get_num_gr_instances(struct gk20a *g);
u32 nvgpu_grmgr_get_gr_syspipe_id(struct gk20a *g, u32 gr_instance_id);
u32 nvgpu_grmgr_get_gr_num_gpcs(struct gk20a *g, u32 gr_instance_id);
u32 nvgpu_grmgr_get_gr_gpc_phys_id(struct gk20a *g, u32 gr_instance_id, u32 gpc_local_id);
u32 nvgpu_grmgr_get_gr_instance_id(struct gk20a *g, u32 gpu_instance_id);
static inline bool nvgpu_grmgr_is_mig_type_gpu_instance(
struct nvgpu_gpu_instance *gpu_instance)