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/gm20b | |
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/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index ccceab03..970d2d27 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -608,8 +608,6 @@ static const struct gpu_ops gm20b_ops = { | |||
608 | .read_ptimer = gk20a_read_ptimer, | 608 | .read_ptimer = gk20a_read_ptimer, |
609 | .get_timestamps_zipper = nvgpu_get_timestamps_zipper, | 609 | .get_timestamps_zipper = nvgpu_get_timestamps_zipper, |
610 | .bar1_bind = gm20b_bus_bar1_bind, | 610 | .bar1_bind = gm20b_bus_bar1_bind, |
611 | .set_ppriv_timeout_settings = | ||
612 | gk20a_bus_set_ppriv_timeout_settings, | ||
613 | }, | 611 | }, |
614 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 612 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
615 | .css = { | 613 | .css = { |
@@ -626,6 +624,8 @@ static const struct gpu_ops gm20b_ops = { | |||
626 | }, | 624 | }, |
627 | .priv_ring = { | 625 | .priv_ring = { |
628 | .isr = gk20a_priv_ring_isr, | 626 | .isr = gk20a_priv_ring_isr, |
627 | .set_ppriv_timeout_settings = | ||
628 | gk20a_priv_set_timeout_settings, | ||
629 | }, | 629 | }, |
630 | .fuse = { | 630 | .fuse = { |
631 | .check_priv_security = gm20b_fuse_check_priv_security, | 631 | .check_priv_security = gm20b_fuse_check_priv_security, |