diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:06 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:07 +1000 |
| commit | 266f8b5ee6e98979f3251efc81451a2a2cbf2a28 (patch) | |
| tree | 560205371034f8c3f8d56f9c28eff35a40ea0aaa /drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | |
| parent | 3eca809b3c05ea6918c1d13da478abdae5e712ba (diff) | |
| download | op-kernel-dev-266f8b5ee6e98979f3251efc81451a2a2cbf2a28.zip op-kernel-dev-266f8b5ee6e98979f3251efc81451a2a2cbf2a28.tar.gz | |
drm/nouveau/devinit: cosmetic changes
This is purely preparation for upcoming commits, there should be no
code changes here.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c index c61102f..b6eb254 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c @@ -31,8 +31,8 @@ int gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) { - struct nv50_devinit_priv *priv = (void *)devinit; - struct nvkm_bios *bios = nvkm_bios(priv); + struct nv50_devinit *init = (void *)devinit; + struct nvkm_bios *bios = nvkm_bios(init); struct nvbios_pll info; int N, fN, M, P; int ret; @@ -50,12 +50,12 @@ gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) case PLL_VPLL1: case PLL_VPLL2: case PLL_VPLL3: - nv_mask(priv, info.reg + 0x0c, 0x00000000, 0x00000100); - nv_wr32(priv, info.reg + 0x04, (P << 16) | (N << 8) | M); - nv_wr32(priv, info.reg + 0x10, fN << 16); + nv_mask(init, info.reg + 0x0c, 0x00000000, 0x00000100); + nv_wr32(init, info.reg + 0x04, (P << 16) | (N << 8) | M); + nv_wr32(init, info.reg + 0x10, fN << 16); break; default: - nv_warn(priv, "0x%08x/%dKhz unimplemented\n", type, freq); + nv_warn(init, "0x%08x/%dKhz unimplemented\n", type, freq); ret = -EINVAL; break; } @@ -66,8 +66,8 @@ gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) static u64 gf100_devinit_disable(struct nvkm_devinit *devinit) { - struct nv50_devinit_priv *priv = (void *)devinit; - u32 r022500 = nv_rd32(priv, 0x022500); + struct nv50_devinit *init = (void *)devinit; + u32 r022500 = nv_rd32(init, 0x022500); u64 disable = 0ULL; if (r022500 & 0x00000001) @@ -96,18 +96,18 @@ gf100_devinit_ctor(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_object **pobject) { struct nvkm_devinit_impl *impl = (void *)oclass; - struct nv50_devinit_priv *priv; + struct nv50_devinit *init; u64 disable; int ret; - ret = nvkm_devinit_create(parent, engine, oclass, &priv); - *pobject = nv_object(priv); + ret = nvkm_devinit_create(parent, engine, oclass, &init); + *pobject = nv_object(init); if (ret) return ret; - disable = impl->disable(&priv->base); + disable = impl->disable(&init->base); if (disable & (1ULL << NVDEV_ENGINE_DISP)) - priv->base.post = true; + init->base.post = true; return 0; } |
