From 8c6a9fd1151299697037d58f33cfa306d8ac5d87 Mon Sep 17 00:00:00 2001 From: Sam Payne Date: Fri, 31 Oct 2014 14:27:33 -0700 Subject: Revert "gpu: nvgpu: GR and LTC HAL to use const structs" This reverts commit 41b82e97164138f45fbdaef6ab6939d82ca9419e. Change-Id: Iabd01fcb124e0d22cd9be62151a6552cbb27fc94 Signed-off-by: Sam Payne Reviewed-on: http://git-master/r/592221 Tested-by: Hoang Pham GVS: Gerrit_Virtual_Submit Reviewed-by: Mitch Luban --- drivers/gpu/nvgpu/gk20a/hal.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/hal.c') diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index 84b8d819..8d1a29dd 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c @@ -20,13 +20,13 @@ int gpu_init_hal(struct gk20a *g) { u32 ver = g->gpu_characteristics.arch + g->gpu_characteristics.impl; - gk20a_dbg_fn("ver=0x%x", ver); switch (ver) { - case NVGPU_GPUID_GK20A: - if (gk20a_init_hal(&g->ops)) - return -ENODEV; + case GK20A_GPUID_GK20A: + gk20a_dbg_info("gk20a detected"); + gk20a_init_hal(&g->ops); break; - case NVGPU_GPUID_GM20B: + case GK20A_GPUID_GM20B: + gk20a_dbg_info("gm20b detected"); if (gm20b_init_hal(&g->ops)) return -ENODEV; break; -- cgit v1.2.2