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/vgpu/clk_vgpu.c | 8 ++++++++ drivers/gpu/nvgpu/vgpu/vgpu.c | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu') 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