evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nouveau/devinit: cosmetic changes

Browse source 
This is purely preparation for upcoming commits, there should be no
code changes here.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2015-08-20 14:54:06 +10:00
parent 3eca809b3c
commit 266f8b5ee6
16 changed files with 204 additions and 204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
View file

@ -3,7 +3,7 @@
#include <core/subdev.h> #include <core/subdev.h>
struct nvkm_devinit { struct nvkm_devinit {
struct nvkm_subdev base; struct nvkm_subdev subdev;
bool post; bool post;
void (*meminit)(struct nvkm_devinit *); void (*meminit)(struct nvkm_devinit *);
int (*pll_set)(struct nvkm_devinit *, u32 type, u32 freq); int (*pll_set)(struct nvkm_devinit *, u32 type, u32 freq);

34
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c
View file

@ -29,47 +29,47 @@
int int
_nvkm_devinit_fini(struct nvkm_object *object, bool suspend) _nvkm_devinit_fini(struct nvkm_object *object, bool suspend)
{ {
struct nvkm_devinit *devinit = (void *)object; struct nvkm_devinit *init = (void *)object;
/* force full reinit on resume */ /* force full reinit on resume */
if (suspend) if (suspend)
devinit->post = true; init->post = true;
/* unlock the extended vga crtc regs */ /* unlock the extended vga crtc regs */
nv_lockvgac(devinit, false); nv_lockvgac(init, false);
return nvkm_subdev_fini(&devinit->base, suspend); return nvkm_subdev_fini(&init->subdev, suspend);
} }
int int
_nvkm_devinit_init(struct nvkm_object *object) _nvkm_devinit_init(struct nvkm_object *object)
{ {
struct nvkm_devinit_impl *impl = (void *)object->oclass; struct nvkm_devinit_impl *impl = (void *)object->oclass;
struct nvkm_devinit *devinit = (void *)object; struct nvkm_devinit *init = (void *)object;
int ret; int ret;
ret = nvkm_subdev_init(&devinit->base); ret = nvkm_subdev_init(&init->subdev);
if (ret) if (ret)
return ret; return ret;
ret = impl->post(&devinit->base, devinit->post); ret = impl->post(&init->subdev, init->post);
if (ret) if (ret)
return ret; return ret;
if (impl->disable) if (impl->disable)
nv_device(devinit)->disable_mask |= impl->disable(devinit); nv_device(init)->disable_mask |= impl->disable(init);
return 0; return 0;
} }
void void
_nvkm_devinit_dtor(struct nvkm_object *object) _nvkm_devinit_dtor(struct nvkm_object *object)
{ {
struct nvkm_devinit *devinit = (void *)object; struct nvkm_devinit *init = (void *)object;
/* lock crtc regs */ /* lock crtc regs */
nv_lockvgac(devinit, true); nv_lockvgac(init, true);
nvkm_subdev_destroy(&devinit->base); nvkm_subdev_destroy(&init->subdev);
} }
int int
@ -78,18 +78,18 @@ nvkm_devinit_create_(struct nvkm_object *parent, struct nvkm_object *engine,
{ {
struct nvkm_devinit_impl *impl = (void *)oclass; struct nvkm_devinit_impl *impl = (void *)oclass;
struct nvkm_device *device = nv_device(parent); struct nvkm_device *device = nv_device(parent);
struct nvkm_devinit *devinit; struct nvkm_devinit *init;
int ret; int ret;
ret = nvkm_subdev_create_(parent, engine, oclass, 0, "DEVINIT", ret = nvkm_subdev_create_(parent, engine, oclass, 0, "DEVINIT",
"init", size, pobject); "init", size, pobject);
devinit = *pobject; init = *pobject;
if (ret) if (ret)
return ret; return ret;
devinit->post = nvkm_boolopt(device->cfgopt, "NvForcePost", false); init->post = nvkm_boolopt(device->cfgopt, "NvForcePost", false);
devinit->meminit = impl->meminit; init->meminit = impl->meminit;
devinit->pll_set = impl->pll_set; init->pll_set = impl->pll_set;
devinit->mmio = impl->mmio; init->mmio = impl->mmio;
return 0; return 0;
} }

6
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
View file

@ -29,9 +29,9 @@
static u64 static u64
g84_devinit_disable(struct nvkm_devinit *devinit) g84_devinit_disable(struct nvkm_devinit *devinit)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
u32 r001540 = nv_rd32(priv, 0x001540); u32 r001540 = nv_rd32(init, 0x001540);
u32 r00154c = nv_rd32(priv, 0x00154c); u32 r00154c = nv_rd32(init, 0x00154c);
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {

6
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
View file

@ -29,9 +29,9 @@
static u64 static u64
g98_devinit_disable(struct nvkm_devinit *devinit) g98_devinit_disable(struct nvkm_devinit *devinit)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
u32 r001540 = nv_rd32(priv, 0x001540); u32 r001540 = nv_rd32(init, 0x001540);
u32 r00154c = nv_rd32(priv, 0x00154c); u32 r00154c = nv_rd32(init, 0x00154c);
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {

26
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
View file

@ -31,8 +31,8 @@
int int
gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
struct nvkm_bios *bios = nvkm_bios(priv); struct nvkm_bios *bios = nvkm_bios(init);
struct nvbios_pll info; struct nvbios_pll info;
int N, fN, M, P; int N, fN, M, P;
int ret; int ret;
@ -50,12 +50,12 @@ gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)
case PLL_VPLL1: case PLL_VPLL1:
case PLL_VPLL2: case PLL_VPLL2:
case PLL_VPLL3: case PLL_VPLL3:
nv_mask(priv, info.reg + 0x0c, 0x00000000, 0x00000100); nv_mask(init, info.reg + 0x0c, 0x00000000, 0x00000100);
nv_wr32(priv, info.reg + 0x04, (P << 16) | (N << 8) | M); nv_wr32(init, info.reg + 0x04, (P << 16) | (N << 8) | M);
nv_wr32(priv, info.reg + 0x10, fN << 16); nv_wr32(init, info.reg + 0x10, fN << 16);
break; break;
default: default:
nv_warn(priv, "0x%08x/%dKhz unimplemented\n", type, freq); nv_warn(init, "0x%08x/%dKhz unimplemented\n", type, freq);
ret = -EINVAL; ret = -EINVAL;
break; break;
} }
@ -66,8 +66,8 @@ gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)
static u64 static u64
gf100_devinit_disable(struct nvkm_devinit *devinit) gf100_devinit_disable(struct nvkm_devinit *devinit)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
u32 r022500 = nv_rd32(priv, 0x022500); u32 r022500 = nv_rd32(init, 0x022500);
u64 disable = 0ULL; u64 disable = 0ULL;
if (r022500 & 0x00000001) if (r022500 & 0x00000001)
@ -96,18 +96,18 @@ gf100_devinit_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct nvkm_devinit_impl *impl = (void *)oclass; struct nvkm_devinit_impl *impl = (void *)oclass;
struct nv50_devinit_priv *priv; struct nv50_devinit *init;
u64 disable; u64 disable;
int ret; int ret;
ret = nvkm_devinit_create(parent, engine, oclass, &priv); ret = nvkm_devinit_create(parent, engine, oclass, &init);
*pobject = nv_object(priv); *pobject = nv_object(init);
if (ret) if (ret)
return ret; return ret;
disable = impl->disable(&priv->base); disable = impl->disable(&init->base);
if (disable & (1ULL << NVDEV_ENGINE_DISP)) if (disable & (1ULL << NVDEV_ENGINE_DISP))
priv->base.post = true; init->base.post = true;
return 0; return 0;
} }

