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: use generic variable name for temp golden context

Browse Source 
Use more generic name "local_golden_image_temp" for storing
temporary golden context image during golden context
verification process.

JIRA NVGPU-3558

Change-Id: I40208232e21541a9c8e8601e2dde2a122f74fad7
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2171272
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Seshendra Gadagottu
2019-08-08 11:30:13 -07:00
committed by mobile promotions
parent a69647340d
commit 488e44fce1
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/gpu/nvgpu/common/gr/obj_ctx.c
View File

@@ -426,7 +426,7 @@ int nvgpu_gr_obj_ctx_alloc_golden_ctx_image(struct gk20a *g,
#ifdef CONFIG_NVGPU_GR_GOLDEN_CTX_VERIFICATION #ifdef CONFIG_NVGPU_GR_GOLDEN_CTX_VERIFICATION
struct netlist_av_list *sw_bundle_init = struct netlist_av_list *sw_bundle_init =
nvgpu_netlist_get_sw_bundle_init_av_list(g); nvgpu_netlist_get_sw_bundle_init_av_list(g);
struct nvgpu_gr_global_ctx_local_golden_image *local_golden_image2 = struct nvgpu_gr_global_ctx_local_golden_image *local_golden_image_temp =
NULL; NULL;
#endif #endif
@@ -549,14 +549,14 @@ restore_fe_go_idle:
/* /*
* Save ctx data before first golden context save. Restore same data * Save ctx data before first golden context save. Restore same data
* before second golden context save. This temporary copy is * before second golden context save. This temporary copy is
* saved in local_golden_image2. * saved in local_golden_image_temp.
*/ */
size = nvgpu_gr_obj_ctx_get_golden_image_size(golden_image); size = nvgpu_gr_obj_ctx_get_golden_image_size(golden_image);
local_golden_image2 = local_golden_image_temp =
nvgpu_gr_global_ctx_init_local_golden_image(g, gr_mem, size); nvgpu_gr_global_ctx_init_local_golden_image(g, gr_mem, size);
if (local_golden_image2 == NULL) { if (local_golden_image_temp == NULL) {
err = -ENOMEM; err = -ENOMEM;
goto clean_up; goto clean_up;
} }
@@ -581,10 +581,11 @@ restore_fe_go_idle:
#ifdef CONFIG_NVGPU_GR_GOLDEN_CTX_VERIFICATION #ifdef CONFIG_NVGPU_GR_GOLDEN_CTX_VERIFICATION
/* Before second golden context save restore to before known state */ /* Before second golden context save restore to before known state */
nvgpu_gr_global_ctx_load_local_golden_image(g, nvgpu_gr_global_ctx_load_local_golden_image(g,
local_golden_image2, gr_mem); local_golden_image_temp, gr_mem);
/* free local copy now */ /* free local copy now */
nvgpu_gr_global_ctx_deinit_local_golden_image(g, local_golden_image2); nvgpu_gr_global_ctx_deinit_local_golden_image(g,
local_golden_image2 = NULL; local_golden_image_temp);
local_golden_image_temp = NULL;
/* Initiate second golden context save */ /* Initiate second golden context save */
data = g->ops.gr.falcon.get_fecs_current_ctx_data(g, inst_block); data = g->ops.gr.falcon.get_fecs_current_ctx_data(g, inst_block);
@@ -595,9 +596,9 @@ restore_fe_go_idle:
} }
/* Copy the data to local buffer */ /* Copy the data to local buffer */
local_golden_image2 = local_golden_image_temp =
nvgpu_gr_global_ctx_init_local_golden_image(g, gr_mem, size); nvgpu_gr_global_ctx_init_local_golden_image(g, gr_mem, size);
if (local_golden_image2 == NULL) { if (local_golden_image_temp == NULL) {
err = -ENOMEM; err = -ENOMEM;
goto clean_up; goto clean_up;
} }
@@ -606,7 +607,7 @@ restore_fe_go_idle:
if (!nvgpu_gr_global_ctx_compare_golden_images(g, if (!nvgpu_gr_global_ctx_compare_golden_images(g,
nvgpu_mem_is_sysmem(gr_mem), nvgpu_mem_is_sysmem(gr_mem),
golden_image->local_golden_image, golden_image->local_golden_image,
local_golden_image2, local_golden_image_temp,
size)) { size)) {
nvgpu_err(g, "golden context mismatch"); nvgpu_err(g, "golden context mismatch");
err = -ENOMEM; err = -ENOMEM;
@@ -622,9 +623,9 @@ restore_fe_go_idle:
clean_up: clean_up:
#ifdef CONFIG_NVGPU_GR_GOLDEN_CTX_VERIFICATION #ifdef CONFIG_NVGPU_GR_GOLDEN_CTX_VERIFICATION
if (local_golden_image2 != NULL) { if (local_golden_image_temp != NULL) {
nvgpu_gr_global_ctx_deinit_local_golden_image(g, nvgpu_gr_global_ctx_deinit_local_golden_image(g,
local_golden_image2); local_golden_image_temp);
} }
#endif #endif
if (err != 0) { if (err != 0) {