From bd47d00ce736a421a3b4376ad996fdc877ccf0ca Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Thu, 30 Aug 2018 14:34:52 -0700 Subject: gpu: nvgpu: Add a macro of totalram_size_in_mb There are two (would be more) places calculating the ram size in MB from page numbers, so this patch just simply adds a macro for simplification. Bug 2327574 Bug 2284925 Change-Id: Ie5dc387d547e1b8ce98946f0637dc17a6897e5a6 Signed-off-by: Nicolin Chen Reviewed-on: https://git-master.nvidia.com/r/1810333 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/os/linux/driver_common.c | 3 +-- drivers/gpu/nvgpu/os/linux/os_linux.h | 2 ++ drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/os/linux/driver_common.c b/drivers/gpu/nvgpu/os/linux/driver_common.c index b81cc90c..4d345aaa 100644 --- a/drivers/gpu/nvgpu/os/linux/driver_common.c +++ b/drivers/gpu/nvgpu/os/linux/driver_common.c @@ -98,8 +98,7 @@ static void nvgpu_init_gr_vars(struct gk20a *g) gk20a_init_gr(g); nvgpu_log_info(g, "total ram pages : %lu", totalram_pages); - g->gr.max_comptag_mem = totalram_pages - >> (10 - (PAGE_SHIFT - 10)); + g->gr.max_comptag_mem = totalram_size_in_mb; /* Deduct the part taken by the running system */ if (platform->comptag_mem_deduct && diff --git a/drivers/gpu/nvgpu/os/linux/os_linux.h b/drivers/gpu/nvgpu/os/linux/os_linux.h index 13c20a81..5f35db09 100644 --- a/drivers/gpu/nvgpu/os/linux/os_linux.h +++ b/drivers/gpu/nvgpu/os/linux/os_linux.h @@ -165,4 +165,6 @@ static inline struct device *dev_from_gk20a(struct gk20a *g) #define INTERFACE_NAME "nvhost%s-gpu" +#define totalram_size_in_mb (totalram_pages >> (10 - (PAGE_SHIFT - 10))) + #endif diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c index 83191316..33c067c6 100644 --- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c +++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c @@ -439,8 +439,7 @@ int vgpu_probe(struct platform_device *pdev) gk20a_init_gr(gk20a); nvgpu_log_info(gk20a, "total ram pages : %lu", totalram_pages); - gk20a->gr.max_comptag_mem = totalram_pages - >> (10 - (PAGE_SHIFT - 10)); + gk20a->gr.max_comptag_mem = totalram_size_in_mb; nvgpu_ref_init(&gk20a->refcount); -- cgit v1.2.2