From 3d0f9a751784ac9eb27f9f989f3b584ff5dc8f17 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 23 Mar 2016 08:41:04 -0700 Subject: gpu: nvgpu: Add support for gp104 and gp106 Add support for chips gp104 and gp106. Change-Id: Ied5f239bdd0ec85245bce1fb6ef51330871d0f05 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1120465 GVS: Gerrit_Virtual_Submit Reviewed-by: Ken Adams --- drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h') diff --git a/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h b/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h index 96f02125..84da4b96 100644 --- a/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h +++ b/drivers/gpu/nvgpu/nvgpu_gpuid_t18x.h @@ -1,7 +1,7 @@ /* * NVIDIA GPU ID functions, definitions. * - * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -17,6 +17,10 @@ #define NVGPU_GPUID_GP10B \ GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP10B) +#define NVGPU_GPUID_GP104 \ + GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP104) +#define NVGPU_GPUID_GP106 \ + GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP106) #define NVGPU_COMPAT_TEGRA_GP10B "nvidia,tegra186-gp10b" #define NVGPU_COMPAT_GENERIC_GP10B "nvidia,generic-gp10b" @@ -25,8 +29,13 @@ #define TEGRA_18x_GPUID_HAL gp10b_init_hal #define TEGRA_18x_GPU_COMPAT_TEGRA NVGPU_COMPAT_TEGRA_GP10B #define TEGRA_18x_GPU_COMPAT_GENERIC NVGPU_COMPAT_GENERIC_GP10B +#define TEGRA_18x_GPUID2 NVGPU_GPUID_GP104 +#define TEGRA_18x_GPUID2_HAL gp106_init_hal +#define TEGRA_18x_GPUID3 NVGPU_GPUID_GP106 +#define TEGRA_18x_GPUID3_HAL gp106_init_hal struct gpu_ops; extern int gp10b_init_hal(struct gk20a *); +extern int gp106_init_hal(struct gk20a *); extern struct gk20a_platform t18x_gpu_tegra_platform; #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION -- cgit v1.2.2