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

gpu: nvgpu: NULL check config->gpc_zcb_count in MIG mode

Browse Source 
config->gpc_zcb_count is not allocated in MIG mode. Add NULL checks
before accessing this in case it is not allocated.

Jira NVGPU-5648

Change-Id: I4c1169772310ae4776063a91ba298af9e5bfe874
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2413840
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Deepak Nibade
2020-09-15 16:23:12 +05:30
committed by Alex Waterman
parent 39b354da6e
commit d419005222
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/nvgpu/common/gr/gr_config.c
View File

@@ -119,7 +119,8 @@ static void gr_config_log_info(struct gk20a *g,
#ifdef CONFIG_NVGPU_GRAPHICS #ifdef CONFIG_NVGPU_GRAPHICS
for (gpc_index = 0; gpc_index < config->gpc_count; gpc_index++) { for (gpc_index = 0; gpc_index < config->gpc_count; gpc_index++) {
nvgpu_log(g, gpu_dbg_info | gpu_dbg_gr, "gpc_zcb_count[%d] : %d", nvgpu_log(g, gpu_dbg_info | gpu_dbg_gr, "gpc_zcb_count[%d] : %d",
gpc_index, config->gpc_zcb_count[gpc_index]); gpc_index, config->gpc_zcb_count != NULL ?
config->gpc_zcb_count[gpc_index] : 0U);
} }
#endif #endif
for (gpc_index = 0; gpc_index < config->gpc_count; gpc_index++) { for (gpc_index = 0; gpc_index < config->gpc_count; gpc_index++) {
@@ -167,14 +168,18 @@ static void gr_config_set_gpc_mask(struct gk20a *g,
static bool gr_config_alloc_valid(struct nvgpu_gr_config *config) static bool gr_config_alloc_valid(struct nvgpu_gr_config *config)
{ {
if ((config->gpc_tpc_count == NULL) || (config->gpc_tpc_mask == NULL) || if ((config->gpc_tpc_count == NULL) || (config->gpc_tpc_mask == NULL) ||
#ifdef CONFIG_NVGPU_GRAPHICS
(config->gpc_zcb_count == NULL) ||
#endif
(config->gpc_ppc_count == NULL) || (config->gpc_ppc_count == NULL) ||
(config->gpc_skip_mask == NULL)) { (config->gpc_skip_mask == NULL)) {
return false; return false;
} }
#ifdef CONFIG_NVGPU_GRAPHICS
if (!nvgpu_is_enabled(config->g, NVGPU_SUPPORT_MIG) &&
(config->gpc_zcb_count == NULL)) {
return false;
}
#endif
return true; return true;
} }