6
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
View file

@ -29,9 +29,9 @@
u64 u64
gm107_devinit_disable(struct nvkm_devinit *devinit) gm107_devinit_disable(struct nvkm_devinit *devinit)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
u32 r021c00 = nv_rd32(priv, 0x021c00); u32 r021c00 = nv_rd32(init, 0x021c00);
u32 r021c04 = nv_rd32(priv, 0x021c04); u32 r021c04 = nv_rd32(init, 0x021c04);
u64 disable = 0ULL; u64 disable = 0ULL;
if (r021c00 & 0x00000001) if (r021c00 & 0x00000001)

84
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c
View file

@ -28,69 +28,69 @@
#include <subdev/bios/pmu.h> #include <subdev/bios/pmu.h>
static void static void
pmu_code(struct nv50_devinit_priv *priv, u32 pmu, u32 img, u32 len, bool sec) pmu_code(struct nv50_devinit *init, u32 pmu, u32 img, u32 len, bool sec)
{ {
struct nvkm_bios *bios = nvkm_bios(priv); struct nvkm_bios *bios = nvkm_bios(init);
int i; int i;
nv_wr32(priv, 0x10a180, 0x01000000 | (sec ? 0x10000000 : 0) | pmu); nv_wr32(init, 0x10a180, 0x01000000 | (sec ? 0x10000000 : 0) | pmu);
for (i = 0; i < len; i += 4) { for (i = 0; i < len; i += 4) {
if ((i & 0xff) == 0) if ((i & 0xff) == 0)
nv_wr32(priv, 0x10a188, (pmu + i) >> 8); nv_wr32(init, 0x10a188, (pmu + i) >> 8);
nv_wr32(priv, 0x10a184, nv_ro32(bios, img + i)); nv_wr32(init, 0x10a184, nv_ro32(bios, img + i));
} }
while (i & 0xff) { while (i & 0xff) {
nv_wr32(priv, 0x10a184, 0x00000000); nv_wr32(init, 0x10a184, 0x00000000);
i += 4; i += 4;
} }
} }
static void static void
pmu_data(struct nv50_devinit_priv *priv, u32 pmu, u32 img, u32 len) pmu_data(struct nv50_devinit *init, u32 pmu, u32 img, u32 len)
{ {
struct nvkm_bios *bios = nvkm_bios(priv); struct nvkm_bios *bios = nvkm_bios(init);
int i; int i;
nv_wr32(priv, 0x10a1c0, 0x01000000 | pmu); nv_wr32(init, 0x10a1c0, 0x01000000 | pmu);
for (i = 0; i < len; i += 4) for (i = 0; i < len; i += 4)
nv_wr32(priv, 0x10a1c4, nv_ro32(bios, img + i)); nv_wr32(init, 0x10a1c4, nv_ro32(bios, img + i));
} }
static u32 static u32
pmu_args(struct nv50_devinit_priv *priv, u32 argp, u32 argi) pmu_args(struct nv50_devinit *init, u32 argp, u32 argi)
{ {
nv_wr32(priv, 0x10a1c0, argp); nv_wr32(init, 0x10a1c0, argp);
nv_wr32(priv, 0x10a1c0, nv_rd32(priv, 0x10a1c4) + argi); nv_wr32(init, 0x10a1c0, nv_rd32(init, 0x10a1c4) + argi);
return nv_rd32(priv, 0x10a1c4); return nv_rd32(init, 0x10a1c4);
} }
static void static void
pmu_exec(struct nv50_devinit_priv *priv, u32 init_addr) pmu_exec(struct nv50_devinit *init, u32 init_addr)
{ {
nv_wr32(priv, 0x10a104, init_addr); nv_wr32(init, 0x10a104, init_addr);
nv_wr32(priv, 0x10a10c, 0x00000000); nv_wr32(init, 0x10a10c, 0x00000000);
nv_wr32(priv, 0x10a100, 0x00000002); nv_wr32(init, 0x10a100, 0x00000002);
} }
static int static int
pmu_load(struct nv50_devinit_priv *priv, u8 type, bool post, pmu_load(struct nv50_devinit *init, u8 type, bool post,
u32 *init_addr_pmu, u32 *args_addr_pmu) u32 *init_addr_pmu, u32 *args_addr_pmu)
{ {
struct nvkm_bios *bios = nvkm_bios(priv); struct nvkm_bios *bios = nvkm_bios(init);
struct nvbios_pmuR pmu; struct nvbios_pmuR pmu;
if (!nvbios_pmuRm(bios, type, &pmu)) { if (!nvbios_pmuRm(bios, type, &pmu)) {
nv_error(priv, "VBIOS PMU fuc %02x not found\n", type); nv_error(init, "VBIOS PMU fuc %02x not found\n", type);
return -EINVAL; return -EINVAL;
} }
if (!post) if (!post)
return 0; return 0;
pmu_code(priv, pmu.boot_addr_pmu, pmu.boot_addr, pmu.boot_size, false); pmu_code(init, pmu.boot_addr_pmu, pmu.boot_addr, pmu.boot_size, false);
pmu_code(priv, pmu.code_addr_pmu, pmu.code_addr, pmu.code_size, true); pmu_code(init, pmu.code_addr_pmu, pmu.code_addr, pmu.code_size, true);
pmu_data(priv, pmu.data_addr_pmu, pmu.data_addr, pmu.data_size); pmu_data(init, pmu.data_addr_pmu, pmu.data_addr, pmu.data_size);
if (init_addr_pmu) { if (init_addr_pmu) {
*init_addr_pmu = pmu.init_addr_pmu; *init_addr_pmu = pmu.init_addr_pmu;
@ -98,63 +98,63 @@ pmu_load(struct nv50_devinit_priv *priv, u8 type, bool post,
return 0; return 0;
} }
return pmu_exec(priv, pmu.init_addr_pmu), 0; return pmu_exec(init, pmu.init_addr_pmu), 0;
} }
static int static int
gm204_devinit_post(struct nvkm_subdev *subdev, bool post) gm204_devinit_post(struct nvkm_subdev *subdev, bool post)
{ {
struct nv50_devinit_priv *priv = (void *)nvkm_devinit(subdev); struct nv50_devinit *init = (void *)nvkm_devinit(subdev);
struct nvkm_bios *bios = nvkm_bios(priv); struct nvkm_bios *bios = nvkm_bios(init);
struct bit_entry bit_I; struct bit_entry bit_I;
u32 init, args; u32 exec, args;
int ret; int ret;
if (bit_entry(bios, 'I', &bit_I) || bit_I.version != 1 || if (bit_entry(bios, 'I', &bit_I) || bit_I.version != 1 ||
bit_I.length < 0x1c) { bit_I.length < 0x1c) {
nv_error(priv, "VBIOS PMU init data not found\n"); nv_error(init, "VBIOS PMU init data not found\n");
return -EINVAL; return -EINVAL;
} }
/* reset PMU and load init table parser ucode */ /* reset PMU and load init table parser ucode */
if (post) { if (post) {
nv_mask(priv, 0x000200, 0x00002000, 0x00000000); nv_mask(init, 0x000200, 0x00002000, 0x00000000);
nv_mask(priv, 0x000200, 0x00002000, 0x00002000); nv_mask(init, 0x000200, 0x00002000, 0x00002000);
nv_rd32(priv, 0x000200); nv_rd32(init, 0x000200);
while (nv_rd32(priv, 0x10a10c) & 0x00000006) { while (nv_rd32(init, 0x10a10c) & 0x00000006) {
} }
} }
ret = pmu_load(priv, 0x04, post, &init, &args); ret = pmu_load(init, 0x04, post, &exec, &args);
if (ret) if (ret)
return ret; return ret;
/* upload first chunk of init data */ /* upload first chunk of init data */
if (post) { if (post) {
u32 pmu = pmu_args(priv, args + 0x08, 0x08); u32 pmu = pmu_args(init, args + 0x08, 0x08);
u32 img = nv_ro16(bios, bit_I.offset + 0x14); u32 img = nv_ro16(bios, bit_I.offset + 0x14);
u32 len = nv_ro16(bios, bit_I.offset + 0x16); u32 len = nv_ro16(bios, bit_I.offset + 0x16);
pmu_data(priv, pmu, img, len); pmu_data(init, pmu, img, len);
} }
/* upload second chunk of init data */ /* upload second chunk of init data */
if (post) { if (post) {
u32 pmu = pmu_args(priv, args + 0x08, 0x10); u32 pmu = pmu_args(init, args + 0x08, 0x10);
u32 img = nv_ro16(bios, bit_I.offset + 0x18); u32 img = nv_ro16(bios, bit_I.offset + 0x18);
u32 len = nv_ro16(bios, bit_I.offset + 0x1a); u32 len = nv_ro16(bios, bit_I.offset + 0x1a);
pmu_data(priv, pmu, img, len); pmu_data(init, pmu, img, len);
} }
/* execute init tables */ /* execute init tables */
if (post) { if (post) {
nv_wr32(priv, 0x10a040, 0x00005000); nv_wr32(init, 0x10a040, 0x00005000);
pmu_exec(priv, init); pmu_exec(init, exec);
while (!(nv_rd32(priv, 0x10a040) & 0x00002000)) { while (!(nv_rd32(init, 0x10a040) & 0x00002000)) {
} }
} }
/* load and execute some other ucode image (bios therm?) */ /* load and execute some other ucode image (bios therm?) */
return pmu_load(priv, 0x01, post, NULL, NULL); return pmu_load(init, 0x01, post, NULL, NULL);
} }
struct nvkm_oclass * struct nvkm_oclass *

28
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c
View file

@ -31,8 +31,8 @@
int int
gt215_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) gt215_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
struct nvkm_bios *bios = nvkm_bios(priv); struct nvkm_bios *bios = nvkm_bios(init);
struct nvbios_pll info; struct nvbios_pll info;
int N, fN, M, P; int N, fN, M, P;
int ret; int ret;
@ -48,13 +48,13 @@ gt215_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)
switch (info.type) { switch (info.type) {
case PLL_VPLL0: case PLL_VPLL0:
case PLL_VPLL1: case PLL_VPLL1:
nv_wr32(priv, info.reg + 0, 0x50000610); nv_wr32(init, info.reg + 0, 0x50000610);
nv_mask(priv, info.reg + 4, 0x003fffff, nv_mask(init, info.reg + 4, 0x003fffff,
(P << 16) | (M << 8) | N); (P << 16) | (M << 8) | N);
nv_wr32(priv, info.reg + 8, fN); nv_wr32(init, info.reg + 8, fN);
break; break;
default: default:
nv_warn(priv, "0x%08x/%dKhz unimplemented\n", type, freq); nv_warn(init, "0x%08x/%dKhz unimplemented\n", type, freq);
ret = -EINVAL; ret = -EINVAL;
break; break;
} }
@ -65,9 +65,9 @@ gt215_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)
static u64 static u64
gt215_devinit_disable(struct nvkm_devinit *devinit) gt215_devinit_disable(struct nvkm_devinit *devinit)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
u32 r001540 = nv_rd32(priv, 0x001540); u32 r001540 = nv_rd32(init, 0x001540);
u32 r00154c = nv_rd32(priv, 0x00154c); u32 r00154c = nv_rd32(init, 0x00154c);
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {
@ -101,7 +101,7 @@ gt215_devinit_mmio_part[] = {
static u32 static u32
gt215_devinit_mmio(struct nvkm_devinit *devinit, u32 addr) gt215_devinit_mmio(struct nvkm_devinit *devinit, u32 addr)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
u32 *mmio = gt215_devinit_mmio_part; u32 *mmio = gt215_devinit_mmio_part;
/* the init tables on some boards have INIT_RAM_RESTRICT_ZM_REG_GROUP /* the init tables on some boards have INIT_RAM_RESTRICT_ZM_REG_GROUP
@ -113,7 +113,7 @@ gt215_devinit_mmio(struct nvkm_devinit *devinit, u32 addr)
* *
* the binary driver avoids touching these registers at all, however, * the binary driver avoids touching these registers at all, however,
* the video bios doesn't care and does what the scripts say. it's * the video bios doesn't care and does what the scripts say. it's
* presumed that the io-port access to priv registers isn't effected * presumed that the io-port access to init registers isn't effected
* by the screw-up bug mentioned above. * by the screw-up bug mentioned above.
* *
* really, a new opcode should've been invented to handle these * really, a new opcode should've been invented to handle these
@ -122,9 +122,9 @@ gt215_devinit_mmio(struct nvkm_devinit *devinit, u32 addr)
while (mmio[0]) { while (mmio[0]) {
if (addr >= mmio[0] && addr <= mmio[1]) { if (addr >= mmio[0] && addr <= mmio[1]) {
u32 part = (addr / mmio[2]) & 7; u32 part = (addr / mmio[2]) & 7;
if (!priv->r001540) if (!init->r001540)
priv->r001540 = nv_rd32(priv, 0x001540); init->r001540 = nv_rd32(init, 0x001540);
if (part >= hweight8((priv->r001540 >> 16) & 0xff)) if (part >= hweight8((init->r001540 >> 16) & 0xff))
return ~0; return ~0;
return addr; return addr;
} }

6
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c
View file

@ -29,9 +29,9 @@
static u64 static u64
mcp89_devinit_disable(struct nvkm_devinit *devinit) mcp89_devinit_disable(struct nvkm_devinit *devinit)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
u32 r001540 = nv_rd32(priv, 0x001540); u32 r001540 = nv_rd32(init, 0x001540);
u32 r00154c = nv_rd32(priv, 0x00154c); u32 r00154c = nv_rd32(init, 0x00154c);
u64 disable = 0; u64 disable = 0;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {

78
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
View file

@ -35,23 +35,23 @@
static void static void
nv04_devinit_meminit(struct nvkm_devinit *devinit) nv04_devinit_meminit(struct nvkm_devinit *devinit)
{ {
struct nv04_devinit_priv *priv = (void *)devinit; struct nv04_devinit *init = (void *)devinit;
u32 patt = 0xdeadbeef; u32 patt = 0xdeadbeef;
struct io_mapping *fb; struct io_mapping *fb;
int i; int i;
/* Map the framebuffer aperture */ /* Map the framebuffer aperture */
fb = fbmem_init(nv_device(priv)); fb = fbmem_init(nv_device(init));
if (!fb) { if (!fb) {
nv_error(priv, "failed to map fb\n"); nv_error(init, "failed to map fb\n");
return; return;
} }
/* Sequencer and refresh off */ /* Sequencer and refresh off */
nv_wrvgas(priv, 0, 1, nv_rdvgas(priv, 0, 1) | 0x20); nv_wrvgas(init, 0, 1, nv_rdvgas(init, 0, 1) | 0x20);
nv_mask(priv, NV04_PFB_DEBUG_0, 0, NV04_PFB_DEBUG_0_REFRESH_OFF); nv_mask(init, NV04_PFB_DEBUG_0, 0, NV04_PFB_DEBUG_0_REFRESH_OFF);
nv_mask(priv, NV04_PFB_BOOT_0, ~0, nv_mask(init, NV04_PFB_BOOT_0, ~0,
NV04_PFB_BOOT_0_RAM_AMOUNT_16MB | NV04_PFB_BOOT_0_RAM_AMOUNT_16MB |
NV04_PFB_BOOT_0_RAM_WIDTH_128 | NV04_PFB_BOOT_0_RAM_WIDTH_128 |
NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT); NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_16MBIT);
@ -62,49 +62,49 @@ nv04_devinit_meminit(struct nvkm_devinit *devinit)
fbmem_poke(fb, 0x400000, patt + 1); fbmem_poke(fb, 0x400000, patt + 1);
if (fbmem_peek(fb, 0) == patt + 1) { if (fbmem_peek(fb, 0) == patt + 1) {
nv_mask(priv, NV04_PFB_BOOT_0, nv_mask(init, NV04_PFB_BOOT_0,
NV04_PFB_BOOT_0_RAM_TYPE, NV04_PFB_BOOT_0_RAM_TYPE,
NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_16MBIT); NV04_PFB_BOOT_0_RAM_TYPE_SDRAM_16MBIT);
nv_mask(priv, NV04_PFB_DEBUG_0, nv_mask(init, NV04_PFB_DEBUG_0,
NV04_PFB_DEBUG_0_REFRESH_OFF, 0); NV04_PFB_DEBUG_0_REFRESH_OFF, 0);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
fbmem_poke(fb, 4 * i, patt); fbmem_poke(fb, 4 * i, patt);
if ((fbmem_peek(fb, 0xc) & 0xffff) != (patt & 0xffff)) if ((fbmem_peek(fb, 0xc) & 0xffff) != (patt & 0xffff))
nv_mask(priv, NV04_PFB_BOOT_0, nv_mask(init, NV04_PFB_BOOT_0,
NV04_PFB_BOOT_0_RAM_WIDTH_128 | NV04_PFB_BOOT_0_RAM_WIDTH_128 |
NV04_PFB_BOOT_0_RAM_AMOUNT, NV04_PFB_BOOT_0_RAM_AMOUNT,
NV04_PFB_BOOT_0_RAM_AMOUNT_8MB); NV04_PFB_BOOT_0_RAM_AMOUNT_8MB);
} else } else
if ((fbmem_peek(fb, 0xc) & 0xffff0000) != (patt & 0xffff0000)) { if ((fbmem_peek(fb, 0xc) & 0xffff0000) != (patt & 0xffff0000)) {
nv_mask(priv, NV04_PFB_BOOT_0, nv_mask(init, NV04_PFB_BOOT_0,
NV04_PFB_BOOT_0_RAM_WIDTH_128 | NV04_PFB_BOOT_0_RAM_WIDTH_128 |
NV04_PFB_BOOT_0_RAM_AMOUNT, NV04_PFB_BOOT_0_RAM_AMOUNT,
NV04_PFB_BOOT_0_RAM_AMOUNT_4MB); NV04_PFB_BOOT_0_RAM_AMOUNT_4MB);
} else } else
if (fbmem_peek(fb, 0) != patt) { if (fbmem_peek(fb, 0) != patt) {
if (fbmem_readback(fb, 0x800000, patt)) if (fbmem_readback(fb, 0x800000, patt))
nv_mask(priv, NV04_PFB_BOOT_0, nv_mask(init, NV04_PFB_BOOT_0,
NV04_PFB_BOOT_0_RAM_AMOUNT, NV04_PFB_BOOT_0_RAM_AMOUNT,
NV04_PFB_BOOT_0_RAM_AMOUNT_8MB); NV04_PFB_BOOT_0_RAM_AMOUNT_8MB);
else else
nv_mask(priv, NV04_PFB_BOOT_0, nv_mask(init, NV04_PFB_BOOT_0,
NV04_PFB_BOOT_0_RAM_AMOUNT, NV04_PFB_BOOT_0_RAM_AMOUNT,
NV04_PFB_BOOT_0_RAM_AMOUNT_4MB); NV04_PFB_BOOT_0_RAM_AMOUNT_4MB);
nv_mask(priv, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_TYPE, nv_mask(init, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_TYPE,
NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_8MBIT); NV04_PFB_BOOT_0_RAM_TYPE_SGRAM_8MBIT);
} else } else
if (!fbmem_readback(fb, 0x800000, patt)) { if (!fbmem_readback(fb, 0x800000, patt)) {
nv_mask(priv, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT, nv_mask(init, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT,
NV04_PFB_BOOT_0_RAM_AMOUNT_8MB); NV04_PFB_BOOT_0_RAM_AMOUNT_8MB);
} }
/* Refresh on, sequencer on */ /* Refresh on, sequencer on */
nv_mask(priv, NV04_PFB_DEBUG_0, NV04_PFB_DEBUG_0_REFRESH_OFF, 0); nv_mask(init, NV04_PFB_DEBUG_0, NV04_PFB_DEBUG_0_REFRESH_OFF, 0);
nv_wrvgas(priv, 0, 1, nv_rdvgas(priv, 0, 1) & ~0x20); nv_wrvgas(init, 0, 1, nv_rdvgas(init, 0, 1) & ~0x20);
fbmem_fini(fb); fbmem_fini(fb);
} }
@ -390,52 +390,52 @@ nv04_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)
int int
nv04_devinit_fini(struct nvkm_object *object, bool suspend) nv04_devinit_fini(struct nvkm_object *object, bool suspend)
{ {
struct nv04_devinit_priv *priv = (void *)object; struct nv04_devinit *init = (void *)object;
int ret; int ret;
/* make i2c busses accessible */ /* make i2c busses accessible */
nv_mask(priv, 0x000200, 0x00000001, 0x00000001); nv_mask(init, 0x000200, 0x00000001, 0x00000001);
ret = nvkm_devinit_fini(&priv->base, suspend); ret = nvkm_devinit_fini(&init->base, suspend);
if (ret) if (ret)
return ret; return ret;
/* unslave crtcs */ /* unslave crtcs */
if (priv->owner < 0) if (init->owner < 0)
priv->owner = nv_rdvgaowner(priv); init->owner = nv_rdvgaowner(init);
nv_wrvgaowner(priv, 0); nv_wrvgaowner(init, 0);
return 0; return 0;
} }
int int
nv04_devinit_init(struct nvkm_object *object) nv04_devinit_init(struct nvkm_object *object)
{ {
struct nv04_devinit_priv *priv = (void *)object; struct nv04_devinit *init = (void *)object;
if (!priv->base.post) { if (!init->base.post) {
u32 htotal = nv_rdvgac(priv, 0, 0x06); u32 htotal = nv_rdvgac(init, 0, 0x06);
htotal |= (nv_rdvgac(priv, 0, 0x07) & 0x01) << 8; htotal |= (nv_rdvgac(init, 0, 0x07) & 0x01) << 8;
htotal |= (nv_rdvgac(priv, 0, 0x07) & 0x20) << 4; htotal |= (nv_rdvgac(init, 0, 0x07) & 0x20) << 4;
htotal |= (nv_rdvgac(priv, 0, 0x25) & 0x01) << 10; htotal |= (nv_rdvgac(init, 0, 0x25) & 0x01) << 10;
htotal |= (nv_rdvgac(priv, 0, 0x41) & 0x01) << 11; htotal |= (nv_rdvgac(init, 0, 0x41) & 0x01) << 11;
if (!htotal) { if (!htotal) {
nv_info(priv, "adaptor not initialised\n"); nv_info(init, "adaptor not initialised\n");
priv->base.post = true; init->base.post = true;
} }
} }
return nvkm_devinit_init(&priv->base); return nvkm_devinit_init(&init->base);
} }
void void
nv04_devinit_dtor(struct nvkm_object *object) nv04_devinit_dtor(struct nvkm_object *object)
{ {
struct nv04_devinit_priv *priv = (void *)object; struct nv04_devinit *init = (void *)object;
/* restore vga owner saved at first init */ /* restore vga owner saved at first init */
nv_wrvgaowner(priv, priv->owner); nv_wrvgaowner(init, init->owner);
nvkm_devinit_destroy(&priv->base); nvkm_devinit_destroy(&init->base);
} }
int int
@ -443,15 +443,15 @@ nv04_devinit_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct nv04_devinit_priv *priv; struct nv04_devinit *init;
int ret; int ret;
ret = nvkm_devinit_create(parent, engine, oclass, &priv); ret = nvkm_devinit_create(parent, engine, oclass, &init);
*pobject = nv_object(priv); *pobject = nv_object(init);
if (ret) if (ret)
return ret; return ret;
priv->owner = -1; init->owner = -1;
return 0; return 0;
} }

