diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index c967b69b..b4886e31 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GK20A Graphics | 2 | * GK20A Graphics |
3 | * | 3 | * |
4 | * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2011-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -48,10 +48,6 @@ | |||
48 | #include "bus_gk20a.h" | 48 | #include "bus_gk20a.h" |
49 | #include "pstate/pstate.h" | 49 | #include "pstate/pstate.h" |
50 | 50 | ||
51 | #ifdef CONFIG_TEGRA_19x_GPU | ||
52 | #include "nvgpu_gpuid_t19x.h" | ||
53 | #endif | ||
54 | |||
55 | void __nvgpu_check_gpu_state(struct gk20a *g) | 51 | void __nvgpu_check_gpu_state(struct gk20a *g) |
56 | { | 52 | { |
57 | u32 boot_0 = 0xffffffff; | 53 | u32 boot_0 = 0xffffffff; |
@@ -127,7 +123,7 @@ int gk20a_prepare_poweroff(struct gk20a *g) | |||
127 | int gk20a_finalize_poweron(struct gk20a *g) | 123 | int gk20a_finalize_poweron(struct gk20a *g) |
128 | { | 124 | { |
129 | int err; | 125 | int err; |
130 | #if defined(CONFIG_TEGRA_GK20A_NVHOST) && defined(CONFIG_TEGRA_19x_GPU) | 126 | #if defined(CONFIG_TEGRA_GK20A_NVHOST) |
131 | u32 nr_pages; | 127 | u32 nr_pages; |
132 | #endif | 128 | #endif |
133 | 129 | ||
@@ -319,7 +315,7 @@ int gk20a_finalize_poweron(struct gk20a *g) | |||
319 | } | 315 | } |
320 | } | 316 | } |
321 | 317 | ||
322 | #if defined(CONFIG_TEGRA_GK20A_NVHOST) && defined(CONFIG_TEGRA_19x_GPU) | 318 | #if defined(CONFIG_TEGRA_GK20A_NVHOST) |
323 | if (gk20a_platform_has_syncpoints(g) && g->syncpt_unit_size) { | 319 | if (gk20a_platform_has_syncpoints(g) && g->syncpt_unit_size) { |
324 | if (!nvgpu_mem_is_valid(&g->syncpt_mem)) { | 320 | if (!nvgpu_mem_is_valid(&g->syncpt_mem)) { |
325 | nr_pages = DIV_ROUND_UP(g->syncpt_unit_size, PAGE_SIZE); | 321 | nr_pages = DIV_ROUND_UP(g->syncpt_unit_size, PAGE_SIZE); |