From efad6452f624108631da414a32f6906b8b8c0eb3 Mon Sep 17 00:00:00 2001 From: Kerwin Wan Date: Tue, 1 Apr 2014 18:57:10 +0800 Subject: gpu: nvgpu: handle error when gpu failed to unpowergate After flash, kernel needs to reboot after first boot. During reboot, devices is going to be shutdown including i2c. But sometimes gpu driver trys to open gpu sysfs nodes and unpowergate gpu at the same time. But i2c is already shutdown. tegra_unpowergate_partition returns error in this case but gk20a_tegra_unrailgate did not report the error so the error is not handled. Return proper value in gk20a_tegra_unrailgate to avoid this. Bug 1488409 Change-Id: I3470ad44a0047ae9b06f5907162ccf51795a5e04 Signed-off-by: Kerwin Wan Reviewed-on: http://git-master/r/390688 Reviewed-by: Bharat Nihalani GVS: Gerrit_Virtual_Submit Reviewed-by: Prashant Malani Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c index 35658f31..17126dc8 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c @@ -354,8 +354,9 @@ static int gk20a_tegra_railgate(struct platform_device *pdev) static int gk20a_tegra_unrailgate(struct platform_device *pdev) { - tegra_unpowergate_partition(TEGRA_POWERGATE_GPU); - return 0; + int ret; + ret = tegra_unpowergate_partition(TEGRA_POWERGATE_GPU); + return ret; } struct { -- cgit v1.2.2