From ce5228e09411f9c54e96cfb0f7e9c857fd9b480d Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Fri, 21 Sep 2018 05:28:15 -0700 Subject: Revert "gpu: nvgpu: refactor SET_SM_EXCEPTION_MASK ioctl" This reverts commit c5810a670d367ae1dc405fcc3108e11265df34bb. Bug 2400508 Jira VQRM-4806 Bug 200447406 Bug 2331747 Change-Id: Ie2a2c21f9285ff0349c7033fae24766a7117b462 Signed-off-by: Konsta Holtta Reviewed-on: https://git-master.nvidia.com/r/1837223 --- drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/tsg_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c index 43ee8d7c..885ce172 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c @@ -367,7 +367,6 @@ void gk20a_tsg_release(struct nvgpu_ref *ref) if(tsg->sm_error_states != NULL) { nvgpu_kfree(g, tsg->sm_error_states); tsg->sm_error_states = NULL; - nvgpu_mutex_destroy(&tsg->sm_exception_mask_lock); } /* unhook all events created on this TSG */ @@ -408,11 +407,6 @@ int gk20a_tsg_alloc_sm_error_states_mem(struct gk20a *g, int err = 0; if (tsg->sm_error_states != NULL) { - return -EINVAL; - } - - err = nvgpu_mutex_init(&tsg->sm_exception_mask_lock); - if (err) { return err; } @@ -421,7 +415,6 @@ int gk20a_tsg_alloc_sm_error_states_mem(struct gk20a *g, * num_sm); if (tsg->sm_error_states == NULL) { nvgpu_err(g, "sm_error_states mem allocation failed"); - nvgpu_mutex_destroy(&tsg->sm_exception_mask_lock); err = -ENOMEM; } @@ -447,20 +440,3 @@ void gk20a_tsg_update_sm_error_state_locked(struct tsg_gk20a *tsg, tsg_sm_error_states->hww_warp_esr_report_mask = sm_error_state->hww_warp_esr_report_mask; } - -int gk20a_tsg_set_sm_exception_type_mask(struct channel_gk20a *ch, - u32 exception_mask) -{ - struct tsg_gk20a *tsg; - - tsg = tsg_gk20a_from_ch(ch); - if (!tsg) { - return -EINVAL; - } - - nvgpu_mutex_acquire(&tsg->sm_exception_mask_lock); - tsg->sm_exception_mask_type = exception_mask; - nvgpu_mutex_release(&tsg->sm_exception_mask_lock); - - return 0; -} -- cgit v1.2.2