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/include/nvgpu/gk20a.h | 2 -- drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h | 7 ------- 2 files changed, 9 deletions(-) (limited to 'drivers/gpu/nvgpu/include') diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h index 244b6ed2..39ab455b 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h @@ -748,8 +748,6 @@ struct gpu_ops { struct nvgpu_semaphore *s, u64 sema_va, struct priv_cmd_entry *cmd, u32 off, bool acquire, bool wfi); - int (*set_sm_exception_type_mask)(struct channel_gk20a *ch, - u32 exception_mask); } fifo; struct pmu_v { u32 (*get_pmu_cmdline_args_size)(struct nvgpu_pmu *pmu); diff --git a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h index 8ef5236c..f7a58c87 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h +++ b/drivers/gpu/nvgpu/include/nvgpu/vgpu/tegra_vgpu.h @@ -123,7 +123,6 @@ enum { TEGRA_VGPU_CMD_RESUME = 83, TEGRA_VGPU_CMD_GET_ECC_INFO = 84, TEGRA_VGPU_CMD_GET_ECC_COUNTER_VALUE = 85, - TEGRA_VGPU_CMD_SET_SM_EXCEPTION_TYPE_MASK = 86, }; struct tegra_vgpu_connect_params { @@ -468,11 +467,6 @@ struct tegra_vgpu_gpu_clk_rate_params { u32 rate; /* in kHz */ }; -struct tegra_vgpu_set_sm_exception_type_mask_params { - u64 handle; - u32 mask; -}; - /* TEGRA_VGPU_MAX_ENGINES must be equal or greater than num_engines */ #define TEGRA_VGPU_MAX_ENGINES 4 struct tegra_vgpu_engines_info { @@ -684,7 +678,6 @@ struct tegra_vgpu_cmd_msg { struct tegra_vgpu_channel_update_pc_sampling update_pc_sampling; struct tegra_vgpu_ecc_info_params ecc_info; struct tegra_vgpu_ecc_counter_params ecc_counter; - struct tegra_vgpu_set_sm_exception_type_mask_params set_sm_exception_mask; char padding[192]; } params; }; -- cgit v1.2.2