diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2016-01-20 06:28:35 -0500 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-02-05 15:45:20 -0500 |
commit | 7b42acda56eb1fccb621f3a6cfd567d62679bdd4 (patch) | |
tree | 4a0281d280b36cbc4bc35232019fdea481190d5a | |
parent | 04f4f2334e42ddf1c261e0c938949d74fbfe14a0 (diff) |
gpu: nvgpu: enable ctxsw_intr1 interrupt
Enable NV_PGRAPH_PRI_FECS_HOST_INT_ENABLE_CTXSW_INTR1
Bug 200156699
Change-Id: I170dd6998381897a4b4ca832774eb0f11f92fd86
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/935772
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index dbaa520d..a96bc4e1 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -4115,6 +4115,7 @@ static int gk20a_init_gr_setup_hw(struct gk20a *g) | |||
4115 | 4115 | ||
4116 | /* enable fecs error interrupts */ | 4116 | /* enable fecs error interrupts */ |
4117 | gk20a_writel(g, gr_fecs_host_int_enable_r(), | 4117 | gk20a_writel(g, gr_fecs_host_int_enable_r(), |
4118 | gr_fecs_host_int_enable_ctxsw_intr1_enable_f() | | ||
4118 | gr_fecs_host_int_enable_fault_during_ctxsw_enable_f() | | 4119 | gr_fecs_host_int_enable_fault_during_ctxsw_enable_f() | |
4119 | gr_fecs_host_int_enable_umimp_firmware_method_enable_f() | | 4120 | gr_fecs_host_int_enable_umimp_firmware_method_enable_f() | |
4120 | gr_fecs_host_int_enable_umimp_illegal_method_enable_f() | | 4121 | gr_fecs_host_int_enable_umimp_illegal_method_enable_f() | |
diff --git a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h index a73209f2..b9d083e3 100644 --- a/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/hw_gr_gk20a.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -934,6 +934,10 @@ static inline u32 gr_fecs_host_int_enable_r(void) | |||
934 | { | 934 | { |
935 | return 0x00409c24; | 935 | return 0x00409c24; |
936 | } | 936 | } |
937 | static inline u32 gr_fecs_host_int_enable_ctxsw_intr1_enable_f(void) | ||
938 | { | ||
939 | return 0x2; | ||
940 | } | ||
937 | static inline u32 gr_fecs_host_int_enable_fault_during_ctxsw_enable_f(void) | 941 | static inline u32 gr_fecs_host_int_enable_fault_during_ctxsw_enable_f(void) |
938 | { | 942 | { |
939 | return 0x10000; | 943 | return 0x10000; |
diff --git a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h index 7a19e4ab..696f518c 100644 --- a/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/hw_gr_gm20b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -946,6 +946,10 @@ static inline u32 gr_fecs_host_int_enable_r(void) | |||
946 | { | 946 | { |
947 | return 0x00409c24; | 947 | return 0x00409c24; |
948 | } | 948 | } |
949 | static inline u32 gr_fecs_host_int_enable_ctxsw_intr1_enable_f(void) | ||
950 | { | ||
951 | return 0x2; | ||
952 | } | ||
949 | static inline u32 gr_fecs_host_int_enable_fault_during_ctxsw_enable_f(void) | 953 | static inline u32 gr_fecs_host_int_enable_fault_during_ctxsw_enable_f(void) |
950 | { | 954 | { |
951 | return 0x10000; | 955 | return 0x10000; |