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

Revert "gpu: nvgpu: disable golden context image verification"

Browse Source 
This reverts commit a372ec9a38.
Earlier golden context image verification was failing on orin safety due
to mismatch. But on tot there is no mismatch obeserved (possibly due to
update of NET image from A to D). So, now golden context image
verification can be re-enabled for orin safety.

Bug 3482988

Change-Id: I2bda9be921987e6b6a3b933b3ff45b26cf3025ca
Signed-off-by: Shashank Singh <shashsingh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2678153
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Shashank Singh
2022-03-08 12:39:46 +00:00
committed by mobile promotions
parent 185dbf9192
commit 8169bc8c83
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/nvgpu/Makefile.shared.configs
View File

@@ -82,6 +82,7 @@ ifeq ($(profile),$(filter $(profile),safety_debug safety_release))
# Enable golden context verification only for safety debug/release build # Enable golden context verification only for safety debug/release build
NVGPU_COMMON_CFLAGS += \ NVGPU_COMMON_CFLAGS += \
-DCONFIG_NVGPU_GR_GOLDEN_CTX_VERIFICATION \
-DCONFIG_NVGPU_BUILD_CONFIGURATION_IS_SAFETY -DCONFIG_NVGPU_BUILD_CONFIGURATION_IS_SAFETY
## For tesing of CTXSW FW error codes manually, enable below configs in safety build. ## For tesing of CTXSW FW error codes manually, enable below configs in safety build.

1
libs/dgpu/libnvgpu-drv-dgpu_safe.export
View File

@@ -478,6 +478,7 @@ nvgpu_gr_global_ctx_buffer_get_mem
nvgpu_gr_global_ctx_buffer_map nvgpu_gr_global_ctx_buffer_map
nvgpu_gr_global_ctx_buffer_ready nvgpu_gr_global_ctx_buffer_ready
nvgpu_gr_global_ctx_buffer_unmap nvgpu_gr_global_ctx_buffer_unmap
nvgpu_gr_global_ctx_compare_golden_images
nvgpu_gr_global_ctx_deinit_local_golden_image nvgpu_gr_global_ctx_deinit_local_golden_image
nvgpu_gr_global_ctx_desc_alloc nvgpu_gr_global_ctx_desc_alloc
nvgpu_gr_global_ctx_desc_free nvgpu_gr_global_ctx_desc_free

1
libs/igpu/libnvgpu-drv-igpu_safe.export
View File

@@ -494,6 +494,7 @@ nvgpu_gr_global_ctx_buffer_get_mem
nvgpu_gr_global_ctx_buffer_map nvgpu_gr_global_ctx_buffer_map
nvgpu_gr_global_ctx_buffer_ready nvgpu_gr_global_ctx_buffer_ready
nvgpu_gr_global_ctx_buffer_unmap nvgpu_gr_global_ctx_buffer_unmap
nvgpu_gr_global_ctx_compare_golden_images
nvgpu_gr_global_ctx_deinit_local_golden_image nvgpu_gr_global_ctx_deinit_local_golden_image
nvgpu_gr_global_ctx_desc_alloc nvgpu_gr_global_ctx_desc_alloc
nvgpu_gr_global_ctx_desc_free nvgpu_gr_global_ctx_desc_free

5
userspace/units/gr/setup/nvgpu-gr-setup.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2019-2022, NVIDIA CORPORATION. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@@ -725,13 +725,12 @@ int test_gr_setup_alloc_obj_ctx(struct unit_module *m,
if (err != 0) { if (err != 0) {
unit_return_fail(m, "local golden image alloc failed\n"); unit_return_fail(m, "local golden image alloc failed\n");
} }
#if 0
err = nvgpu_gr_global_ctx_alloc_local_golden_image(g, err = nvgpu_gr_global_ctx_alloc_local_golden_image(g,
&g->gr->golden_image->local_golden_image_copy, 0x800); &g->gr->golden_image->local_golden_image_copy, 0x800);
if (err != 0) { if (err != 0) {
unit_return_fail(m, "local golden image copy alloc failed\n"); unit_return_fail(m, "local golden image copy alloc failed\n");
} }
#endif
/* Test with channel and tsg */ /* Test with channel and tsg */
err = gr_test_setup_allocate_ch_tsg(m, g); err = gr_test_setup_allocate_ch_tsg(m, g);
if (err != 0) { if (err != 0) {