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

gpu: nvgpu: move gm20b clk debugfs to linux

Browse Source 
Use nvgpu_os_linux_ops to initialize gm20b debugfs
functions.

gm20b_clk_init_debugfs() will be invoked during initialization
from nvgpu_finalize_poweron_linux().

JIRA NVGPU-603

Change-Id: Ie89e427cc589ae14e1e7f5918d918126fb4afd77
Signed-off-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1797905
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Nitin Kumbhar
2018-08-12 22:59:24 +05:30
committed by mobile promotions
parent f16cc93d0a
commit 0406900ca9
5 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/nvgpu/gm20b/clk_gm20b.c
View File

@@ -1490,17 +1490,6 @@ int gm20b_init_clk_support(struct gk20a *g)
err = set_pll_freq(g, 1);
}
nvgpu_mutex_release(&clk->clk_mutex);
if (err) {
return err;
}
if (!clk->debugfs_set && g->ops.clk.init_debugfs) {
err = g->ops.clk.init_debugfs(g);
if (err) {
return err;
}
clk->debugfs_set = true;
}
return err;
}

3
drivers/gpu/nvgpu/gm20b/clk_gm20b.h
View File

@@ -70,9 +70,6 @@ int gm20b_gpcclk_set_rate(struct clk_gk20a *clk, unsigned long rate,
long gm20b_round_rate(struct clk_gk20a *clk, unsigned long rate,
unsigned long *parent_rate);
struct pll_parms *gm20b_get_gpc_pll_parms(void);
#ifdef CONFIG_DEBUG_FS
int gm20b_clk_init_debugfs(struct gk20a *g);
#endif
int gm20b_clk_pll_reg_write(struct gk20a *g, u32 reg, u32 val);
int gm20b_init_clk_support(struct gk20a *g);

3
drivers/gpu/nvgpu/gm20b/hal_gm20b.c
View File

@@ -555,9 +555,6 @@ static const struct gpu_ops gm20b_ops = {
.clk = {
.init_clk_support = gm20b_init_clk_support,
.suspend_clk_support = gm20b_suspend_clk_support,
#ifdef CONFIG_DEBUG_FS
.init_debugfs = gm20b_clk_init_debugfs,
#endif
.get_voltage = gm20b_clk_get_voltage,
.get_gpcclk_clock_counter = gm20b_clk_get_gpcclk_clock_counter,
.pll_reg_write = gm20b_clk_pll_reg_write,

29
drivers/gpu/nvgpu/os/linux/debug_clk_gm20b.h Normal file
View File

@@ -0,0 +1,29 @@
/*
* Copyright (c) 2018, 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 <http://www.gnu.org/licenses/>.
*/
#ifndef __DEBUG_CLK_GM20B_H
#define __DEBUG_CLK_GM20B_H
#ifdef CONFIG_DEBUG_FS
int gm20b_clk_init_debugfs(struct gk20a *g);
#else
inline int gm20b_clk_init_debugfs(struct gk20a *g)
{
return 0;
}
#endif
#endif

5
drivers/gpu/nvgpu/os/linux/os_ops_gm20b.c
View File

@@ -17,6 +17,7 @@
#include "os_linux.h"
#include "cde_gm20b.h"
#include "debug_clk_gm20b.h"
static struct nvgpu_os_linux_ops gm20b_os_linux_ops = {
#ifdef CONFIG_NVGPU_SUPPORT_CDE
@@ -24,6 +25,9 @@ static struct nvgpu_os_linux_ops gm20b_os_linux_ops = {
.get_program_numbers = gm20b_cde_get_program_numbers,
},
#endif
.clk = {
.init_debugfs = gm20b_clk_init_debugfs,
},
};
void nvgpu_gm20b_init_os_ops(struct nvgpu_os_linux *l)
@@ -31,4 +35,5 @@ void nvgpu_gm20b_init_os_ops(struct nvgpu_os_linux *l)
#ifdef CONFIG_NVGPU_SUPPORT_CDE
l->ops.cde = gm20b_os_linux_ops.cde;
#endif
l->ops.clk = gm20b_os_linux_ops.clk;
}