gpu: nvgpu: increment gr instance id in macros

Increment gr instance id in loop implemented for below macros
nvgpu_gr_exec_with_ret_for_each_instance
nvgpu_gr_exec_for_each_instance

Ensure remap window is disabled in case function returns error
in nvgpu_gr_exec_with_ret_for_each_instance

Jira NVGPU-5648

Change-Id: I72d34bbfd4067e3448883b5daeee45c614ee029f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2409638
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Antony Clince Alex <aalex@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Deepak Nibade
2020-09-07 13:20:26 +05:30
committed by Alex Waterman
parent 83691e088f
commit c8add76c8d

View File

@@ -32,7 +32,7 @@
({ \
if (nvgpu_is_enabled(g, NVGPU_SUPPORT_MIG)) { \
u32 gr_instance_id = 0U; \
while (gr_instance_id < g->num_gr_instances) { \
for (; gr_instance_id < g->num_gr_instances; gr_instance_id++) { \
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; \
@@ -53,15 +53,15 @@
int err = 0; \
if (nvgpu_is_enabled(g, NVGPU_SUPPORT_MIG)) { \
u32 gr_instance_id = 0U; \
while (gr_instance_id < g->num_gr_instances) { \
for (; gr_instance_id < g->num_gr_instances; gr_instance_id++) { \
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); \
nvgpu_grmgr_config_gr_remap_window(g, gr_syspipe_id, false); \
if (err != 0) { \
break; \
} \
nvgpu_grmgr_config_gr_remap_window(g, gr_syspipe_id, false); \
} \
} else { \
err = (func); \