diff options
author | Scott Williams <scwilliams@nvidia.com> | 2011-04-12 17:47:52 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:45:00 -0800 |
commit | 179961e8fe89510a2cf52ea20c0a9f891234ae14 (patch) | |
tree | d72df8ead11ff36910828df1c48c0924a7aa700e /drivers/video/tegra/host | |
parent | cff63fd236077b13cf3534c94d5adac491ed5fe7 (diff) |
ARM: tegra: Use proper type for physical addresses
Original-Change-Id: I158d2be97c795313e7e74ce9fb4ec0bdc7d95496
Reviewed-on: http://git-master/r/27559
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Hiro Sugawara <hsugawara@nvidia.com>
Reviewed-by: Jin Qian <jqian@nvidia.com>
Reviewed-by: Kaz Fukuoka <kfukuoka@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Original-Change-Id: I0ff198daa548ed2837f7fb1794013bf0adf7e5a1
Rebase-Id: R83df5f3b5104183bfe774d8eed8ce94427c9b7fc
Diffstat (limited to 'drivers/video/tegra/host')
-rw-r--r-- | drivers/video/tegra/host/debug.c | 12 | ||||
-rw-r--r-- | drivers/video/tegra/host/nvhost_3dctx.c | 2 | ||||
-rw-r--r-- | drivers/video/tegra/host/nvhost_hwctx.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/tegra/host/debug.c b/drivers/video/tegra/host/debug.c index 28dc52f75212..c7c6a0c19f03 100644 --- a/drivers/video/tegra/host/debug.c +++ b/drivers/video/tegra/host/debug.c @@ -123,7 +123,7 @@ static int show_channel_command(struct output *o, u32 val, int *count) } } -static void show_channel_gather(struct output *o, u32 phys_addr, +static void show_channel_gather(struct output *o, phys_addr_t phys_addr, u32 words); static void show_channel_word(struct output *o, int *state, int *count, @@ -162,13 +162,13 @@ static void show_channel_word(struct output *o, int *state, int *count, * TODO: This uses ioremap_xxx on memory which is deprecated. * Also, it won't work properly with SMMU. */ -static void show_channel_gather(struct output *o, u32 phys_addr, +static void show_channel_gather(struct output *o, phys_addr_t phys_addr, u32 words) { - u32 map_base = phys_addr & PAGE_MASK; - u32 map_end = (phys_addr + words * 4 + PAGE_SIZE - 1) & PAGE_MASK; - u32 map_size = map_end - map_base; - u32 map_offset = phys_addr - map_base; + phys_addr_t map_base = phys_addr & PAGE_MASK; + phys_addr_t map_end = (phys_addr + words * 4 + PAGE_SIZE - 1) & PAGE_MASK; + phys_addr_t map_size = map_end - map_base; + phys_addr_t map_offset = phys_addr - map_base; void *map_addr = ioremap_nocache(map_base, map_size); int state = NVHOST_DBG_STATE_CMD; int count, i; diff --git a/drivers/video/tegra/host/nvhost_3dctx.c b/drivers/video/tegra/host/nvhost_3dctx.c index 31d57bbdd13d..62caea51cf37 100644 --- a/drivers/video/tegra/host/nvhost_3dctx.c +++ b/drivers/video/tegra/host/nvhost_3dctx.c @@ -208,7 +208,7 @@ static void setup_restore_v0(u32 *ptr) /* the same context save command sequence is used for all contexts. */ static struct nvmap_handle_ref *save_buf = NULL; -static u32 save_phys = 0; +static phys_addr_t save_phys = 0; static unsigned int save_size = 0; static unsigned int save_incrs = 0; static unsigned int save_thresh = 0; diff --git a/drivers/video/tegra/host/nvhost_hwctx.h b/drivers/video/tegra/host/nvhost_hwctx.h index ec0c9555d29d..67c3c7f8d0ce 100644 --- a/drivers/video/tegra/host/nvhost_hwctx.h +++ b/drivers/video/tegra/host/nvhost_hwctx.h @@ -3,7 +3,7 @@ * * Tegra Graphics Host Hardware Context Interface * - * Copyright (c) 2010, NVIDIA Corporation. + * Copyright (c) 2010-2011, NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,7 +44,7 @@ struct nvhost_hwctx { struct nvmap_handle_ref *restore; u32 *restore_virt; - u32 restore_phys; + phys_addr_t restore_phys; u32 restore_size; u32 restore_incrs; }; |