From 8a39b8c8ad0df24e24fa46021f0167bb71fcdbb6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Mon, 27 Jun 2011 13:14:38 +0800 Subject: [PATCH] rk29: vivante: fix computation of resource size for 1G memory --- .../rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c index 6a45a9daa1e7..23e98d4ac297 100755 --- a/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c +++ b/drivers/staging/rk29/vivante/hal/os/linux/kernel/gc_hal_kernel_driver.c @@ -1057,8 +1057,7 @@ static int __devinit gpu_probe(struct platform_device *pdev) goto gpu_probe_fail; } registerMemBase = res->start; - // dkm: ²»ÄÜ+1 - registerMemSize = res->end - res->start; + registerMemSize = res->end - res->start + ((res->end & 1) ? 1 : 0); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gpu_mem"); if (!res) { @@ -1066,8 +1065,7 @@ static int __devinit gpu_probe(struct platform_device *pdev) goto gpu_probe_fail; } contiguousBase = res->start; - // dkm: ²»ÄÜ+1 - contiguousSize = res->end - res->start; + contiguousSize = res->end - res->start + ((res->end & 1) ? 1 : 0); res = platform_get_resource_byname(pdev, IORESOURCE_IO, "gpu_clk"); if (!res) { -- 2.34.1