From c84ddceda648d6e47828115654ca7745010ec09f Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Thu, 14 Apr 2016 13:01:58 -0700 Subject: gpu: nvgpu: gv11b: sm priv reg related changes Included all basic ops for gv11b and updated sm related functions to include new priv register addresses. Bug 1735757 Change-Id: Ie48651f918ee97fba00487111e4b28d6c95747f5 Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/1126961 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h (limited to 'drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h') diff --git a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h new file mode 100644 index 00000000..e889e9ab --- /dev/null +++ b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h @@ -0,0 +1,28 @@ +/* + * GV11B Graphics Context + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#ifndef __GR_CTX_GV11B_H__ +#define __GR_CTX_GV11B_H__ + +#include "gk20a/gr_ctx_gk20a.h" + +/* production netlist, one and only one from below */ +#define GV11B_NETLIST_IMAGE_FW_NAME GK20A_NETLIST_IMAGE_A + +void gv11b_init_gr_ctx(struct gpu_ops *gops); + +#endif /*__GR_CTX_GV11B_H__*/ -- cgit v1.2.2 From da02ea50f0704ad0836177c315c9ff87288f0969 Mon Sep 17 00:00:00 2001 From: seshendra Gadagottu Date: Thu, 18 May 2017 14:15:45 -0700 Subject: gpu: nvgpu: gv11b: Don't set net name for pri-silicon In pri-silicon environment netlist names keep on changing. So to keep software backward compatible. do not set net name. So driver will check available firmwares and will pick-up the firmware that matches with current hw netlist major revision. Change-Id: I6083879fb67481be03bad1eaf6a10d0cb6eb7c09 Signed-off-by: seshendra Gadagottu Reviewed-on: http://git-master/r/1485135 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h') diff --git a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h index e889e9ab..0a046eb4 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h @@ -1,7 +1,7 @@ /* * GV11B Graphics Context * - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016 - 2017, 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, @@ -21,8 +21,10 @@ #include "gk20a/gr_ctx_gk20a.h" /* production netlist, one and only one from below */ -#define GV11B_NETLIST_IMAGE_FW_NAME GK20A_NETLIST_IMAGE_A - +/* + * Define netlist for silicon only + * #define GV11B_NETLIST_IMAGE_FW_NAME GK20A_NETLIST_IMAGE_A +*/ void gv11b_init_gr_ctx(struct gpu_ops *gops); #endif /*__GR_CTX_GV11B_H__*/ -- cgit v1.2.2 From afa29933e45b2c3054db67065a0a68606bbc1f52 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Wed, 26 Jul 2017 10:45:38 -0700 Subject: gpu: nvgpu: gv11b: Reorg gr_ctx HAL initialization Reorganize HAL initialization to remove inheritance and construct the gpu_ops struct at compile time. This patch only covers the gr_ctx sub-module of the gpu_ops struct. Perform HAL function assignments in hal_gxxxx.c through the population of a chip-specific copy of gpu_ops. Jira NVGPU-74 Change-Id: Icc6b0f968f2e3209de190d445c878a4b20bfcf4a Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1527418 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h') diff --git a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h index 0a046eb4..8feb15fd 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h @@ -25,6 +25,7 @@ * Define netlist for silicon only * #define GV11B_NETLIST_IMAGE_FW_NAME GK20A_NETLIST_IMAGE_A */ -void gv11b_init_gr_ctx(struct gpu_ops *gops); +int gr_gv11b_get_netlist_name(struct gk20a *g, int index, char *name); +bool gr_gv11b_is_firmware_defined(void); #endif /*__GR_CTX_GV11B_H__*/ -- 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/gv11b/gr_ctx_gv11b.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h') diff --git a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h index 8feb15fd..679403ef 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h @@ -3,17 +3,23 @@ * * Copyright (c) 2016 - 2017, 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. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * 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 __GR_CTX_GV11B_H__ #define __GR_CTX_GV11B_H__ -- cgit v1.2.2 From b8e57243999902ac87c024a1e41abb5fa02cf22a Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Mon, 13 Nov 2017 12:05:34 -0800 Subject: gpu: nvgpu: gv11b: define final netlist Use NETD firmware on gv11b. GV11B_NETLIST_IMAGE_FW_NAME set to GK20A_NETLIST_IMAGE_D Change-Id: I0301999851ffb14713beaf61b5b2cc97efac74eb Signed-off-by: Seema Khowala Reviewed-on: https://git-master.nvidia.com/r/1597290 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: Seshendra Gadagottu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h') diff --git a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h index 679403ef..0a95ab11 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/gr_ctx_gv11b.h @@ -26,11 +26,10 @@ #include "gk20a/gr_ctx_gk20a.h" -/* production netlist, one and only one from below */ -/* - * Define netlist for silicon only - * #define GV11B_NETLIST_IMAGE_FW_NAME GK20A_NETLIST_IMAGE_A -*/ +/* Define netlist for silicon only */ + +#define GV11B_NETLIST_IMAGE_FW_NAME GK20A_NETLIST_IMAGE_D + int gr_gv11b_get_netlist_name(struct gk20a *g, int index, char *name); bool gr_gv11b_is_firmware_defined(void); -- cgit v1.2.2