diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-06-02 06:14:59 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-06 11:13:43 -0400 |
commit | d4fcf90047fcf5f576801b8c1cfbca5b9ac44844 (patch) | |
tree | 76b4c64ddddbbd711627e30a342964ea71ae5bdf | |
parent | 345fc00445f83f9a08bc364f9cb242bca29e3870 (diff) |
gpu: nvgpu: fix recursive include from clk.h
Fix recursion in header include sequence :
gk20a.h -> clk.h -> gk20a.h
by removing gk20a.h include from clk/clk.h
Fix the compile time error by forward declaring
struct gk20a
Coverity id : 2567917
Bug 200291879
Change-Id: I8fc3a8787dae91ae1a070c63bae6550596734603
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/1495904
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk.h b/drivers/gpu/nvgpu/clk/clk.h index b173a09e..0dd7bf77 100644 --- a/drivers/gpu/nvgpu/clk/clk.h +++ b/drivers/gpu/nvgpu/clk/clk.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * general clock structures & definitions | 2 | * general clock structures & definitions |
3 | * | 3 | * |
4 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -22,12 +22,13 @@ | |||
22 | #include "clk_vf_point.h" | 22 | #include "clk_vf_point.h" |
23 | #include "clk_mclk.h" | 23 | #include "clk_mclk.h" |
24 | #include "clk_freq_controller.h" | 24 | #include "clk_freq_controller.h" |
25 | #include "gk20a/gk20a.h" | ||
26 | 25 | ||
27 | #define NV_PERF_DOMAIN_4X_CLOCK_DOMAIN_SKIP 0x10 | 26 | #define NV_PERF_DOMAIN_4X_CLOCK_DOMAIN_SKIP 0x10 |
28 | #define NV_PERF_DOMAIN_4X_CLOCK_DOMAIN_MASK 0x1F | 27 | #define NV_PERF_DOMAIN_4X_CLOCK_DOMAIN_MASK 0x1F |
29 | #define NV_PERF_DOMAIN_4X_CLOCK_DOMAIN_SHIFT 0 | 28 | #define NV_PERF_DOMAIN_4X_CLOCK_DOMAIN_SHIFT 0 |
30 | 29 | ||
30 | struct gk20a; | ||
31 | |||
31 | /* clock related defines for GPUs supporting clock control from pmu*/ | 32 | /* clock related defines for GPUs supporting clock control from pmu*/ |
32 | struct clk_pmupstate { | 33 | struct clk_pmupstate { |
33 | struct avfsvinobjs avfs_vinobjs; | 34 | struct avfsvinobjs avfs_vinobjs; |