diff options
author | Alex Waterman <alexw@nvidia.com> | 2018-05-16 14:27:01 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-05-17 16:03:36 -0400 |
commit | 8ac538e1b16c68ef4a5b9d85a82bbfc2b3fabd72 (patch) | |
tree | fb808cb9190f801bdcbe18063390aeb8a4379bb4 /drivers/gpu/nvgpu/gp106/clk_gp106.h | |
parent | 2203d0330231821eeae18517715ba754e093ab18 (diff) |
gpu: nvgpu: Fix gp106/clk_gp106.c compile errors
Fix the following compiler errors:
/dvs/git/dirty/git-master_modular/kernel/nvgpu/drivers/gpu/nvgpu/gp106/clk_gp106.c: In function 'gp106_init_clk_support':
/dvs/git/dirty/git-master_modular/kernel/nvgpu/drivers/gpu/nvgpu/gp106/clk_gp106.c:109:3: error: unknown field 'cntr' specified in initializer
cc1: warnings being treated as errors
/dvs/git/dirty/git-master_modular/kernel/nvgpu/drivers/gpu/nvgpu/gp106/clk_gp106.c:109:3: error: missing braces around initializer
/dvs/git/dirty/git-master_modular/kernel/nvgpu/drivers/gpu/nvgpu/gp106/clk_gp106.c:109:3: error: (near initialization for '(anonymous).<anonymous>')
/dvs/git/dirty/git-master_modular/kernel/nvgpu/drivers/gpu/nvgpu/gp106/clk_gp106.c:110:3: error: unknown field 'cntr' specified in initializer
/dvs/git/dirty/git-master_modular/kernel/nvgpu/drivers/gpu/nvgpu/gp106/clk_gp106.c:112:3: error: unknown field 'cntr' specified in initializer
/dvs/git/dirty/git-master_modular/kernel/nvgpu/drivers/gpu/nvgpu/gp106/clk_gp106.c:115:2: error: initialized field with side-effects overwritten
/dvs/git/dirty/git-master_modular/kernel/nvgpu/drivers/gpu/nvgpu/gp106/clk_gp106.c:115:2: error: (near initialization for '(anonymous).scale')
/dvs/git/dirty/git-master_modular/kernel/nvgpu/drivers/gpu/nvgpu/gp106/clk_gp106.c:122:3: error: unknown field 'cntr' specified in initializer
/dvs/git/dirty/git-master_modular/kernel/nvgpu/drivers/gpu/nvgpu/gp106/clk_gp106.c:122:3: error: missing braces around initializer
Not sure why this shows up for the L4T userspace compiler but not in
any other compilers.
JIRA NVGPU-525
Change-Id: I0609c1d9ad20232053768258103debadd6d9206f
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1720924
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/clk_gp106.h')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/clk_gp106.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/gp106/clk_gp106.h b/drivers/gpu/nvgpu/gp106/clk_gp106.h index 0342d927..97baa224 100644 --- a/drivers/gpu/nvgpu/gp106/clk_gp106.h +++ b/drivers/gpu/nvgpu/gp106/clk_gp106.h | |||
@@ -43,16 +43,11 @@ struct namemap_cfg { | |||
43 | u32 is_enable; /* Namemap enabled */ | 43 | u32 is_enable; /* Namemap enabled */ |
44 | u32 is_counter; /* Using cntr */ | 44 | u32 is_counter; /* Using cntr */ |
45 | struct gk20a *g; | 45 | struct gk20a *g; |
46 | union { | 46 | struct { |
47 | struct { | 47 | u32 reg_ctrl_addr; |
48 | u32 reg_ctrl_addr; | 48 | u32 reg_ctrl_idx; |
49 | u32 reg_ctrl_idx; | 49 | u32 reg_cntr_addr; |
50 | u32 reg_cntr_addr; | 50 | } cntr; |
51 | } cntr; | ||
52 | struct { | ||
53 | /* Todo */ | ||
54 | } pll; | ||
55 | }; | ||
56 | u32 scale; | 51 | u32 scale; |
57 | char name[24]; | 52 | char name[24]; |
58 | }; | 53 | }; |