nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-25 02:52:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: add refcounting for MMU debug mode

Browse Source 
GPC MMU debug mode should be set if at least one channel
in the TSG has requested it. Add refcounting for MMU debug
mode, to make sure debug mode is disabled only when no
channel in the TSG is using it.

Bug 2515097

Change-Id: Ic5530f93523a9ec2cd3bfebc97adf7b7000531e0
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2123017
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Thomas Fleury
2019-04-30 17:19:51 -07:00
committed by mobile promotions
parent 741723e81a
commit a1248d87fe
5 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/gpu/nvgpu/common/fifo/tsg.c
View File

@@ -215,6 +215,14 @@ int nvgpu_tsg_unbind_channel_common(struct nvgpu_tsg *tsg,
g->ops.channel.disable(ch);
nvgpu_rwsem_up_write(&tsg->ch_list_lock);
if (ch->mmu_debug_mode_enabled) {
err = nvgpu_tsg_set_mmu_debug_mode(tsg, ch, false);
if (err != 0) {
nvgpu_err(g, "disable mmu debug mode failed ch:%u",
ch->chid);
}
}
/*
* Don't re-enable all channels if TSG has timed out already
*
@@ -876,3 +884,49 @@ void nvgpu_tsg_reset_faulted_eng_pbdma(struct gk20a *g, struct nvgpu_tsg *tsg,
}
nvgpu_rwsem_up_read(&tsg->ch_list_lock);
}
int nvgpu_tsg_set_mmu_debug_mode(struct nvgpu_tsg *tsg,
struct nvgpu_channel *ch, bool enable)
{
struct gk20a *g;
int err = 0;
u32 tsg_refcnt;
if ((ch == NULL) || (tsg == NULL)) {
return -EINVAL;
}
g = ch->g;
if (g->ops.gr.set_mmu_debug_mode == NULL) {
return -ENOSYS;
}
if (enable) {
if (ch->mmu_debug_mode_enabled) {
/* already enabled for this channel */
return 0;
}
tsg_refcnt = tsg->mmu_debug_mode_refcnt + 1U;
} else {
if (!ch->mmu_debug_mode_enabled) {
/* already disabled for this channel */
return 0;
}
tsg_refcnt = tsg->mmu_debug_mode_refcnt - 1U;
}
/*
* enable GPC MMU debug mode if it was requested for at
* least one channel in the TSG
*/
err = g->ops.gr.set_mmu_debug_mode(g, ch, tsg_refcnt > 0U);
if (err != 0) {
nvgpu_err(g, "set mmu debug mode failed, err=%d", err);
return err;
}
ch->mmu_debug_mode_enabled = enable;
tsg->mmu_debug_mode_refcnt = tsg_refcnt;
return err;
}