diff options
author | Sam Payne <spayne@nvidia.com> | 2014-10-31 17:27:33 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:11:56 -0400 |
commit | 8c6a9fd1151299697037d58f33cfa306d8ac5d87 (patch) | |
tree | 9bb909474f12565e7f61251b8b80f300030bde52 /drivers/gpu/nvgpu/vgpu/vgpu.c | |
parent | 4f6dddcf78233b9939ee32c6f09519f27c3b8fb4 (diff) |
Revert "gpu: nvgpu: GR and LTC HAL to use const structs"
This reverts commit 41b82e97164138f45fbdaef6ab6939d82ca9419e.
Change-Id: Iabd01fcb124e0d22cd9be62151a6552cbb27fc94
Signed-off-by: Sam Payne <spayne@nvidia.com>
Reviewed-on: http://git-master/r/592221
Tested-by: Hoang Pham <hopham@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Mitch Luban <mluban@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/vgpu.c')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 11fa73c5..84fd6d18 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include "gk20a/debug_gk20a.h" | 21 | #include "gk20a/debug_gk20a.h" |
22 | #include "gk20a/hal_gk20a.h" | 22 | #include "gk20a/hal_gk20a.h" |
23 | #include "gk20a/hw_mc_gk20a.h" | 23 | #include "gk20a/hw_mc_gk20a.h" |
24 | #include "nvgpu_gpuid.h" | ||
25 | 24 | ||
26 | static inline int vgpu_comm_init(struct platform_device *pdev) | 25 | static inline int vgpu_comm_init(struct platform_device *pdev) |
27 | { | 26 | { |
@@ -240,7 +239,7 @@ static int vgpu_init_hal(struct gk20a *g) | |||
240 | u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; | 239 | u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; |
241 | 240 | ||
242 | switch (ver) { | 241 | switch (ver) { |
243 | case NVGPU_GPUID_GK20A: | 242 | case GK20A_GPUID_GK20A: |
244 | gk20a_dbg_info("gk20a detected"); | 243 | gk20a_dbg_info("gk20a detected"); |
245 | /* init gk20a ops then override with virt extensions */ | 244 | /* init gk20a ops then override with virt extensions */ |
246 | gk20a_init_hal(&g->ops); | 245 | gk20a_init_hal(&g->ops); |