summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2016-02-08 16:49:38 +0900
committerAlexandre Courbot <acourbot@nvidia.com>2016-02-26 10:24:28 +0900
commit2d59859b66bd79159fe9ee4f9c86b0dcf2c2c15d (patch)
treefc431e77a5781d7b9f2dc52be1dc125cf4ea0d0e
parentab11185c0c4ce7eb6961987b61dfada311fef51f (diff)
downloadnouveau-2d59859b66bd79159fe9ee4f9c86b0dcf2c2c15d.tar.gz
reuse gk20a_clk_calc
-rw-r--r--drm/nouveau/nvkm/subdev/clk/gk20a.c2
-rw-r--r--drm/nouveau/nvkm/subdev/clk/gk20a.h2
-rw-r--r--drm/nouveau/nvkm/subdev/clk/gm20b.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drm/nouveau/nvkm/subdev/clk/gk20a.c b/drm/nouveau/nvkm/subdev/clk/gk20a.c
index e75c4bbe0..e29b27810 100644
--- a/drm/nouveau/nvkm/subdev/clk/gk20a.c
+++ b/drm/nouveau/nvkm/subdev/clk/gk20a.c
@@ -500,7 +500,7 @@ gk20a_clk_read(struct nvkm_clk *base, enum nv_clk_src src)
}
}
-static int
+int
gk20a_clk_calc(struct nvkm_clk *base, struct nvkm_cstate *cstate)
{
struct gk20a_clk *clk = gk20a_clk(base);
diff --git a/drm/nouveau/nvkm/subdev/clk/gk20a.h b/drm/nouveau/nvkm/subdev/clk/gk20a.h
index 0e93e1db5..010d90263 100644
--- a/drm/nouveau/nvkm/subdev/clk/gk20a.h
+++ b/drm/nouveau/nvkm/subdev/clk/gk20a.h
@@ -126,6 +126,6 @@ int gk20a_pllg_calc_mnp(struct gk20a_clk *clk, unsigned long rate);
void gk20a_pllg_enable(struct gk20a_clk *clk);
void gk20a_pllg_disable(struct gk20a_clk *clk);
int gk20a_clk_read(struct nvkm_clk *base, enum nv_clk_src src);
-
+int gk20a_clk_calc(struct nvkm_clk *base, struct nvkm_cstate *cstate);
#endif
diff --git a/drm/nouveau/nvkm/subdev/clk/gm20b.c b/drm/nouveau/nvkm/subdev/clk/gm20b.c
index 436ca53c6..4c5c19865 100644
--- a/drm/nouveau/nvkm/subdev/clk/gm20b.c
+++ b/drm/nouveau/nvkm/subdev/clk/gm20b.c
@@ -945,8 +945,8 @@ gm20b_clk_calc(struct nvkm_clk *base, struct nvkm_cstate *cstate)
struct gm20b_clk *clk = gm20b_clk(base);
int ret;
- ret = gk20a_pllg_calc_mnp(&clk->base, cstate->domain[nv_clk_src_gpc] *
- GM20B_CLK_GPC_MDIV);
+ ret = gk20a_clk_calc(base, cstate);
+
if (!ret)
clk->vid = cstate->voltage;