2
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.h
View file

@ -3,7 +3,7 @@
#include "priv.h" #include "priv.h"
struct nvkm_pll_vals; struct nvkm_pll_vals;
struct nv04_devinit_priv { struct nv04_devinit {
struct nvkm_devinit base; struct nvkm_devinit base;
int owner; int owner;
}; };

38
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
View file

@ -44,8 +44,8 @@ nv05_devinit_meminit(struct nvkm_devinit *devinit)
{ 0x06, 0x00 }, { 0x06, 0x00 },
{ 0x00, 0x00 } { 0x00, 0x00 }
}; };
struct nv04_devinit_priv *priv = (void *)devinit; struct nv04_devinit *init = (void *)devinit;
struct nvkm_bios *bios = nvkm_bios(priv); struct nvkm_bios *bios = nvkm_bios(init);
struct io_mapping *fb; struct io_mapping *fb;
u32 patt = 0xdeadbeef; u32 patt = 0xdeadbeef;
u16 data; u16 data;
@ -53,13 +53,13 @@ nv05_devinit_meminit(struct nvkm_devinit *devinit)
int i, v; int i, v;
/* Map the framebuffer aperture */ /* Map the framebuffer aperture */
fb = fbmem_init(nv_device(priv)); fb = fbmem_init(nv_device(init));
if (!fb) { if (!fb) {
nv_error(priv, "failed to map fb\n"); nv_error(init, "failed to map fb\n");
return; return;
} }
strap = (nv_rd32(priv, 0x101000) & 0x0000003c) >> 2; strap = (nv_rd32(init, 0x101000) & 0x0000003c) >> 2;
if ((data = bmp_mem_init_table(bios))) { if ((data = bmp_mem_init_table(bios))) {
ramcfg[0] = nv_ro08(bios, data + 2 * strap + 0); ramcfg[0] = nv_ro08(bios, data + 2 * strap + 0);
ramcfg[1] = nv_ro08(bios, data + 2 * strap + 1); ramcfg[1] = nv_ro08(bios, data + 2 * strap + 1);
@ -69,59 +69,59 @@ nv05_devinit_meminit(struct nvkm_devinit *devinit)
} }
/* Sequencer off */ /* Sequencer off */
nv_wrvgas(priv, 0, 1, nv_rdvgas(priv, 0, 1) | 0x20); nv_wrvgas(init, 0, 1, nv_rdvgas(init, 0, 1) | 0x20);
if (nv_rd32(priv, NV04_PFB_BOOT_0) & NV04_PFB_BOOT_0_UMA_ENABLE) if (nv_rd32(init, NV04_PFB_BOOT_0) & NV04_PFB_BOOT_0_UMA_ENABLE)
goto out; goto out;
nv_mask(priv, NV04_PFB_DEBUG_0, NV04_PFB_DEBUG_0_REFRESH_OFF, 0); nv_mask(init, NV04_PFB_DEBUG_0, NV04_PFB_DEBUG_0_REFRESH_OFF, 0);
/* If present load the hardcoded scrambling table */ /* If present load the hardcoded scrambling table */
if (data) { if (data) {
for (i = 0, data += 0x10; i < 8; i++, data += 4) { for (i = 0, data += 0x10; i < 8; i++, data += 4) {
u32 scramble = nv_ro32(bios, data); u32 scramble = nv_ro32(bios, data);
nv_wr32(priv, NV04_PFB_SCRAMBLE(i), scramble); nv_wr32(init, NV04_PFB_SCRAMBLE(i), scramble);
} }
} }
/* Set memory type/width/length defaults depending on the straps */ /* Set memory type/width/length defaults depending on the straps */
nv_mask(priv, NV04_PFB_BOOT_0, 0x3f, ramcfg[0]); nv_mask(init, NV04_PFB_BOOT_0, 0x3f, ramcfg[0]);
if (ramcfg[1] & 0x80) if (ramcfg[1] & 0x80)
nv_mask(priv, NV04_PFB_CFG0, 0, NV04_PFB_CFG0_SCRAMBLE); nv_mask(init, NV04_PFB_CFG0, 0, NV04_PFB_CFG0_SCRAMBLE);
nv_mask(priv, NV04_PFB_CFG1, 0x700001, (ramcfg[1] & 1) << 20); nv_mask(init, NV04_PFB_CFG1, 0x700001, (ramcfg[1] & 1) << 20);
nv_mask(priv, NV04_PFB_CFG1, 0, 1); nv_mask(init, NV04_PFB_CFG1, 0, 1);
/* Probe memory bus width */ /* Probe memory bus width */
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
fbmem_poke(fb, 4 * i, patt); fbmem_poke(fb, 4 * i, patt);
if (fbmem_peek(fb, 0xc) != patt) if (fbmem_peek(fb, 0xc) != patt)
nv_mask(priv, NV04_PFB_BOOT_0, nv_mask(init, NV04_PFB_BOOT_0,
NV04_PFB_BOOT_0_RAM_WIDTH_128, 0); NV04_PFB_BOOT_0_RAM_WIDTH_128, 0);
/* Probe memory length */ /* Probe memory length */
v = nv_rd32(priv, NV04_PFB_BOOT_0) & NV04_PFB_BOOT_0_RAM_AMOUNT; v = nv_rd32(init, NV04_PFB_BOOT_0) & NV04_PFB_BOOT_0_RAM_AMOUNT;
if (v == NV04_PFB_BOOT_0_RAM_AMOUNT_32MB && if (v == NV04_PFB_BOOT_0_RAM_AMOUNT_32MB &&
(!fbmem_readback(fb, 0x1000000, ++patt) || (!fbmem_readback(fb, 0x1000000, ++patt) ||
!fbmem_readback(fb, 0, ++patt))) !fbmem_readback(fb, 0, ++patt)))
nv_mask(priv, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT, nv_mask(init, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT,
NV04_PFB_BOOT_0_RAM_AMOUNT_16MB); NV04_PFB_BOOT_0_RAM_AMOUNT_16MB);
if (v == NV04_PFB_BOOT_0_RAM_AMOUNT_16MB && if (v == NV04_PFB_BOOT_0_RAM_AMOUNT_16MB &&
!fbmem_readback(fb, 0x800000, ++patt)) !fbmem_readback(fb, 0x800000, ++patt))
nv_mask(priv, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT, nv_mask(init, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT,
NV04_PFB_BOOT_0_RAM_AMOUNT_8MB); NV04_PFB_BOOT_0_RAM_AMOUNT_8MB);
if (!fbmem_readback(fb, 0x400000, ++patt)) if (!fbmem_readback(fb, 0x400000, ++patt))
nv_mask(priv, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT, nv_mask(init, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT,
NV04_PFB_BOOT_0_RAM_AMOUNT_4MB); NV04_PFB_BOOT_0_RAM_AMOUNT_4MB);
out: out:
/* Sequencer on */ /* Sequencer on */
nv_wrvgas(priv, 0, 1, nv_rdvgas(priv, 0, 1) & ~0x20); nv_wrvgas(init, 0, 1, nv_rdvgas(init, 0, 1) & ~0x20);
fbmem_fini(fb); fbmem_fini(fb);
} }

