diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-10-10 16:18:02 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-11 17:40:23 -0400 |
commit | ade9f5e03f1d0fd4987fc3f9fafb12e4118ac570 (patch) | |
tree | ee3a59682df9e0ed88bd7932bbe95f4ae0237536 /drivers/gpu | |
parent | 514c80d8d2d80cf9fa16447f7cd99d723ba5ce70 (diff) |
gpu: nvgpu: Remove phys_addr_t from common code
Remove phys_addr_t change for corresponding change in the nvgpu
main repo.
JIRA NVGPU-30
JIRA NVGPU-226
Change-Id: I05a19bc51e949279edef6e9ad7161226cbca51a7
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1576466
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/nvhost_t19x.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/fb_gv11b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/nvhost_t19x.h | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost_t19x.c b/drivers/gpu/nvgpu/common/linux/nvhost_t19x.c index 0b2ae08c..21cf62ec 100644 --- a/drivers/gpu/nvgpu/common/linux/nvhost_t19x.c +++ b/drivers/gpu/nvgpu/common/linux/nvhost_t19x.c | |||
@@ -23,11 +23,10 @@ | |||
23 | 23 | ||
24 | int nvgpu_nvhost_syncpt_unit_interface_get_aperture( | 24 | int nvgpu_nvhost_syncpt_unit_interface_get_aperture( |
25 | struct nvgpu_nvhost_dev *nvhost_dev, | 25 | struct nvgpu_nvhost_dev *nvhost_dev, |
26 | phys_addr_t *base, | 26 | u64 *base, size_t *size) |
27 | size_t *size) | ||
28 | { | 27 | { |
29 | return nvhost_syncpt_unit_interface_get_aperture( | 28 | return nvhost_syncpt_unit_interface_get_aperture( |
30 | nvhost_dev->host1x_pdev, base, size); | 29 | nvhost_dev->host1x_pdev, (phys_addr_t *)base, size); |
31 | } | 30 | } |
32 | 31 | ||
33 | u32 nvgpu_nvhost_syncpt_unit_interface_get_byte_offset(u32 syncpt_id) | 32 | u32 nvgpu_nvhost_syncpt_unit_interface_get_byte_offset(u32 syncpt_id) |
diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c index f47a2fac..9301ebc6 100644 --- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c | |||
@@ -108,7 +108,8 @@ void gv11b_fb_init_cbc(struct gk20a *g, struct gr_gk20a *gr) | |||
108 | u64 compbit_base_post_divide64; | 108 | u64 compbit_base_post_divide64; |
109 | 109 | ||
110 | if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) | 110 | if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) |
111 | compbit_store_iova = gk20a_mem_phys(&gr->compbit_store.mem); | 111 | compbit_store_iova = nvgpu_mem_get_phys_addr(g, |
112 | &gr->compbit_store.mem); | ||
112 | else | 113 | else |
113 | compbit_store_iova = nvgpu_mem_get_addr(g, | 114 | compbit_store_iova = nvgpu_mem_get_addr(g, |
114 | &gr->compbit_store.mem); | 115 | &gr->compbit_store.mem); |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvhost_t19x.h b/drivers/gpu/nvgpu/include/nvgpu/nvhost_t19x.h index fcf99778..4b499882 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvhost_t19x.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvhost_t19x.h | |||
@@ -24,12 +24,13 @@ | |||
24 | #define __NVGPU_NVHOST_T19X_H__ | 24 | #define __NVGPU_NVHOST_T19X_H__ |
25 | 25 | ||
26 | #ifdef CONFIG_TEGRA_GK20A_NVHOST | 26 | #ifdef CONFIG_TEGRA_GK20A_NVHOST |
27 | #include <nvgpu/types.h> | ||
28 | |||
27 | struct nvgpu_nvhost_dev; | 29 | struct nvgpu_nvhost_dev; |
28 | 30 | ||
29 | int nvgpu_nvhost_syncpt_unit_interface_get_aperture( | 31 | int nvgpu_nvhost_syncpt_unit_interface_get_aperture( |
30 | struct nvgpu_nvhost_dev *nvhost_dev, | 32 | struct nvgpu_nvhost_dev *nvhost_dev, |
31 | phys_addr_t *base, | 33 | u64 *base, size_t *size); |
32 | size_t *size); | ||
33 | u32 nvgpu_nvhost_syncpt_unit_interface_get_byte_offset(u32 syncpt_id); | 34 | u32 nvgpu_nvhost_syncpt_unit_interface_get_byte_offset(u32 syncpt_id); |
34 | 35 | ||
35 | #endif | 36 | #endif |