From 6a58857b6517607b888090e6b87f3302ea8b2e97 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 8 Feb 2017 14:11:17 -0800 Subject: gpu: nvgpu: Remove almost all gm204/gm206 support Remove gm204/gm206 support. It was used only in the interim until Pascal cards were available, and we don't maintain that code anymore. This patch leaves only BIOS code. Change-Id: I215988603d4588ef710bdda6e47449e9235e78ac Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1302224 GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gk20a/gk20a.h | 6 ------ drivers/gpu/nvgpu/gk20a/hal.c | 7 ------- drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 4 ---- 3 files changed, 17 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index b796b2cc..196af3c1 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -1357,12 +1357,6 @@ int gk20a_wait_for_idle(struct device *dev); #define GK20A_GPUID_GM20B \ GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B) -#define GK20A_GPUID_GM204 \ - GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM204) - -#define GK20A_GPUID_GM206 \ - GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM206) - int gk20a_init_gpu_characteristics(struct gk20a *g); void gk20a_pbus_isr(struct gk20a *g); diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c index b45b934c..d4bd0ddc 100644 --- a/drivers/gpu/nvgpu/gk20a/hal.c +++ b/drivers/gpu/nvgpu/gk20a/hal.c @@ -16,7 +16,6 @@ #include "gk20a.h" #include "hal_gk20a.h" #include "gm20b/hal_gm20b.h" -#include "gm206/hal_gm206.h" #ifdef CONFIG_ARCH_TEGRA_18x_SOC #include "nvgpu_gpuid_t18x.h" @@ -39,12 +38,6 @@ int gpu_init_hal(struct gk20a *g) if (gm20b_init_hal(g)) return -ENODEV; break; - case GK20A_GPUID_GM204: - case GK20A_GPUID_GM206: - gk20a_dbg_info("gm20x detected"); - if (gm206_init_hal(g)) - return -ENODEV; - break; #if defined(CONFIG_ARCH_TEGRA_18x_SOC) case TEGRA_18x_GPUID: if (TEGRA_18x_GPUID_HAL(g)) diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index d53cf09b..6227d523 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c @@ -3719,10 +3719,6 @@ static u8 get_perfmon_id(struct pmu_gk20a *pmu) unit_id = PMU_UNIT_PERFMON_T18X; break; #endif - case GK20A_GPUID_GM206: - case GK20A_GPUID_GM204: - unit_id = PMU_UNIT_PERFMON_T18X; - break; default: gk20a_err(g->dev, "no support for %x", ver); BUG(); -- cgit v1.2.2