18
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c
View file

@ -32,31 +32,31 @@
static void static void
nv10_devinit_meminit(struct nvkm_devinit *devinit) nv10_devinit_meminit(struct nvkm_devinit *devinit)
{ {
struct nv04_devinit_priv *priv = (void *)devinit; struct nv04_devinit *init = (void *)devinit;
static const int mem_width[] = { 0x10, 0x00, 0x20 }; static const int mem_width[] = { 0x10, 0x00, 0x20 };
int mem_width_count; int mem_width_count;
uint32_t patt = 0xdeadbeef; uint32_t patt = 0xdeadbeef;
struct io_mapping *fb; struct io_mapping *fb;
int i, j, k; int i, j, k;
if (nv_device(priv)->card_type >= NV_11 && if (nv_device(init)->card_type >= NV_11 &&
nv_device(priv)->chipset >= 0x17) nv_device(init)->chipset >= 0x17)
mem_width_count = 3; mem_width_count = 3;
else else
mem_width_count = 2; mem_width_count = 2;
/* Map the framebuffer aperture */ /* Map the framebuffer aperture */
fb = fbmem_init(nv_device(priv)); fb = fbmem_init(nv_device(init));
if (!fb) { if (!fb) {
nv_error(priv, "failed to map fb\n"); nv_error(init, "failed to map fb\n");
return; return;
} }
nv_wr32(priv, NV10_PFB_REFCTRL, NV10_PFB_REFCTRL_VALID_1); nv_wr32(init, NV10_PFB_REFCTRL, NV10_PFB_REFCTRL_VALID_1);
/* Probe memory bus width */ /* Probe memory bus width */
for (i = 0; i < mem_width_count; i++) { for (i = 0; i < mem_width_count; i++) {
nv_mask(priv, NV04_PFB_CFG0, 0x30, mem_width[i]); nv_mask(init, NV04_PFB_CFG0, 0x30, mem_width[i]);
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
for (k = 0; k < 4; k++) for (k = 0; k < 4; k++)
@ -75,7 +75,7 @@ mem_width_found:
/* Probe amount of installed memory */ /* Probe amount of installed memory */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
int off = nv_rd32(priv, 0x10020c) - 0x100000; int off = nv_rd32(init, 0x10020c) - 0x100000;
fbmem_poke(fb, off, patt); fbmem_poke(fb, off, patt);
fbmem_poke(fb, 0, 0); fbmem_poke(fb, 0, 0);
@ -90,7 +90,7 @@ mem_width_found:
} }
/* IC missing - disable the upper half memory space. */ /* IC missing - disable the upper half memory space. */
nv_mask(priv, NV04_PFB_CFG0, 0x1000, 0); nv_mask(init, NV04_PFB_CFG0, 0x1000, 0);
amount_found: amount_found:
fbmem_fini(fb); fbmem_fini(fb);

18
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv20.c
View file

@ -32,32 +32,32 @@
static void static void
nv20_devinit_meminit(struct nvkm_devinit *devinit) nv20_devinit_meminit(struct nvkm_devinit *devinit)
{ {
struct nv04_devinit_priv *priv = (void *)devinit; struct nv04_devinit *init = (void *)devinit;
struct nvkm_device *device = nv_device(priv); struct nvkm_device *device = nv_device(init);
uint32_t mask = (device->chipset >= 0x25 ? 0x300 : 0x900); uint32_t mask = (device->chipset >= 0x25 ? 0x300 : 0x900);
uint32_t amount, off; uint32_t amount, off;
struct io_mapping *fb; struct io_mapping *fb;
/* Map the framebuffer aperture */ /* Map the framebuffer aperture */
fb = fbmem_init(nv_device(priv)); fb = fbmem_init(nv_device(init));
if (!fb) { if (!fb) {
nv_error(priv, "failed to map fb\n"); nv_error(init, "failed to map fb\n");
return; return;
} }
nv_wr32(priv, NV10_PFB_REFCTRL, NV10_PFB_REFCTRL_VALID_1); nv_wr32(init, NV10_PFB_REFCTRL, NV10_PFB_REFCTRL_VALID_1);
/* Allow full addressing */ /* Allow full addressing */
nv_mask(priv, NV04_PFB_CFG0, 0, mask); nv_mask(init, NV04_PFB_CFG0, 0, mask);
amount = nv_rd32(priv, 0x10020c); amount = nv_rd32(init, 0x10020c);
for (off = amount; off > 0x2000000; off -= 0x2000000) for (off = amount; off > 0x2000000; off -= 0x2000000)
fbmem_poke(fb, off - 4, off); fbmem_poke(fb, off - 4, off);
amount = nv_rd32(priv, 0x10020c); amount = nv_rd32(init, 0x10020c);
if (amount != fbmem_peek(fb, amount - 4)) if (amount != fbmem_peek(fb, amount - 4))
/* IC missing - disable the upper half memory space. */ /* IC missing - disable the upper half memory space. */
nv_mask(priv, NV04_PFB_CFG0, mask, 0); nv_mask(init, NV04_PFB_CFG0, mask, 0);
fbmem_fini(fb); fbmem_fini(fb);
} }

54
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
View file

@ -35,8 +35,8 @@
int int
nv50_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) nv50_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
struct nvkm_bios *bios = nvkm_bios(priv); struct nvkm_bios *bios = nvkm_bios(init);
struct nvbios_pll info; struct nvbios_pll info;
int N1, M1, N2, M2, P; int N1, M1, N2, M2, P;
int ret; int ret;
@ -56,20 +56,20 @@ nv50_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)
switch (info.type) { switch (info.type) {
case PLL_VPLL0: case PLL_VPLL0:
case PLL_VPLL1: case PLL_VPLL1:
nv_wr32(priv, info.reg + 0, 0x10000611); nv_wr32(init, info.reg + 0, 0x10000611);
nv_mask(priv, info.reg + 4, 0x00ff00ff, (M1 << 16) | N1); nv_mask(init, info.reg + 4, 0x00ff00ff, (M1 << 16) | N1);
nv_mask(priv, info.reg + 8, 0x7fff00ff, (P << 28) | nv_mask(init, info.reg + 8, 0x7fff00ff, (P << 28) |
(M2 << 16) | N2); (M2 << 16) | N2);
break; break;
case PLL_MEMORY: case PLL_MEMORY:
nv_mask(priv, info.reg + 0, 0x01ff0000, (P << 22) | nv_mask(init, info.reg + 0, 0x01ff0000, (P << 22) |
(info.bias_p << 19) | (info.bias_p << 19) |
(P << 16)); (P << 16));
nv_wr32(priv, info.reg + 4, (N1 << 8) | M1); nv_wr32(init, info.reg + 4, (N1 << 8) | M1);
break; break;
default: default:
nv_mask(priv, info.reg + 0, 0x00070000, (P << 16)); nv_mask(init, info.reg + 0, 0x00070000, (P << 16));
nv_wr32(priv, info.reg + 4, (N1 << 8) | M1); nv_wr32(init, info.reg + 4, (N1 << 8) | M1);
break; break;
} }
@ -79,8 +79,8 @@ nv50_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq)
static u64 static u64
nv50_devinit_disable(struct nvkm_devinit *devinit) nv50_devinit_disable(struct nvkm_devinit *devinit)
{ {
struct nv50_devinit_priv *priv = (void *)devinit; struct nv50_devinit *init = (void *)devinit;
u32 r001540 = nv_rd32(priv, 0x001540); u32 r001540 = nv_rd32(init, 0x001540);
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) if (!(r001540 & 0x40000000))
@ -94,28 +94,28 @@ nv50_devinit_init(struct nvkm_object *object)
{ {
struct nvkm_bios *bios = nvkm_bios(object); struct nvkm_bios *bios = nvkm_bios(object);
struct nvkm_ibus *ibus = nvkm_ibus(object); struct nvkm_ibus *ibus = nvkm_ibus(object);
struct nv50_devinit_priv *priv = (void *)object; struct nv50_devinit *init = (void *)object;
struct nvbios_outp info; struct nvbios_outp info;
struct dcb_output outp; struct dcb_output outp;
u8 ver = 0xff, hdr, cnt, len; u8 ver = 0xff, hdr, cnt, len;
int ret, i = 0; int ret, i = 0;
if (!priv->base.post) { if (!init->base.post) {
if (!nv_rdvgac(priv, 0, 0x00) && if (!nv_rdvgac(init, 0, 0x00) &&
!nv_rdvgac(priv, 0, 0x1a)) { !nv_rdvgac(init, 0, 0x1a)) {
nv_info(priv, "adaptor not initialised\n"); nv_info(init, "adaptor not initialised\n");
priv->base.post = true; init->base.post = true;
} }
} }
/* some boards appear to require certain priv register timeouts /* some boards appear to require certain init register timeouts
* to be bumped before runing devinit scripts. not a clue why * to be bumped before runing devinit scripts. not a clue why
* the vbios engineers didn't make the scripts just work... * the vbios engineers didn't make the scripts just work...
*/ */
if (priv->base.post && ibus) if (init->base.post && ibus)
nv_ofuncs(ibus)->init(nv_object(ibus)); nv_ofuncs(ibus)->init(nv_object(ibus));
ret = nvkm_devinit_init(&priv->base); ret = nvkm_devinit_init(&init->base);
if (ret) if (ret)
return ret; return ret;
@ -123,11 +123,11 @@ nv50_devinit_init(struct nvkm_object *object)
* pointer of each dcb entry's display encoder table in order * pointer of each dcb entry's display encoder table in order
* to properly initialise each encoder. * to properly initialise each encoder.
*/ */
while (priv->base.post && dcb_outp_parse(bios, i, &ver, &hdr, &outp)) { while (init->base.post && dcb_outp_parse(bios, i, &ver, &hdr, &outp)) {
if (nvbios_outp_match(bios, outp.hasht, outp.hashm, if (nvbios_outp_match(bios, outp.hasht, outp.hashm,
&ver, &hdr, &cnt, &len, &info)) { &ver, &hdr, &cnt, &len, &info)) {
struct nvbios_init init = { struct nvbios_init exec = {
.subdev = nv_subdev(priv), .subdev = nv_subdev(init),
.bios = bios, .bios = bios,
.offset = info.script[0], .offset = info.script[0],
.outp = &outp, .outp = &outp,
@ -135,7 +135,7 @@ nv50_devinit_init(struct nvkm_object *object)
.execute = 1, .execute = 1,
}; };
nvbios_exec(&init); nvbios_exec(&exec);
} }
i++; i++;
} }
@ -148,11 +148,11 @@ nv50_devinit_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct nv50_devinit_priv *priv; struct nv50_devinit *init;
int ret; int ret;
ret = nvkm_devinit_create(parent, engine, oclass, &priv); ret = nvkm_devinit_create(parent, engine, oclass, &init);
*pobject = nv_object(priv); *pobject = nv_object(init);
if (ret) if (ret)
return ret; return ret;

2
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h
View file

@ -2,7 +2,7 @@
#define __NVKM_DEVINIT_NV50_H__ #define __NVKM_DEVINIT_NV50_H__
#include "priv.h" #include "priv.h"
struct nv50_devinit_priv { struct nv50_devinit {
struct nvkm_devinit base; struct nvkm_devinit base;
u32 r001540; u32 r001540;
}; };