diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-05-24 15:31:57 -0400 |
---|---|---|
committer | Tejal Kudav <tkudav@nvidia.com> | 2018-06-14 09:44:07 -0400 |
commit | ed65f1f26e2d0ca4a491215297b61d25b0c1493b (patch) | |
tree | ad4ce439a0f77fe89f9138e6f4284aeaa996b4c8 /drivers/gpu/nvgpu/gv100 | |
parent | 4eae06299ba35e3f6a48eef4a19cde6d1c374deb (diff) |
gpu: nvgpu: Move setting priv interrupt to priv_ring
Registers to set priv interrupts are in priv_ring, but the code was
in bus HAL. Move the code and related HALs to priv_ring instead.
JIRA NVGPU-588
Change-Id: I708d11f77405dbba86586a0d1da42f65bcc1de9d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1730889
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv100')
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 961129c6..00c992bc 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -796,8 +796,6 @@ static const struct gpu_ops gv100_ops = { | |||
796 | .read_ptimer = gk20a_read_ptimer, | 796 | .read_ptimer = gk20a_read_ptimer, |
797 | .get_timestamps_zipper = nvgpu_get_timestamps_zipper, | 797 | .get_timestamps_zipper = nvgpu_get_timestamps_zipper, |
798 | .bar1_bind = NULL, | 798 | .bar1_bind = NULL, |
799 | .set_ppriv_timeout_settings = | ||
800 | gk20a_bus_set_ppriv_timeout_settings, | ||
801 | }, | 799 | }, |
802 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 800 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
803 | .css = { | 801 | .css = { |
@@ -827,6 +825,8 @@ static const struct gpu_ops gv100_ops = { | |||
827 | .priv_ring = { | 825 | .priv_ring = { |
828 | .isr = gp10b_priv_ring_isr, | 826 | .isr = gp10b_priv_ring_isr, |
829 | .decode_error_code = gp10b_priv_ring_decode_error_code, | 827 | .decode_error_code = gp10b_priv_ring_decode_error_code, |
828 | .set_ppriv_timeout_settings = | ||
829 | gk20a_priv_set_timeout_settings, | ||
830 | }, | 830 | }, |
831 | #if defined(CONFIG_TEGRA_NVLINK) | 831 | #if defined(CONFIG_TEGRA_NVLINK) |
832 | .nvlink = { | 832 | .nvlink = { |