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>

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 @@
 
 int nvgpu_nvhost_syncpt_unit_interface_get_aperture(
                 struct nvgpu_nvhost_dev *nvhost_dev,
-                phys_addr_t *base,
-                size_t *size)
+                u64 *base, size_t *size)
 {
         return nvhost_syncpt_unit_interface_get_aperture(
-                        nvhost_dev->host1x_pdev, base, size);
+                nvhost_dev->host1x_pdev, (phys_addr_t *)base, size);
 }
 
 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)
         u64 compbit_base_post_divide64;
 
         if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL))
-                compbit_store_iova = gk20a_mem_phys(&gr->compbit_store.mem);
+                compbit_store_iova = nvgpu_mem_get_phys_addr(g,
+                                                        &gr->compbit_store.mem);
         else
                 compbit_store_iova = nvgpu_mem_get_addr(g,
                                                         &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 @@
 #define __NVGPU_NVHOST_T19X_H__
 
 #ifdef CONFIG_TEGRA_GK20A_NVHOST
+#include <nvgpu/types.h>
+
 struct nvgpu_nvhost_dev;
 
 int nvgpu_nvhost_syncpt_unit_interface_get_aperture(
                 struct nvgpu_nvhost_dev *nvhost_dev,
-                phys_addr_t *base,
-                size_t *size);
+                u64 *base, size_t *size);
 u32 nvgpu_nvhost_syncpt_unit_interface_get_byte_offset(u32 syncpt_id);
 
 #endif