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

gpu: nvgpu: gm20b: update clock gating defines

Browse Source 
Fixed sparse warnings related to clock gating list
and function definitions.

Bug 200067946

Change-Id: I9844771b6713c56dbe5dcf85f746a0ebd6c48f9c
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/677878
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Seshendra Gadagottu
2015-01-27 11:30:07 -08:00
committed by Dan Willemsen
parent 4f693d032a
commit d29be09f6f
2 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/gpu/nvgpu/gm20b/gm20b_gating_reglist.c
View File

@@ -29,17 +29,17 @@ struct gating_desc {
u32 disable; u32 disable;
}; };
/* slcg bus */ /* slcg bus */
const struct gating_desc gm20b_slcg_bus[] = { static const struct gating_desc gm20b_slcg_bus[] = {
{.addr = 0x00001c04, .prod = 0x00000000, .disable = 0x000003fe}, {.addr = 0x00001c04, .prod = 0x00000000, .disable = 0x000003fe},
}; };
/* slcg ce2 */ /* slcg ce2 */
const struct gating_desc gm20b_slcg_ce2[] = { static const struct gating_desc gm20b_slcg_ce2[] = {
{.addr = 0x00106f28, .prod = 0x00000000, .disable = 0x000007fe}, {.addr = 0x00106f28, .prod = 0x00000000, .disable = 0x000007fe},
}; };
/* slcg chiplet */ /* slcg chiplet */
const struct gating_desc gm20b_slcg_chiplet[] = { static const struct gating_desc gm20b_slcg_chiplet[] = {
{.addr = 0x0010c07c, .prod = 0x00000000, .disable = 0x00000007}, {.addr = 0x0010c07c, .prod = 0x00000000, .disable = 0x00000007},
{.addr = 0x0010e07c, .prod = 0x00000000, .disable = 0x00000007}, {.addr = 0x0010e07c, .prod = 0x00000000, .disable = 0x00000007},
{.addr = 0x0010d07c, .prod = 0x00000000, .disable = 0x00000007}, {.addr = 0x0010d07c, .prod = 0x00000000, .disable = 0x00000007},
@@ -47,18 +47,18 @@ const struct gating_desc gm20b_slcg_chiplet[] = {
}; };
/* slcg fb */ /* slcg fb */
const struct gating_desc gm20b_slcg_fb[] = { static const struct gating_desc gm20b_slcg_fb[] = {
{.addr = 0x00100d14, .prod = 0x00000020, .disable = 0xfffffffe}, {.addr = 0x00100d14, .prod = 0x00000020, .disable = 0xfffffffe},
{.addr = 0x00100c9c, .prod = 0x00000000, .disable = 0x000001fe}, {.addr = 0x00100c9c, .prod = 0x00000000, .disable = 0x000001fe},
}; };
/* slcg fifo */ /* slcg fifo */
const struct gating_desc gm20b_slcg_fifo[] = { static const struct gating_desc gm20b_slcg_fifo[] = {
{.addr = 0x000026ac, .prod = 0x00000100, .disable = 0x0001fffe}, {.addr = 0x000026ac, .prod = 0x00000100, .disable = 0x0001fffe},
}; };
/* slcg gr */ /* slcg gr */
const struct gating_desc gm20b_slcg_gr[] = { static const struct gating_desc gm20b_slcg_gr[] = {
{.addr = 0x004041f4, .prod = 0x00000000, .disable = 0x03fffffe}, {.addr = 0x004041f4, .prod = 0x00000000, .disable = 0x03fffffe},
{.addr = 0x0040917c, .prod = 0x00020008, .disable = 0x0003fffe}, {.addr = 0x0040917c, .prod = 0x00020008, .disable = 0x0003fffe},
{.addr = 0x00409894, .prod = 0x00000040, .disable = 0x0003fffe}, {.addr = 0x00409894, .prod = 0x00000040, .disable = 0x0003fffe},
@@ -120,13 +120,13 @@ const struct gating_desc gm20b_slcg_gr[] = {
}; };
/* slcg ltc */ /* slcg ltc */
const struct gating_desc gm20b_slcg_ltc[] = { static const struct gating_desc gm20b_slcg_ltc[] = {
{.addr = 0x0017e050, .prod = 0x00000000, .disable = 0xfffffffe}, {.addr = 0x0017e050, .prod = 0x00000000, .disable = 0xfffffffe},
{.addr = 0x0017e35c, .prod = 0x00000000, .disable = 0xfffffffe}, {.addr = 0x0017e35c, .prod = 0x00000000, .disable = 0xfffffffe},
}; };
/* slcg perf */ /* slcg perf */
const struct gating_desc gm20b_slcg_perf[] = { static const struct gating_desc gm20b_slcg_perf[] = {
{.addr = 0x001be018, .prod = 0x000001ff, .disable = 0x00000000}, {.addr = 0x001be018, .prod = 0x000001ff, .disable = 0x00000000},
{.addr = 0x001bc018, .prod = 0x000001ff, .disable = 0x00000000}, {.addr = 0x001bc018, .prod = 0x000001ff, .disable = 0x00000000},
{.addr = 0x001b8018, .prod = 0x000001ff, .disable = 0x00000000}, {.addr = 0x001b8018, .prod = 0x000001ff, .disable = 0x00000000},
@@ -134,12 +134,12 @@ const struct gating_desc gm20b_slcg_perf[] = {
}; };
/* slcg PriRing */ /* slcg PriRing */
const struct gating_desc gm20b_slcg_priring[] = { static const struct gating_desc gm20b_slcg_priring[] = {
{.addr = 0x001200a8, .prod = 0x00000000, .disable = 0x00000001}, {.addr = 0x001200a8, .prod = 0x00000000, .disable = 0x00000001},
}; };
/* slcg pwr_csb */ /* slcg pwr_csb */
const struct gating_desc gm20b_slcg_pwr_csb[] = { static const struct gating_desc gm20b_slcg_pwr_csb[] = {
{.addr = 0x0000017c, .prod = 0x00020008, .disable = 0x0003fffe}, {.addr = 0x0000017c, .prod = 0x00020008, .disable = 0x0003fffe},
{.addr = 0x00000e74, .prod = 0x00000000, .disable = 0x0000000f}, {.addr = 0x00000e74, .prod = 0x00000000, .disable = 0x0000000f},
{.addr = 0x00000a74, .prod = 0x00000000, .disable = 0x00007ffe}, {.addr = 0x00000a74, .prod = 0x00000000, .disable = 0x00007ffe},
@@ -147,34 +147,34 @@ const struct gating_desc gm20b_slcg_pwr_csb[] = {
}; };
/* slcg pmu */ /* slcg pmu */
const struct gating_desc gm20b_slcg_pmu[] = { static const struct gating_desc gm20b_slcg_pmu[] = {
{.addr = 0x0010a17c, .prod = 0x00020008, .disable = 0x0003fffe}, {.addr = 0x0010a17c, .prod = 0x00020008, .disable = 0x0003fffe},
{.addr = 0x0010aa74, .prod = 0x00000000, .disable = 0x00007ffe}, {.addr = 0x0010aa74, .prod = 0x00000000, .disable = 0x00007ffe},
{.addr = 0x0010ae74, .prod = 0x00000000, .disable = 0x0000000f}, {.addr = 0x0010ae74, .prod = 0x00000000, .disable = 0x0000000f},
}; };
/* therm gr */ /* therm gr */
const struct gating_desc gm20b_slcg_therm[] = { static const struct gating_desc gm20b_slcg_therm[] = {
{.addr = 0x000206b8, .prod = 0x00000000, .disable = 0x0000000f}, {.addr = 0x000206b8, .prod = 0x00000000, .disable = 0x0000000f},
}; };
/* slcg Xbar */ /* slcg Xbar */
const struct gating_desc gm20b_slcg_xbar[] = { static const struct gating_desc gm20b_slcg_xbar[] = {
{.addr = 0x0013cbe4, .prod = 0x00000000, .disable = 0x1ffffffe}, {.addr = 0x0013cbe4, .prod = 0x00000000, .disable = 0x1ffffffe},
{.addr = 0x0013cc04, .prod = 0x00000000, .disable = 0x1ffffffe}, {.addr = 0x0013cc04, .prod = 0x00000000, .disable = 0x1ffffffe},
}; };
/* blcg bus */ /* blcg bus */
const struct gating_desc gm20b_blcg_bus[] = { static const struct gating_desc gm20b_blcg_bus[] = {
{.addr = 0x00001c00, .prod = 0x00000042, .disable = 0x00000000}, {.addr = 0x00001c00, .prod = 0x00000042, .disable = 0x00000000},
}; };
/* blcg ctxsw prog */ /* blcg ctxsw prog */
const struct gating_desc gm20b_blcg_ctxsw_prog[] = { static const struct gating_desc gm20b_blcg_ctxsw_prog[] = {
}; };
/* blcg fb */ /* blcg fb */
const struct gating_desc gm20b_blcg_fb[] = { static const struct gating_desc gm20b_blcg_fb[] = {
{.addr = 0x00100d10, .prod = 0x0000c242, .disable = 0x00000000}, {.addr = 0x00100d10, .prod = 0x0000c242, .disable = 0x00000000},
{.addr = 0x00100d30, .prod = 0x0000c242, .disable = 0x00000000}, {.addr = 0x00100d30, .prod = 0x0000c242, .disable = 0x00000000},
{.addr = 0x00100d3c, .prod = 0x00000242, .disable = 0x00000000}, {.addr = 0x00100d3c, .prod = 0x00000242, .disable = 0x00000000},
@@ -184,12 +184,12 @@ const struct gating_desc gm20b_blcg_fb[] = {
}; };
/* blcg fifo */ /* blcg fifo */
const struct gating_desc gm20b_blcg_fifo[] = { static const struct gating_desc gm20b_blcg_fifo[] = {
{.addr = 0x000026a4, .prod = 0x0000c242, .disable = 0x00000000}, {.addr = 0x000026a4, .prod = 0x0000c242, .disable = 0x00000000},
}; };
/* blcg gr */ /* blcg gr */
const struct gating_desc gm20b_blcg_gr[] = { static const struct gating_desc gm20b_blcg_gr[] = {
{.addr = 0x004041f0, .prod = 0x00004046, .disable = 0x00000000}, {.addr = 0x004041f0, .prod = 0x00004046, .disable = 0x00000000},
{.addr = 0x00409890, .prod = 0x0000007f, .disable = 0x00000000}, {.addr = 0x00409890, .prod = 0x0000007f, .disable = 0x00000000},
{.addr = 0x004098b0, .prod = 0x0000007f, .disable = 0x00000000}, {.addr = 0x004098b0, .prod = 0x0000007f, .disable = 0x00000000},
@@ -254,7 +254,7 @@ const struct gating_desc gm20b_blcg_gr[] = {
}; };
/* blcg ltc */ /* blcg ltc */
const struct gating_desc gm20b_blcg_ltc[] = { static const struct gating_desc gm20b_blcg_ltc[] = {
{.addr = 0x0017e030, .prod = 0x00000044, .disable = 0x00000000}, {.addr = 0x0017e030, .prod = 0x00000044, .disable = 0x00000000},
{.addr = 0x0017e040, .prod = 0x00000044, .disable = 0x00000000}, {.addr = 0x0017e040, .prod = 0x00000044, .disable = 0x00000000},
{.addr = 0x0017e3e0, .prod = 0x00000044, .disable = 0x00000000}, {.addr = 0x0017e3e0, .prod = 0x00000044, .disable = 0x00000000},
@@ -262,26 +262,26 @@ const struct gating_desc gm20b_blcg_ltc[] = {
}; };
/* blcg pwr_csb */ /* blcg pwr_csb */
const struct gating_desc gm20b_blcg_pwr_csb[] = { static const struct gating_desc gm20b_blcg_pwr_csb[] = {
{.addr = 0x00000a70, .prod = 0x00000045, .disable = 0x00000000}, {.addr = 0x00000a70, .prod = 0x00000045, .disable = 0x00000000},
}; };
/* blcg pmu */ /* blcg pmu */
const struct gating_desc gm20b_blcg_pmu[] = { static const struct gating_desc gm20b_blcg_pmu[] = {
{.addr = 0x0010aa70, .prod = 0x00000045, .disable = 0x00000000}, {.addr = 0x0010aa70, .prod = 0x00000045, .disable = 0x00000000},
}; };
/* blcg Xbar */ /* blcg Xbar */
const struct gating_desc gm20b_blcg_xbar[] = { static const struct gating_desc gm20b_blcg_xbar[] = {
{.addr = 0x0013cbe0, .prod = 0x00000042, .disable = 0x00000000}, {.addr = 0x0013cbe0, .prod = 0x00000042, .disable = 0x00000000},
{.addr = 0x0013cc00, .prod = 0x00000042, .disable = 0x00000000}, {.addr = 0x0013cc00, .prod = 0x00000042, .disable = 0x00000000},
}; };
/* pg gr */ /* pg gr */
const struct gating_desc gm20b_pg_gr[] = { static const struct gating_desc gm20b_pg_gr[] = {
}; };
/* static inline functions */ /* inline functions */
void gm20b_slcg_bus_load_gating_prod(struct gk20a *g, void gm20b_slcg_bus_load_gating_prod(struct gk20a *g,
bool prod) bool prod)
{ {
@@ -297,7 +297,6 @@ void gm20b_slcg_bus_load_gating_prod(struct gk20a *g,
} }
} }
/* static inline functions */
void gm20b_slcg_ce2_load_gating_prod(struct gk20a *g, void gm20b_slcg_ce2_load_gating_prod(struct gk20a *g,
bool prod) bool prod)
{ {

8
drivers/gpu/nvgpu/gm20b/gm20b_gating_reglist.h
View File

@@ -1,7 +1,7 @@
/* /*
* drivers/video/tegra/host/gm20b/gm20b_gating_reglist.h * drivers/video/tegra/host/gm20b/gm20b_gating_reglist.h
* *
* Copyright (c) 2014, NVIDIA Corporation. All rights reserved. * Copyright (c) 2014-2015, NVIDIA Corporation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -51,6 +51,9 @@ void gm20b_slcg_perf_load_gating_prod(struct gk20a *g,
void gm20b_slcg_priring_load_gating_prod(struct gk20a *g, void gm20b_slcg_priring_load_gating_prod(struct gk20a *g,
bool prod); bool prod);
void gm20b_slcg_pwr_csb_load_gating_prod(struct gk20a *g,
bool prod);
void gm20b_slcg_pmu_load_gating_prod(struct gk20a *g, void gm20b_slcg_pmu_load_gating_prod(struct gk20a *g,
bool prod); bool prod);
@@ -84,6 +87,9 @@ void gm20b_blcg_pwr_csb_load_gating_prod(struct gk20a *g,
void gm20b_blcg_pmu_load_gating_prod(struct gk20a *g, void gm20b_blcg_pmu_load_gating_prod(struct gk20a *g,
bool prod); bool prod);
void gm20b_blcg_xbar_load_gating_prod(struct gk20a *g,
bool prod);
void gr_gm20b_pg_gr_load_gating_prod(struct gk20a *g, void gr_gm20b_pg_gr_load_gating_prod(struct gk20a *g,
bool prod); bool prod);