nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Move gk20a_scale to be Linux only

Browse Source 
Move gk20a_scale.[ch] to be common/linux/scale.[ch]. The code is
Linux specific, and only referred from Linux specific source files.

Change the license back to GPL.

JIRA NVGPU-259

Change-Id: I89fa905a1fea4f93c826ddfe2ffce34aefc1b0a2
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1588650
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Terje Bergstrom
2017-10-30 12:52:52 -07:00
committed by mobile promotions
parent 964a849d61
commit 15e259bc52
8 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/Makefile
View File

@@ -180,7 +180,7 @@ nvgpu-$(CONFIG_COMMON_CLK) += \
common/linux/clk.o common/linux/clk.o
nvgpu-$(CONFIG_GK20A_DEVFREQ) += \ nvgpu-$(CONFIG_GK20A_DEVFREQ) += \
gk20a/gk20a_scale.o common/linux/scale.o
nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \ nvgpu-$(CONFIG_GK20A_CYCLE_STATS) += \
gk20a/css_gr_gk20a.o gk20a/css_gr_gk20a.o

2
drivers/gpu/nvgpu/common/linux/driver_common.c
View File

@@ -23,7 +23,7 @@
#include <nvgpu/enabled.h> #include <nvgpu/enabled.h>
#include <nvgpu/debug.h> #include <nvgpu/debug.h>
#include "gk20a/gk20a_scale.h" #include "scale.h"
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h" #include "gk20a/platform_gk20a.h"
#include "module.h" #include "module.h"

2
drivers/gpu/nvgpu/common/linux/module.c
View File

@@ -35,7 +35,7 @@
#include "gk20a/platform_gk20a.h" #include "gk20a/platform_gk20a.h"
#include "sysfs.h" #include "sysfs.h"
#include "vgpu/vgpu.h" #include "vgpu/vgpu.h"
#include "gk20a/gk20a_scale.h" #include "scale.h"
#include "gk20a/ctxsw_trace_gk20a.h" #include "gk20a/ctxsw_trace_gk20a.h"
#include "pci.h" #include "pci.h"
#include "module.h" #include "module.h"

2
drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
View File

@@ -48,9 +48,9 @@
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/platform_gk20a.h" #include "gk20a/platform_gk20a.h"
#include "gk20a/gk20a_scale.h"
#include "gm20b/clk_gm20b.h" #include "gm20b/clk_gm20b.h"
#include "scale.h"
#include "clk.h" #include "clk.h"
#include "os_linux.h" #include "os_linux.h"

2
drivers/gpu/nvgpu/common/linux/platform_gp10b_tegra.c
View File

@@ -35,11 +35,11 @@
#include "gk20a/platform_gk20a.h" #include "gk20a/platform_gk20a.h"
#include "gk20a/gk20a.h" #include "gk20a/gk20a.h"
#include "gk20a/gk20a_scale.h"
#include "platform_gk20a_tegra.h" #include "platform_gk20a_tegra.h"
#include "gp10b/platform_gp10b.h" #include "gp10b/platform_gp10b.h"
#include "platform_gp10b_tegra.h" #include "platform_gp10b_tegra.h"
#include "scale.h"
/* Select every GP10B_FREQ_SELECT_STEP'th frequency from h/w table */ /* Select every GP10B_FREQ_SELECT_STEP'th frequency from h/w table */
#define GP10B_FREQ_SELECT_STEP 8 #define GP10B_FREQ_SELECT_STEP 8

32
drivers/gpu/nvgpu/gk20a/gk20a_scale.c → drivers/gpu/nvgpu/common/linux/scale.c
View File

@@ -3,23 +3,17 @@
* *
* Copyright (c) 2013-2017, NVIDIA Corporation. All rights reserved. * Copyright (c) 2013-2017, NVIDIA Corporation. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * This program is free software; you can redistribute it and/or modify it
* copy of this software and associated documentation files (the "Software"), * under the terms and conditions of the GNU General Public License,
* to deal in the Software without restriction, including without limitation * version 2, as published by the Free Software Foundation.
* 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:
* *
* The above copyright notice and this permission notice shall be included in * This program is distributed in the hope it will be useful, but WITHOUT
* all copies or substantial portions of the Software. * 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * You should have received a copy of the GNU General Public License
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * along with this program. If not, see <http://www.gnu.org/licenses/>.
* 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.
*/ */
#include <linux/devfreq.h> #include <linux/devfreq.h>
@@ -32,10 +26,10 @@
#include <nvgpu/kmem.h> #include <nvgpu/kmem.h>
#include <nvgpu/log.h> #include <nvgpu/log.h>
#include "gk20a.h" #include "gk20a/gk20a.h"
#include "platform_gk20a.h" #include "gk20a/platform_gk20a.h"
#include "gk20a_scale.h" #include "scale.h"
#include "common/linux/os_linux.h" #include "os_linux.h"
/* /*
* gk20a_scale_qos_notify() * gk20a_scale_qos_notify()

24
drivers/gpu/nvgpu/gk20a/gk20a_scale.h → drivers/gpu/nvgpu/common/linux/scale.h
View File

@@ -3,23 +3,17 @@
* *
* Copyright (c) 2013-2016, NVIDIA Corporation. All rights reserved. * Copyright (c) 2013-2016, NVIDIA Corporation. All rights reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * This program is free software; you can redistribute it and/or modify it
* copy of this software and associated documentation files (the "Software"), * under the terms and conditions of the GNU General Public License,
* to deal in the Software without restriction, including without limitation * version 2, as published by the Free Software Foundation.
* 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:
* *
* The above copyright notice and this permission notice shall be included in * This program is distributed in the hope it will be useful, but WITHOUT
* all copies or substantial portions of the Software. * 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 SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * You should have received a copy of the GNU General Public License
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * along with this program. If not, see <http://www.gnu.org/licenses/>.
* 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 GK20A_SCALE_H #ifndef GK20A_SCALE_H

2
drivers/gpu/nvgpu/vgpu/vgpu.c
View File

@@ -40,13 +40,13 @@
#include "vgpu/clk_vgpu.h" #include "vgpu/clk_vgpu.h"
#include "gk20a/ctxsw_trace_gk20a.h" #include "gk20a/ctxsw_trace_gk20a.h"
#include "gk20a/tsg_gk20a.h" #include "gk20a/tsg_gk20a.h"
#include "gk20a/gk20a_scale.h"
#include "gk20a/channel_gk20a.h" #include "gk20a/channel_gk20a.h"
#include "gm20b/hal_gm20b.h" #include "gm20b/hal_gm20b.h"
#include "common/linux/module.h" #include "common/linux/module.h"
#include "common/linux/os_linux.h" #include "common/linux/os_linux.h"
#include "common/linux/ioctl.h" #include "common/linux/ioctl.h"
#include "common/linux/scale.h"
#ifdef CONFIG_TEGRA_19x_GPU #ifdef CONFIG_TEGRA_19x_GPU
#include <vgpu/vgpu_t19x.h> #include <vgpu/vgpu_t19x.h>