nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 18:16:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: keep set_preemption_mode for safety

Browse Source 
Keep g->ops.gr.set_preemption_mode for safety build.
It is needed to allow WFI and CTA for compute.

Jira NVGPU-3744

Change-Id: Ib6b2ebd00bb773dd357efb45c901c5005ee54d45
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2152459
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Thomas Fleury
2019-07-11 18:07:52 -04:00
committed by mobile promotions
parent 9a0e041602
commit 90ceeda80b
4 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/common/gr/gr_setup.c
View File

@@ -224,7 +224,6 @@ void nvgpu_gr_setup_free_subctx(struct nvgpu_channel *c)
} }
} }
#ifdef CONFIG_NVGPU_CHANNEL_TSG_CONTROL
int nvgpu_gr_setup_set_preemption_mode(struct nvgpu_channel *ch, int nvgpu_gr_setup_set_preemption_mode(struct nvgpu_channel *ch,
u32 graphics_preempt_mode, u32 graphics_preempt_mode,
u32 compute_preempt_mode) u32 compute_preempt_mode)
@@ -320,4 +319,3 @@ enable_ch:
} }
return err; return err;
} }
#endif

2
drivers/gpu/nvgpu/hal/init/hal_gp10b.c
View File

@@ -359,9 +359,7 @@ static const struct gpu_ops gp10b_ops = {
#ifdef CONFIG_NVGPU_GRAPHICS #ifdef CONFIG_NVGPU_GRAPHICS
.bind_ctxsw_zcull = nvgpu_gr_setup_bind_ctxsw_zcull, .bind_ctxsw_zcull = nvgpu_gr_setup_bind_ctxsw_zcull,
#endif /* CONFIG_NVGPU_GRAPHICS */ #endif /* CONFIG_NVGPU_GRAPHICS */
#ifdef CONFIG_NVGPU_CHANNEL_TSG_CONTROL
.set_preemption_mode = nvgpu_gr_setup_set_preemption_mode, .set_preemption_mode = nvgpu_gr_setup_set_preemption_mode,
#endif
}, },
#ifdef CONFIG_NVGPU_GRAPHICS #ifdef CONFIG_NVGPU_GRAPHICS
.zbc = { .zbc = {

2
drivers/gpu/nvgpu/hal/init/hal_gv11b.c
View File

@@ -433,9 +433,7 @@ static const struct gpu_ops gv11b_ops = {
#ifdef CONFIG_NVGPU_GRAPHICS #ifdef CONFIG_NVGPU_GRAPHICS
.bind_ctxsw_zcull = nvgpu_gr_setup_bind_ctxsw_zcull, .bind_ctxsw_zcull = nvgpu_gr_setup_bind_ctxsw_zcull,
#endif /* CONFIG_NVGPU_GRAPHICS */ #endif /* CONFIG_NVGPU_GRAPHICS */
#ifdef CONFIG_NVGPU_CHANNEL_TSG_CONTROL
.set_preemption_mode = nvgpu_gr_setup_set_preemption_mode, .set_preemption_mode = nvgpu_gr_setup_set_preemption_mode,
#endif
}, },
#ifdef CONFIG_NVGPU_GRAPHICS #ifdef CONFIG_NVGPU_GRAPHICS
.zbc = { .zbc = {

2
drivers/gpu/nvgpu/hal/init/hal_tu104.c
View File

@@ -466,9 +466,7 @@ static const struct gpu_ops tu104_ops = {
#ifdef CONFIG_NVGPU_GRAPHICS #ifdef CONFIG_NVGPU_GRAPHICS
.bind_ctxsw_zcull = nvgpu_gr_setup_bind_ctxsw_zcull, .bind_ctxsw_zcull = nvgpu_gr_setup_bind_ctxsw_zcull,
#endif /* CONFIG_NVGPU_GRAPHICS */ #endif /* CONFIG_NVGPU_GRAPHICS */
#ifdef CONFIG_NVGPU_CHANNEL_TSG_CONTROL
.set_preemption_mode = nvgpu_gr_setup_set_preemption_mode, .set_preemption_mode = nvgpu_gr_setup_set_preemption_mode,
#endif
}, },
#ifdef CONFIG_NVGPU_GRAPHICS #ifdef CONFIG_NVGPU_GRAPHICS
.zbc = { .zbc = {