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: remove CONFIG_TEGRA_T23X_GRHOST dependency for EMC scaling

Browse Source 
ICC calls to set EMC frequency are incorrectly compiled under the
config CONFIG_TEGRA_T23X_GRHOST. Remove that dependency.

Bug 3997304
JIRA LS-497

Change-Id: Ic5f58fd36622d4e3a86093d59f481a00a48d5ed4
Signed-off-by: Johnny Liu <johnliu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2945213
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Johnny Liu
2023-07-27 15:48:11 +00:00
committed by mobile promotions
parent 088bb16dd9
commit 0cc9253351
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/gpu/nvgpu/os/linux/platform_ga10b_tegra.c
View File

@@ -23,7 +23,7 @@
#include <linux/iommu.h> #include <linux/iommu.h>
#include <linux/hashtable.h> #include <linux/hashtable.h>
#include <linux/clk.h> #include <linux/clk.h>
#if defined(CONFIG_INTERCONNECT) && defined(CONFIG_TEGRA_T23X_GRHOST) #if defined(CONFIG_INTERCONNECT)
#include <linux/platform/tegra/mc_utils.h> #include <linux/platform/tegra/mc_utils.h>
#include <linux/interconnect.h> #include <linux/interconnect.h>
#include <dt-bindings/interconnect/tegra_icc_id.h> #include <dt-bindings/interconnect/tegra_icc_id.h>
@@ -84,7 +84,7 @@ struct gk20a_platform_clk tegra_ga10b_clocks[] = {
#define NVGPU_GPC0_DISABLE BIT(0) #define NVGPU_GPC0_DISABLE BIT(0)
#define NVGPU_GPC1_DISABLE BIT(1) #define NVGPU_GPC1_DISABLE BIT(1)
#if defined(CONFIG_INTERCONNECT) && defined(CONFIG_TEGRA_T23X_GRHOST) #if defined(CONFIG_INTERCONNECT)
static int ga10b_tegra_set_emc_rate(struct gk20a_scale_profile *profile, static int ga10b_tegra_set_emc_rate(struct gk20a_scale_profile *profile,
unsigned long gpu_rate, unsigned long emc3d_ratio) unsigned long gpu_rate, unsigned long emc3d_ratio)
{ {
@@ -236,7 +236,7 @@ static int ga10b_tegra_get_clocks(struct device *dev)
void ga10b_tegra_scale_init(struct device *dev) void ga10b_tegra_scale_init(struct device *dev)
{ {
#if defined(CONFIG_INTERCONNECT) && defined(CONFIG_TEGRA_T23X_GRHOST) #if defined(CONFIG_INTERCONNECT)
struct gk20a_platform *platform = gk20a_get_platform(dev); struct gk20a_platform *platform = gk20a_get_platform(dev);
struct gk20a_scale_profile *profile = platform->g->scale_profile; struct gk20a_scale_profile *profile = platform->g->scale_profile;
struct icc_path *icc_path_handle; struct icc_path *icc_path_handle;
@@ -266,7 +266,7 @@ void ga10b_tegra_scale_init(struct device *dev)
static void ga10b_tegra_scale_exit(struct device *dev) static void ga10b_tegra_scale_exit(struct device *dev)
{ {
#if defined(CONFIG_INTERCONNECT) && defined(CONFIG_TEGRA_T23X_GRHOST) #if defined(CONFIG_INTERCONNECT)
struct gk20a_platform *platform = gk20a_get_platform(dev); struct gk20a_platform *platform = gk20a_get_platform(dev);
struct gk20a_scale_profile *profile = platform->g->scale_profile; struct gk20a_scale_profile *profile = platform->g->scale_profile;
@@ -396,7 +396,7 @@ static bool ga10b_tegra_is_railgated(struct device *dev)
static int ga10b_tegra_railgate(struct device *dev) static int ga10b_tegra_railgate(struct device *dev)
{ {
#if defined(CONFIG_INTERCONNECT) && defined(CONFIG_TEGRA_T23X_GRHOST) #if defined(CONFIG_INTERCONNECT)
struct gk20a_platform *platform = gk20a_get_platform(dev); struct gk20a_platform *platform = gk20a_get_platform(dev);
struct gk20a_scale_profile *profile = platform->g->scale_profile; struct gk20a_scale_profile *profile = platform->g->scale_profile;
int ret = 0; int ret = 0;
@@ -483,7 +483,7 @@ static int ga10b_tegra_bpmp_mrq_set(struct device *dev)
static int ga10b_tegra_unrailgate(struct device *dev) static int ga10b_tegra_unrailgate(struct device *dev)
{ {
int ret = 0; int ret = 0;
#if defined(CONFIG_INTERCONNECT) && defined(CONFIG_TEGRA_T23X_GRHOST) #if defined(CONFIG_INTERCONNECT)
struct gk20a_platform *platform = gk20a_get_platform(dev); struct gk20a_platform *platform = gk20a_get_platform(dev);
struct gk20a_scale_profile *profile = platform->g->scale_profile; struct gk20a_scale_profile *profile = platform->g->scale_profile;
unsigned long max_rate; unsigned long max_rate;
@@ -517,7 +517,7 @@ static int ga10b_tegra_unrailgate(struct device *dev)
/* Setting clk controls */ /* Setting clk controls */
gp10b_tegra_clks_control(dev, true); gp10b_tegra_clks_control(dev, true);
#if defined(CONFIG_INTERCONNECT) && defined(CONFIG_TEGRA_T23X_GRHOST) #if defined(CONFIG_INTERCONNECT)
/* to start with set emc frequency floor for max gpu sys rate*/ /* to start with set emc frequency floor for max gpu sys rate*/
rate = clk_round_rate(platform->clk[0], (UINT_MAX - 1)); rate = clk_round_rate(platform->clk[0], (UINT_MAX - 1));
max_rate = (rate < 0) ? ULONG_MAX : (unsigned long)rate; max_rate = (rate < 0) ? ULONG_MAX : (unsigned long)rate;
@@ -593,7 +593,7 @@ static int ga10b_tegra_set_fbp_pg_mask(struct device *dev, u32 dt_fbp_pg_mask)
void ga10b_tegra_postscale(struct device *pdev, void ga10b_tegra_postscale(struct device *pdev,
unsigned long freq) unsigned long freq)
{ {
#if defined(CONFIG_INTERCONNECT) && defined(CONFIG_TEGRA_T23X_GRHOST) #if defined(CONFIG_INTERCONNECT)
struct gk20a_platform *platform = gk20a_get_platform(pdev); struct gk20a_platform *platform = gk20a_get_platform(pdev);
struct gk20a_scale_profile *profile = platform->g->scale_profile; struct gk20a_scale_profile *profile = platform->g->scale_profile;
struct gk20a *g = get_gk20a(pdev); struct gk20a *g = get_gk20a(pdev);