summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSeema Khowala <seemaj@nvidia.com>2017-01-12 12:52:28 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-01-24 17:05:54 -0500
commit16bf1e941699c70240d87143e6ee923e32c7b4a0 (patch)
tree088c5b4d847d6cd52bfedc3957e618c89ff41caf /drivers
parenta86122e01a3b27652f2dea8cbdadd47ed6b3d216 (diff)
gpu: nvgpu: Add null check for g->host1x_dev
gk20a_tegra_dump_debug() is set in a platform where host1x support is not enabled. Change-Id: Ic57f9081d75be976a092827b253cb2a195d8f16d Signed-off-by: Seema Khowala <seemaj@nvidia.com> Reviewed-on: http://git-master/r/1284336 Reviewed-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
index f61b14fa..87c678ea 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * GK20A Tegra Platform Interface 2 * GK20A Tegra Platform Interface
3 * 3 *
4 * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. 4 * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify it 6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License, 7 * under the terms and conditions of the GNU General Public License,
@@ -766,7 +766,9 @@ void gk20a_tegra_debug_dump(struct device *dev)
766{ 766{
767 struct gk20a_platform *platform = gk20a_get_platform(dev); 767 struct gk20a_platform *platform = gk20a_get_platform(dev);
768 struct gk20a *g = platform->g; 768 struct gk20a *g = platform->g;
769 nvhost_debug_dump_device(g->host1x_dev); 769
770 if (g->host1x_dev)
771 nvhost_debug_dump_device(g->host1x_dev);
770} 772}
771 773
772int gk20a_tegra_busy(struct device *dev) 774int gk20a_tegra_busy(struct device *dev)