diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:23 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:38:37 +1000 |
| commit | f9215d7183c55e1787f7a33f784409b7c406f12d (patch) | |
| tree | 89a644dd2cf5c9c418804efea4fca03ee36eb6cd /drm/nouveau/nvkm/subdev/clk/gk20a.c | |
| parent | 9c38b4f8d3f0fa685da802bc511d89a35215c45f (diff) | |
| download | nouveau-f9215d7183c55e1787f7a33f784409b7c406f12d.tar.gz | |
tegra: merge platform setup from nouveau drm
The copyright header in nvkm/engine/device/platform.c has been replaced
with the NVIDIA one from drm/nouveau_platform.c, as most of the actual
code is now theirs.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/subdev/clk/gk20a.c')
| -rw-r--r-- | drm/nouveau/nvkm/subdev/clk/gk20a.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drm/nouveau/nvkm/subdev/clk/gk20a.c b/drm/nouveau/nvkm/subdev/clk/gk20a.c index 6a74ce373..254094ab7 100644 --- a/drm/nouveau/nvkm/subdev/clk/gk20a.c +++ b/drm/nouveau/nvkm/subdev/clk/gk20a.c @@ -25,12 +25,9 @@ #define gk20a_clk(p) container_of((p), struct gk20a_clk, base) #include "priv.h" +#include <core/tegra.h> #include <subdev/timer.h> -#ifdef __KERNEL__ -#include <nouveau_platform.h> -#endif - #define MHZ (1000 * 1000) #define MASK(w) ((1 << w) - 1) @@ -649,6 +646,7 @@ gk20a_clk = { int gk20a_clk_new(struct nvkm_device *device, int index, struct nvkm_clk **pclk) { + struct nvkm_device_tegra *tdev = device->func->tegra(device); struct gk20a_clk *clk; int ret, i; @@ -663,7 +661,7 @@ gk20a_clk_new(struct nvkm_device *device, int index, struct nvkm_clk **pclk) } clk->params = &gk20a_pllg_params; - clk->parent_rate = clk_get_rate(device->gpu->clk); + clk->parent_rate = clk_get_rate(tdev->clk); ret = nvkm_clk_ctor(&gk20a_clk, device, index, true, &clk->base); nvkm_info(&clk->base.subdev, "parent clock rate: %d Mhz\n", |