From 744d5a5212936fd453bacc46be52e6aeef076a69 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 10 Nov 2017 10:53:51 -0800 Subject: gpu: nvgpu: vgpu: Implement clk.get_maxfreq Modify HAL clk->get_maxfreq() signature to match the one in clk->set_rate() and clk->get_rate(). It allows support of multiple clocks. Implement clk.get_maxfreq operation for vgpu and use it to fill max_freq field in GPU characteristics query. JIRA NVGPU-388 Change-Id: I93bfc2aa76e38b8a5e0ac55d87c4e26df6fea77f Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1597329 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/clk.c | 16 ++++++++++++++-- drivers/gpu/nvgpu/gk20a/gk20a.c | 2 +- drivers/gpu/nvgpu/gk20a/gk20a.h | 2 +- drivers/gpu/nvgpu/gm20b/clk_gm20b.c | 2 +- drivers/gpu/nvgpu/vgpu/clk_vgpu.c | 8 ++++++++ drivers/gpu/nvgpu/vgpu/vgpu.c | 2 -- 6 files changed, 25 insertions(+), 7 deletions(-) (limited to 'drivers/gpu') diff --git a/drivers/gpu/nvgpu/common/linux/clk.c b/drivers/gpu/nvgpu/common/linux/clk.c index a9888590..ea5b023d 100644 --- a/drivers/gpu/nvgpu/common/linux/clk.c +++ b/drivers/gpu/nvgpu/common/linux/clk.c @@ -106,9 +106,21 @@ static int nvgpu_linux_predict_mv_at_hz_cur_tfloor(struct clk_gk20a *clk, clk_get_parent(clk->tegra_clk), rate); } -static unsigned long nvgpu_linux_get_maxrate(struct clk_gk20a *clk) +static unsigned long nvgpu_linux_get_maxrate(struct gk20a *g, u32 api_domain) { - return tegra_dvfs_get_maxrate(clk_get_parent(clk->tegra_clk)); + int ret; + + switch (api_domain) { + case CTRL_CLK_DOMAIN_GPCCLK: + ret = tegra_dvfs_get_maxrate(clk_get_parent(g->clk.tegra_clk)); + break; + default: + nvgpu_err(g, "unknown clock: %u", api_domain); + ret = 0; + break; + } + + return ret; } static int nvgpu_linux_prepare_enable(struct clk_gk20a *clk) diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index ab3d86be..8f67da69 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -466,7 +466,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g) gpu->cbc_comptags_per_line = g->gr.comptags_per_cacheline; if (g->ops.clk.get_maxrate) - gpu->max_freq = g->ops.clk.get_maxrate(&g->clk); + gpu->max_freq = g->ops.clk.get_maxrate(g, CTRL_CLK_DOMAIN_GPCCLK); gpu->local_video_memory_size = g->mm.vidmem.size; diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 4bc5c04b..fb12d0d2 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h @@ -880,7 +880,7 @@ struct gpu_ops { u32 (*get_ref_clock_rate)(struct gk20a *g); int (*predict_mv_at_hz_cur_tfloor)(struct clk_gk20a *clk, unsigned long rate); - unsigned long (*get_maxrate)(struct clk_gk20a *clk); + unsigned long (*get_maxrate)(struct gk20a *g, u32 api_domain); int (*prepare_enable)(struct clk_gk20a *clk); void (*disable_unprepare)(struct clk_gk20a *clk); int (*get_voltage)(struct clk_gk20a *clk, u64 *val); diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c index a74209cf..61d3b6f5 100644 --- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c @@ -1273,7 +1273,7 @@ long gm20b_round_rate(struct clk_gk20a *clk, unsigned long rate, unsigned long maxrate; struct gk20a *g = clk->g; - maxrate = g->ops.clk.get_maxrate(clk); + maxrate = g->ops.clk.get_maxrate(g, CTRL_CLK_DOMAIN_GPCCLK); if (rate > maxrate) rate = maxrate; diff --git a/drivers/gpu/nvgpu/vgpu/clk_vgpu.c b/drivers/gpu/nvgpu/vgpu/clk_vgpu.c index 39a8e618..e4ad8f68 100644 --- a/drivers/gpu/nvgpu/vgpu/clk_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/clk_vgpu.c @@ -92,10 +92,18 @@ static int vgpu_clk_set_rate(struct gk20a *g, return err; } +static unsigned long vgpu_clk_get_maxrate(struct gk20a *g, u32 api_domain) +{ + struct vgpu_priv_data *priv = vgpu_get_priv_data(g); + + return priv->constants.max_freq; +} + void vgpu_init_clk_support(struct gk20a *g) { g->ops.clk.get_rate = vgpu_clk_get_rate; g->ops.clk.set_rate = vgpu_clk_set_rate; + g->ops.clk.get_maxrate = vgpu_clk_get_maxrate; } long vgpu_clk_round_rate(struct device *dev, unsigned long rate) diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 6a9e986b..1153b540 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c @@ -359,7 +359,6 @@ static void vgpu_detect_chip(struct gk20a *g) int vgpu_init_gpu_characteristics(struct gk20a *g) { - struct vgpu_priv_data *priv = vgpu_get_priv_data(g); int err; gk20a_dbg_fn(""); @@ -368,7 +367,6 @@ int vgpu_init_gpu_characteristics(struct gk20a *g) if (err) return err; - g->gpu_characteristics.max_freq = priv->constants.max_freq; __nvgpu_set_enabled(g, NVGPU_SUPPORT_MAP_BUFFER_BATCH, false); /* features vgpu does not support */ -- cgit v1.2.2