nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: unit: use gr/ce engine interrupt mask

Browse Source 
nvgpu_engine_interrupt_mask has been split into
nvgpu_gr_engine_interrupt_mask and nvgpu_gr_engine_interrupt_mask.
Update test_engine_interrupt_mask to combine them.

Jira NVGPU-3693

Change-Id: I1e09ff3efd83415120773da75f8b512a481ee14c
Signed-off-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2249913
Reviewed-by: Vedashree Vidwans <vvidwans@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Thomas Fleury
2019-11-27 14:30:47 -05:00
committed by Alex Waterman
parent 0ba37ecf4d
commit 8fa2fcd9da
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
userspace/units/fifo/engine/nvgpu-engine.c
View File

@@ -362,7 +362,9 @@ int test_engine_interrupt_mask(struct unit_module *m,
struct gk20a *g, void *args) struct gk20a *g, void *args)
{ {
int ret = UNIT_FAIL; int ret = UNIT_FAIL;
u32 intr_mask = nvgpu_engine_interrupt_mask(g); u32 intr_mask =
nvgpu_gr_engine_interrupt_mask(g) |
nvgpu_ce_engine_interrupt_mask(g);
u32 all_mask = 0U; u32 all_mask = 0U;
u32 ce_reset_mask; u32 ce_reset_mask;
u32 mask; u32 mask;

7
userspace/units/fifo/engine/nvgpu-engine.h
View File

@@ -153,12 +153,13 @@ int test_engine_enum_from_type(struct unit_module *m,
/** /**
* Test specification for: test_engine_interrupt_mask * Test specification for: test_engine_interrupt_mask
* *
* Description: Branch coverage for nvgpu_engine_interrupt_mask, * Description: Engine interrupt masks
* nvgpu_engine_act_interrupt_mask and
* nvgpu_engine_get_all_ce_reset_mask
* *
* Test Type: Feature based * Test Type: Feature based
* *
* Targets: nvgpu_gr_engine_interrupt_mask, nvgpu_ce_engine_interrupt_mask,
* nvgpu_engine_act_interrupt_mask, nvgpu_engine_get_all_ce_reset_mask
*
* Input: test_engine_ids must have run. * Input: test_engine_ids must have run.
* *
* Steps: * Steps: