From 55a5c57bc1fd532cc6d041fdfb70d90286894b35 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Thu, 7 Apr 2016 16:57:18 -0700 Subject: gpu: nvgpu: gv11b: added initial source code Bug 1735757 Change-Id: Iea7488551a437afa0dfc005c87ad1b9ab9673b6c Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/1122123 GVS: Gerrit_Virtual_Submit Reviewed-by: Ken Adams --- drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h (limited to 'drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h') diff --git a/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h b/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h new file mode 100644 index 00000000..d376f3dd --- /dev/null +++ b/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h @@ -0,0 +1,32 @@ +/* + * NVIDIA GPU ID functions, definitions. + * + * Copyright (c) 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, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + */ +#ifndef _NVGPU_GPUID_T19X_H_ +#define _NVGPU_GPUID_T19X_H_ + +#define NVGPU_GPUID_GV11B \ + GK20A_GPUID(NVGPU_GPU_ARCH_GV110, NVGPU_GPU_IMPL_GV11B) + +#define NVGPU_COMPAT_TEGRA_GV11B "nvidia,g11b" +#define NVGPU_COMPAT_GENERIC_GV11B "nvidia,generic-gv11b" + +#define TEGRA_19x_GPUID NVGPU_GPUID_GV11B +#define TEGRA_19x_GPUID_HAL gv11b_init_hal +#define TEGRA_19x_GPU_COMPAT_TEGRA NVGPU_COMPAT_TEGRA_GV11B +#define TEGRA_19x_GPU_COMPAT_GENERIC NVGPU_COMPAT_GENERIC_GV11B +struct gpu_ops; +extern int gv11b_init_hal(struct gk20a *); +extern struct gk20a_platform t19x_gpu_tegra_platform; + +#endif -- cgit v1.2.2 From 4f9b90da4cf62c7aa9884fcbe7184e44571a8008 Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Wed, 29 Jun 2016 14:09:33 -0700 Subject: gpu: nvgpu: gv11b: update NVGPU_COMPAT_TEGRA_GV11B Bug 1735760 Change-Id: I16acfe7f911fdfdd7c2a1715fecb22b9689a0796 Signed-off-by: Seema Khowala Reviewed-on: http://git-master/r/1173333 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Seshendra Gadagottu Tested-by: Seshendra Gadagottu Reviewed-by: Adeel Raza --- drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h') diff --git a/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h b/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h index d376f3dd..63901445 100644 --- a/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h +++ b/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h @@ -18,7 +18,7 @@ #define NVGPU_GPUID_GV11B \ GK20A_GPUID(NVGPU_GPU_ARCH_GV110, NVGPU_GPU_IMPL_GV11B) -#define NVGPU_COMPAT_TEGRA_GV11B "nvidia,g11b" +#define NVGPU_COMPAT_TEGRA_GV11B "nvidia,gv11b" #define NVGPU_COMPAT_GENERIC_GV11B "nvidia,generic-gv11b" #define TEGRA_19x_GPUID NVGPU_GPUID_GV11B -- cgit v1.2.2 From de8e057f7eebcfe676278826ab457bf86b1b36fd Mon Sep 17 00:00:00 2001 From: David Nieto Date: Thu, 3 Aug 2017 21:43:50 -0700 Subject: gpu: nvgpu: GV100 support Adds support of GV100 up to devinit. JIRA: EVLR-1693 Change-Id: Ic7aa5f1c20714e05954139f143abb6a3459858fc Signed-off-by: David Nieto Reviewed-on: https://git-master.nvidia.com/r/1532747 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h') diff --git a/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h b/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h index 63901445..71841484 100644 --- a/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h +++ b/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h @@ -17,16 +17,25 @@ #define NVGPU_GPUID_GV11B \ GK20A_GPUID(NVGPU_GPU_ARCH_GV110, NVGPU_GPU_IMPL_GV11B) +#define NVGPU_GPUID_GV100 \ + GK20A_GPUID(NVGPU_GPU_ARCH_GV100, NVGPU_GPU_IMPL_GV100) + #define NVGPU_COMPAT_TEGRA_GV11B "nvidia,gv11b" #define NVGPU_COMPAT_GENERIC_GV11B "nvidia,generic-gv11b" + #define TEGRA_19x_GPUID NVGPU_GPUID_GV11B #define TEGRA_19x_GPUID_HAL gv11b_init_hal #define TEGRA_19x_GPU_COMPAT_TEGRA NVGPU_COMPAT_TEGRA_GV11B #define TEGRA_19x_GPU_COMPAT_GENERIC NVGPU_COMPAT_GENERIC_GV11B + +#define BIGGPU_19x_GPUID NVGPU_GPUID_GV100 +#define BIGGPU_19x_GPUID_HAL gv100_init_hal + struct gpu_ops; extern int gv11b_init_hal(struct gk20a *); +extern int gv100_init_hal(struct gk20a *); extern struct gk20a_platform t19x_gpu_tegra_platform; #endif -- cgit v1.2.2 From d61643c0200983dc340d37962bb0a3ca900a3e97 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 25 Sep 2017 08:59:28 -0700 Subject: gpu: nvgpu: gv11b: Change license for common files to MIT Change license of OS independent source code files to MIT. JIRA NVGPU-218 Change-Id: I93c0504f0544ee8ced4898c386b3f5fbaa6a99a9 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1567804 Reviewed-by: svc-mobile-coverity Reviewed-by: David Martinez Nieto Reviewed-by: Seshendra Gadagottu Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h') diff --git a/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h b/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h index 71841484..58f4fad1 100644 --- a/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h +++ b/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h @@ -3,14 +3,23 @@ * * Copyright (c) 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, - * version 2, as published by the Free Software Foundation. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ #ifndef _NVGPU_GPUID_T19X_H_ #define _NVGPU_GPUID_T19X_H_ -- cgit v1.2.2 From cfba56d20e27cdc591f8a89236dd1423b12754d3 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 27 Oct 2017 15:48:05 -0700 Subject: gpu: nvpgu: Define GPUIDs without referring to UAPI Define GPUIDs without referring to constants defined in . JIRA NVGPU-259 Change-Id: I719ed5dd7e03c98f556d7932df132d9a39f25a9d Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1587282 Reviewed-by: Seshendra Gadagottu GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h') diff --git a/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h b/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h index 58f4fad1..8689a535 100644 --- a/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h +++ b/drivers/gpu/nvgpu/nvgpu_gpuid_t19x.h @@ -24,11 +24,8 @@ #ifndef _NVGPU_GPUID_T19X_H_ #define _NVGPU_GPUID_T19X_H_ -#define NVGPU_GPUID_GV11B \ - GK20A_GPUID(NVGPU_GPU_ARCH_GV110, NVGPU_GPU_IMPL_GV11B) -#define NVGPU_GPUID_GV100 \ - GK20A_GPUID(NVGPU_GPU_ARCH_GV100, NVGPU_GPU_IMPL_GV100) - +#define NVGPU_GPUID_GV11B 0x0000015B +#define NVGPU_GPUID_GV100 0x00000140 #define NVGPU_COMPAT_TEGRA_GV11B "nvidia,gv11b" #define NVGPU_COMPAT_GENERIC_GV11B "nvidia,generic-gv11b" -- cgit v1.2.2