diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-08-11 16:35:24 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-08-14 14:18:31 -0400 |
commit | 36f02cf49729b32aa241cb9f1f235749da681dd1 (patch) | |
tree | ac2569ec2c828489a56aedcf9c85cadcbc0dee62 /drivers/gpu/nvgpu/common | |
parent | 4412728b9606a2e2506961ed6e444a344af7ca29 (diff) |
gpu: nvgpu: Add struct gk20a ptr to FUSE APIs
Add a pointer to struct gk20a to the FUSE APIs. This helps
QNX builds avoid any static data definitions.
Also this change plumbs struct gk20a in some of the Linux clk
code and fixes a few minor style nits.
Change-Id: I27dfb2c4e9a352f784d6cead150460d8e9e808d3
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1537611
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sourab Gupta <sourabg@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/fuse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/fuse.c b/drivers/gpu/nvgpu/common/linux/fuse.c index 993cbc5a..27851f92 100644 --- a/drivers/gpu/nvgpu/common/linux/fuse.c +++ b/drivers/gpu/nvgpu/common/linux/fuse.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | #include <nvgpu/fuse.h> | 16 | #include <nvgpu/fuse.h> |
17 | 17 | ||
18 | int nvgpu_tegra_get_gpu_speedo_id(void) | 18 | int nvgpu_tegra_get_gpu_speedo_id(struct gk20a *g) |
19 | { | 19 | { |
20 | return tegra_sku_info.gpu_speedo_id; | 20 | return tegra_sku_info.gpu_speedo_id; |
21 | } | 21 | } |
@@ -24,32 +24,32 @@ int nvgpu_tegra_get_gpu_speedo_id(void) | |||
24 | * Use tegra_fuse_control_read/write() APIs for fuse offsets upto 0x100 | 24 | * Use tegra_fuse_control_read/write() APIs for fuse offsets upto 0x100 |
25 | * Use tegra_fuse_readl/writel() APIs for fuse offsets above 0x100 | 25 | * Use tegra_fuse_readl/writel() APIs for fuse offsets above 0x100 |
26 | */ | 26 | */ |
27 | void nvgpu_tegra_fuse_write_bypass(u32 val) | 27 | void nvgpu_tegra_fuse_write_bypass(struct gk20a *g, u32 val) |
28 | { | 28 | { |
29 | tegra_fuse_control_write(val, FUSE_FUSEBYPASS_0); | 29 | tegra_fuse_control_write(val, FUSE_FUSEBYPASS_0); |
30 | } | 30 | } |
31 | 31 | ||
32 | void nvgpu_tegra_fuse_write_access_sw(u32 val) | 32 | void nvgpu_tegra_fuse_write_access_sw(struct gk20a *g, u32 val) |
33 | { | 33 | { |
34 | tegra_fuse_control_write(val, FUSE_WRITE_ACCESS_SW_0); | 34 | tegra_fuse_control_write(val, FUSE_WRITE_ACCESS_SW_0); |
35 | } | 35 | } |
36 | 36 | ||
37 | void nvgpu_tegra_fuse_write_opt_gpu_tpc0_disable(u32 val) | 37 | void nvgpu_tegra_fuse_write_opt_gpu_tpc0_disable(struct gk20a *g, u32 val) |
38 | { | 38 | { |
39 | tegra_fuse_writel(val, FUSE_OPT_GPU_TPC0_DISABLE_0); | 39 | tegra_fuse_writel(val, FUSE_OPT_GPU_TPC0_DISABLE_0); |
40 | } | 40 | } |
41 | 41 | ||
42 | void nvgpu_tegra_fuse_write_opt_gpu_tpc1_disable(u32 val) | 42 | void nvgpu_tegra_fuse_write_opt_gpu_tpc1_disable(struct gk20a *g, u32 val) |
43 | { | 43 | { |
44 | tegra_fuse_writel(val, FUSE_OPT_GPU_TPC1_DISABLE_0); | 44 | tegra_fuse_writel(val, FUSE_OPT_GPU_TPC1_DISABLE_0); |
45 | } | 45 | } |
46 | 46 | ||
47 | int nvgpu_tegra_fuse_read_gcplex_config_fuse(u32 *val) | 47 | int nvgpu_tegra_fuse_read_gcplex_config_fuse(struct gk20a *g, u32 *val) |
48 | { | 48 | { |
49 | return tegra_fuse_readl(FUSE_GCPLEX_CONFIG_FUSE_0, val); | 49 | return tegra_fuse_readl(FUSE_GCPLEX_CONFIG_FUSE_0, val); |
50 | } | 50 | } |
51 | 51 | ||
52 | int nvgpu_tegra_fuse_read_reserved_calib(u32 *val) | 52 | int nvgpu_tegra_fuse_read_reserved_calib(struct gk20a *g, u32 *val) |
53 | { | 53 | { |
54 | return tegra_fuse_readl(FUSE_RESERVED_CALIB0_0, val); | 54 | return tegra_fuse_readl(FUSE_RESERVED_CALIB0_0, val); |
55 | } | 55 | } |