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/gp106/hal_gp106.c | |
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/gp106/hal_gp106.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 7cfe4d76..6749dba7 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -726,8 +726,7 @@ static const struct gpu_ops gp106_ops = { | |||
726 | .read_ptimer = gk20a_read_ptimer, | 726 | .read_ptimer = gk20a_read_ptimer, |
727 | .get_timestamps_zipper = nvgpu_get_timestamps_zipper, | 727 | .get_timestamps_zipper = nvgpu_get_timestamps_zipper, |
728 | .bar1_bind = gk20a_bus_bar1_bind, | 728 | .bar1_bind = gk20a_bus_bar1_bind, |
729 | .set_ppriv_timeout_settings = | 729 | |
730 | gk20a_bus_set_ppriv_timeout_settings, | ||
731 | }, | 730 | }, |
732 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 731 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
733 | .css = { | 732 | .css = { |
@@ -760,6 +759,8 @@ static const struct gpu_ops gp106_ops = { | |||
760 | .priv_ring = { | 759 | .priv_ring = { |
761 | .isr = gp10b_priv_ring_isr, | 760 | .isr = gp10b_priv_ring_isr, |
762 | .decode_error_code = gp10b_priv_ring_decode_error_code, | 761 | .decode_error_code = gp10b_priv_ring_decode_error_code, |
762 | .set_ppriv_timeout_settings = | ||
763 | gk20a_priv_set_timeout_settings, | ||
763 | }, | 764 | }, |
764 | .fuse = { | 765 | .fuse = { |
765 | .check_priv_security = gp106_fuse_check_priv_security, | 766 | .check_priv_security = gp106_fuse_check_priv_security, |