Skip to content

L
linux
Commit 8ac3f64f authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nouveau/devinit: switch to device pri macros 

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 822ad79f
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 175 deletions
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c
View file @ 8ac3f64f
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include <subdev/bios/init.h> #include <subdev/bios/init.h>
static u64 static u64
g84_devinit_disable(struct nvkm_devinit *devinit) g84_devinit_disable(struct nvkm_devinit *init)
{ {
struct nv50_devinit *init = (void *)devinit; struct nvkm_device *device = init->subdev.device;
u32 r001540 = nv_rd32(init, 0x001540); u32 r001540 = nvkm_rd32(device, 0x001540);
u32 r00154c = nv_rd32(init, 0x00154c); u32 r00154c = nvkm_rd32(device, 0x00154c);
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c
View file @ 8ac3f64f
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include <subdev/bios/init.h> #include <subdev/bios/init.h>
static u64 static u64
g98_devinit_disable(struct nvkm_devinit *devinit) g98_devinit_disable(struct nvkm_devinit *init)
{ {
struct nv50_devinit *init = (void *)devinit; struct nvkm_device *device = init->subdev.device;
u32 r001540 = nv_rd32(init, 0x001540); u32 r001540 = nvkm_rd32(device, 0x001540);
u32 r00154c = nv_rd32(init, 0x00154c); u32 r00154c = nvkm_rd32(device, 0x00154c);
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c
View file @ 8ac3f64f
...@@ -29,19 +29,19 @@ ...@@ -29,19 +29,19 @@
#include <subdev/clk/pll.h> #include <subdev/clk/pll.h>
int int
gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) gf100_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
{ {
struct nv50_devinit *init = (void *)devinit; struct nvkm_subdev *subdev = &init->subdev;
struct nvkm_bios *bios = nvkm_bios(init); struct nvkm_device *device = subdev->device;
struct nvbios_pll info; struct nvbios_pll info;
int N, fN, M, P; int N, fN, M, P;
int ret; int ret;
ret = nvbios_pll_parse(bios, type, &info); ret = nvbios_pll_parse(device->bios, type, &info);
if (ret) if (ret)
return ret; return ret;
ret = gt215_pll_calc(nv_subdev(devinit), &info, freq, &N, &fN, &M, &P); ret = gt215_pll_calc(subdev, &info, freq, &N, &fN, &M, &P);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -50,9 +50,9 @@ gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) ...@@ -50,9 +50,9 @@ 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(init, info.reg + 0x0c, 0x00000000, 0x00000100); nvkm_mask(device, info.reg + 0x0c, 0x00000000, 0x00000100);
nv_wr32(init, info.reg + 0x04, (P << 16) | (N << 8) | M); nvkm_wr32(device, info.reg + 0x04, (P << 16) | (N << 8) | M);
nv_wr32(init, info.reg + 0x10, fN << 16); nvkm_wr32(device, info.reg + 0x10, fN << 16);
break; break;
default: default:
nv_warn(init, "0x%08x/%dKhz unimplemented\n", type, freq); nv_warn(init, "0x%08x/%dKhz unimplemented\n", type, freq);
...@@ -64,10 +64,10 @@ gf100_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) ...@@ -64,10 +64,10 @@ 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 *init)
{ {
struct nv50_devinit *init = (void *)devinit; struct nvkm_device *device = init->subdev.device;
u32 r022500 = nv_rd32(init, 0x022500); u32 r022500 = nvkm_rd32(device, 0x022500);
u64 disable = 0ULL; u64 disable = 0ULL;
if (r022500 & 0x00000001) if (r022500 & 0x00000001)
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c
View file @ 8ac3f64f
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include <subdev/bios/init.h> #include <subdev/bios/init.h>
u64 u64
gm107_devinit_disable(struct nvkm_devinit *devinit) gm107_devinit_disable(struct nvkm_devinit *init)
{ {
struct nv50_devinit *init = (void *)devinit; struct nvkm_device *device = init->subdev.device;
u32 r021c00 = nv_rd32(init, 0x021c00); u32 r021c00 = nvkm_rd32(device, 0x021c00);
u32 r021c04 = nv_rd32(init, 0x021c04); u32 r021c04 = nvkm_rd32(device, 0x021c04);
u64 disable = 0ULL; u64 disable = 0ULL;
if (r021c00 & 0x00000001) if (r021c00 & 0x00000001)
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm204.c
View file @ 8ac3f64f
...@@ -30,18 +30,19 @@ ...@@ -30,18 +30,19 @@
static void static void
pmu_code(struct nv50_devinit *init, 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(init); struct nvkm_device *device = init->base.subdev.device;
struct nvkm_bios *bios = device->bios;
int i; int i;
nv_wr32(init, 0x10a180, 0x01000000 | (sec ? 0x10000000 : 0) | pmu); nvkm_wr32(device, 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(init, 0x10a188, (pmu + i) >> 8); nvkm_wr32(device, 0x10a188, (pmu + i) >> 8);
nv_wr32(init, 0x10a184, nv_ro32(bios, img + i)); nvkm_wr32(device, 0x10a184, nv_ro32(bios, img + i));
} }
while (i & 0xff) { while (i & 0xff) {
nv_wr32(init, 0x10a184, 0x00000000); nvkm_wr32(device, 0x10a184, 0x00000000);
i += 4; i += 4;
} }
} }
...@@ -49,28 +50,31 @@ pmu_code(struct nv50_devinit *init, u32 pmu, u32 img, u32 len, bool sec) ...@@ -49,28 +50,31 @@ pmu_code(struct nv50_devinit *init, u32 pmu, u32 img, u32 len, bool sec)
static void static void
pmu_data(struct nv50_devinit *init, u32 pmu, u32 img, u32 len) pmu_data(struct nv50_devinit *init, u32 pmu, u32 img, u32 len)
{ {
struct nvkm_bios *bios = nvkm_bios(init); struct nvkm_device *device = init->base.subdev.device;
struct nvkm_bios *bios = device->bios;
int i; int i;
nv_wr32(init, 0x10a1c0, 0x01000000 | pmu); nvkm_wr32(device, 0x10a1c0, 0x01000000 | pmu);
for (i = 0; i < len; i += 4) for (i = 0; i < len; i += 4)
nv_wr32(init, 0x10a1c4, nv_ro32(bios, img + i)); nvkm_wr32(device, 0x10a1c4, nv_ro32(bios, img + i));
} }
static u32 static u32
pmu_args(struct nv50_devinit *init, u32 argp, u32 argi) pmu_args(struct nv50_devinit *init, u32 argp, u32 argi)
{ {
nv_wr32(init, 0x10a1c0, argp); struct nvkm_device *device = init->base.subdev.device;
nv_wr32(init, 0x10a1c0, nv_rd32(init, 0x10a1c4) + argi); nvkm_wr32(device, 0x10a1c0, argp);
return nv_rd32(init, 0x10a1c4); nvkm_wr32(device, 0x10a1c0, nvkm_rd32(device, 0x10a1c4) + argi);
return nvkm_rd32(device, 0x10a1c4);
} }
static void static void
pmu_exec(struct nv50_devinit *init, u32 init_addr) pmu_exec(struct nv50_devinit *init, u32 init_addr)
{ {
nv_wr32(init, 0x10a104, init_addr); struct nvkm_device *device = init->base.subdev.device;
nv_wr32(init, 0x10a10c, 0x00000000); nvkm_wr32(device, 0x10a104, init_addr);
nv_wr32(init, 0x10a100, 0x00000002); nvkm_wr32(device, 0x10a10c, 0x00000000);
nvkm_wr32(device, 0x10a100, 0x00000002);
} }
static int static int
...@@ -105,7 +109,8 @@ static int ...@@ -105,7 +109,8 @@ static int
gm204_devinit_post(struct nvkm_subdev *subdev, bool post) gm204_devinit_post(struct nvkm_subdev *subdev, bool post)
{ {
struct nv50_devinit *init = (void *)nvkm_devinit(subdev); struct nv50_devinit *init = (void *)nvkm_devinit(subdev);
struct nvkm_bios *bios = nvkm_bios(init); struct nvkm_device *device = init->base.subdev.device;
struct nvkm_bios *bios = device->bios;
struct bit_entry bit_I; struct bit_entry bit_I;
u32 exec, args; u32 exec, args;
int ret; int ret;
...@@ -118,10 +123,10 @@ gm204_devinit_post(struct nvkm_subdev *subdev, bool post) ...@@ -118,10 +123,10 @@ gm204_devinit_post(struct nvkm_subdev *subdev, bool post)
/* reset PMU and load init table parser ucode */ /* reset PMU and load init table parser ucode */
if (post) { if (post) {
nv_mask(init, 0x000200, 0x00002000, 0x00000000); nvkm_mask(device, 0x000200, 0x00002000, 0x00000000);
nv_mask(init, 0x000200, 0x00002000, 0x00002000); nvkm_mask(device, 0x000200, 0x00002000, 0x00002000);
nv_rd32(init, 0x000200); nvkm_rd32(device, 0x000200);
while (nv_rd32(init, 0x10a10c) & 0x00000006) { while (nvkm_rd32(device, 0x10a10c) & 0x00000006) {
} }
} }
...@@ -147,9 +152,9 @@ gm204_devinit_post(struct nvkm_subdev *subdev, bool post) ...@@ -147,9 +152,9 @@ gm204_devinit_post(struct nvkm_subdev *subdev, bool post)
/* execute init tables */ /* execute init tables */
if (post) { if (post) {
nv_wr32(init, 0x10a040, 0x00005000); nvkm_wr32(device, 0x10a040, 0x00005000);
pmu_exec(init, exec); pmu_exec(init, exec);
while (!(nv_rd32(init, 0x10a040) & 0x00002000)) { while (!(nvkm_rd32(device, 0x10a040) & 0x00002000)) {
} }
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c
View file @ 8ac3f64f
...@@ -29,29 +29,29 @@ ...@@ -29,29 +29,29 @@
#include <subdev/clk/pll.h> #include <subdev/clk/pll.h>
int int
gt215_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) gt215_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
{ {
struct nv50_devinit *init = (void *)devinit; struct nvkm_subdev *subdev = &init->subdev;
struct nvkm_bios *bios = nvkm_bios(init); struct nvkm_device *device = subdev->device;
struct nvbios_pll info; struct nvbios_pll info;
int N, fN, M, P; int N, fN, M, P;
int ret; int ret;
ret = nvbios_pll_parse(bios, type, &info); ret = nvbios_pll_parse(device->bios, type, &info);
if (ret) if (ret)
return ret; return ret;
ret = gt215_pll_calc(nv_subdev(devinit), &info, freq, &N, &fN, &M, &P); ret = gt215_pll_calc(subdev, &info, freq, &N, &fN, &M, &P);
if (ret < 0) if (ret < 0)
return ret; return ret;
switch (info.type) { switch (info.type) {
case PLL_VPLL0: case PLL_VPLL0:
case PLL_VPLL1: case PLL_VPLL1:
nv_wr32(init, info.reg + 0, 0x50000610); nvkm_wr32(device, info.reg + 0, 0x50000610);
nv_mask(init, info.reg + 4, 0x003fffff, nvkm_mask(device, info.reg + 4, 0x003fffff,
(P << 16) | (M << 8) | N); (P << 16) | (M << 8) | N);
nv_wr32(init, info.reg + 8, fN); nvkm_wr32(device, info.reg + 8, fN);
break; break;
default: default:
nv_warn(init, "0x%08x/%dKhz unimplemented\n", type, freq); nv_warn(init, "0x%08x/%dKhz unimplemented\n", type, freq);
...@@ -63,11 +63,11 @@ gt215_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) ...@@ -63,11 +63,11 @@ 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 *init)
{ {
struct nv50_devinit *init = (void *)devinit; struct nvkm_device *device = init->subdev.device;
u32 r001540 = nv_rd32(init, 0x001540); u32 r001540 = nvkm_rd32(device, 0x001540);
u32 r00154c = nv_rd32(init, 0x00154c); u32 r00154c = nvkm_rd32(device, 0x00154c);
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {
...@@ -99,9 +99,10 @@ gt215_devinit_mmio_part[] = { ...@@ -99,9 +99,10 @@ gt215_devinit_mmio_part[] = {
}; };
static u32 static u32
gt215_devinit_mmio(struct nvkm_devinit *devinit, u32 addr) gt215_devinit_mmio(struct nvkm_devinit *obj, u32 addr)
{ {
struct nv50_devinit *init = (void *)devinit; struct nv50_devinit *init = container_of(obj, typeof(*init), base);
struct nvkm_device *device = init->base.subdev.device;
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
...@@ -123,7 +124,7 @@ gt215_devinit_mmio(struct nvkm_devinit *devinit, u32 addr) ...@@ -123,7 +124,7 @@ gt215_devinit_mmio(struct nvkm_devinit *devinit, u32 addr)
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 (!init->r001540) if (!init->r001540)
init->r001540 = nv_rd32(init, 0x001540); init->r001540 = nvkm_rd32(device, 0x001540);
if (part >= hweight8((init->r001540 >> 16) & 0xff)) if (part >= hweight8((init->r001540 >> 16) & 0xff))
return ~0; return ~0;
return addr; return addr;
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c
View file @ 8ac3f64f
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include <subdev/bios/init.h> #include <subdev/bios/init.h>
static u64 static u64
mcp89_devinit_disable(struct nvkm_devinit *devinit) mcp89_devinit_disable(struct nvkm_devinit *init)
{ {
struct nv50_devinit *init = (void *)devinit; struct nvkm_device *device = init->subdev.device;
u32 r001540 = nv_rd32(init, 0x001540); u32 r001540 = nvkm_rd32(device, 0x001540);
u32 r00154c = nv_rd32(init, 0x00154c); u32 r00154c = nvkm_rd32(device, 0x00154c);
u64 disable = 0; u64 disable = 0;
if (!(r001540 & 0x40000000)) { if (!(r001540 & 0x40000000)) {
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv04.c
View file @ 8ac3f64f
...@@ -33,15 +33,15 @@ ...@@ -33,15 +33,15 @@
#include <subdev/vga.h> #include <subdev/vga.h>
static void static void
nv04_devinit_meminit(struct nvkm_devinit *devinit) nv04_devinit_meminit(struct nvkm_devinit *init)
{ {
struct nv04_devinit *init = (void *)devinit; struct nvkm_device *device = init->subdev.device;
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(init)); fb = fbmem_init(device);
if (!fb) { if (!fb) {
nv_error(init, "failed to map fb\n"); nv_error(init, "failed to map fb\n");
return; return;
...@@ -49,9 +49,9 @@ nv04_devinit_meminit(struct nvkm_devinit *devinit) ...@@ -49,9 +49,9 @@ nv04_devinit_meminit(struct nvkm_devinit *devinit)
/* Sequencer and refresh off */ /* Sequencer and refresh off */
nv_wrvgas(init, 0, 1, nv_rdvgas(init, 0, 1) | 0x20); nv_wrvgas(init, 0, 1, nv_rdvgas(init, 0, 1) | 0x20);
nv_mask(init, NV04_PFB_DEBUG_0, 0, NV04_PFB_DEBUG_0_REFRESH_OFF); nvkm_mask(device, NV04_PFB_DEBUG_0, 0, NV04_PFB_DEBUG_0_REFRESH_OFF);
nv_mask(init, NV04_PFB_BOOT_0, ~0, nvkm_mask(device, 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,48 +62,48 @@ nv04_devinit_meminit(struct nvkm_devinit *devinit) ...@@ -62,48 +62,48 @@ 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(init, NV04_PFB_BOOT_0, nvkm_mask(device, 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(init, NV04_PFB_DEBUG_0, nvkm_mask(device, 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(init, NV04_PFB_BOOT_0, nvkm_mask(device, 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(init, NV04_PFB_BOOT_0, nvkm_mask(device, 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(init, NV04_PFB_BOOT_0, nvkm_mask(device, 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(init, NV04_PFB_BOOT_0, nvkm_mask(device, 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(init, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_TYPE, nvkm_mask(device, 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(init, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT, nvkm_mask(device, 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(init, NV04_PFB_DEBUG_0, NV04_PFB_DEBUG_0_REFRESH_OFF, 0); nvkm_mask(device, NV04_PFB_DEBUG_0, NV04_PFB_DEBUG_0_REFRESH_OFF, 0);
nv_wrvgas(init, 0, 1, nv_rdvgas(init, 0, 1) & ~0x20); nv_wrvgas(init, 0, 1, nv_rdvgas(init, 0, 1) & ~0x20);
fbmem_fini(fb); fbmem_fini(fb);
} }
...@@ -139,11 +139,12 @@ powerctrl_1_shift(int chip_version, int reg) ...@@ -139,11 +139,12 @@ powerctrl_1_shift(int chip_version, int reg)
} }
void void
setPLL_single(struct nvkm_devinit *devinit, u32 reg, setPLL_single(struct nvkm_devinit *init, u32 reg,
struct nvkm_pll_vals *pv) struct nvkm_pll_vals *pv)
{ {
int chip_version = nvkm_bios(devinit)->version.chip; struct nvkm_device *device = init->subdev.device;
uint32_t oldpll = nv_rd32(devinit, reg); int chip_version = device->bios->version.chip;
uint32_t oldpll = nvkm_rd32(device, reg);
int oldN = (oldpll >> 8) & 0xff, oldM = oldpll & 0xff; int oldN = (oldpll >> 8) & 0xff, oldM = oldpll & 0xff;
uint32_t pll = (oldpll & 0xfff80000) | pv->log2P << 16 | pv->NM1; uint32_t pll = (oldpll & 0xfff80000) | pv->log2P << 16 | pv->NM1;
uint32_t saved_powerctrl_1 = 0; uint32_t saved_powerctrl_1 = 0;
...@@ -153,30 +154,30 @@ setPLL_single(struct nvkm_devinit *devinit, u32 reg, ...@@ -153,30 +154,30 @@ setPLL_single(struct nvkm_devinit *devinit, u32 reg,
return; /* already set */ return; /* already set */
if (shift_powerctrl_1 >= 0) { if (shift_powerctrl_1 >= 0) {
saved_powerctrl_1 = nv_rd32(devinit, 0x001584); saved_powerctrl_1 = nvkm_rd32(device, 0x001584);
nv_wr32(devinit, 0x001584, nvkm_wr32(device, 0x001584,
(saved_powerctrl_1 & ~(0xf << shift_powerctrl_1)) | (saved_powerctrl_1 & ~(0xf << shift_powerctrl_1)) |
1 << shift_powerctrl_1); 1 << shift_powerctrl_1);
} }
if (oldM && pv->M1 && (oldN / oldM < pv->N1 / pv->M1)) if (oldM && pv->M1 && (oldN / oldM < pv->N1 / pv->M1))
/* upclock -- write new post divider first */ /* upclock -- write new post divider first */
nv_wr32(devinit, reg, pv->log2P << 16 | (oldpll & 0xffff)); nvkm_wr32(device, reg, pv->log2P << 16 | (oldpll & 0xffff));
else else
/* downclock -- write new NM first */ /* downclock -- write new NM first */
nv_wr32(devinit, reg, (oldpll & 0xffff0000) | pv->NM1); nvkm_wr32(device, reg, (oldpll & 0xffff0000) | pv->NM1);
if ((chip_version < 0x17 || chip_version == 0x1a) && if ((chip_version < 0x17 || chip_version == 0x1a) &&
chip_version != 0x11) chip_version != 0x11)
/* wait a bit on older chips */ /* wait a bit on older chips */
msleep(64); msleep(64);
nv_rd32(devinit, reg); nvkm_rd32(device, reg);
/* then write the other half as well */ /* then write the other half as well */
nv_wr32(devinit, reg, pll); nvkm_wr32(device, reg, pll);
if (shift_powerctrl_1 >= 0) if (shift_powerctrl_1 >= 0)
nv_wr32(devinit, 0x001584, saved_powerctrl_1); nvkm_wr32(device, 0x001584, saved_powerctrl_1);
} }
static uint32_t static uint32_t
...@@ -193,14 +194,15 @@ new_ramdac580(uint32_t reg1, bool ss, uint32_t ramdac580) ...@@ -193,14 +194,15 @@ new_ramdac580(uint32_t reg1, bool ss, uint32_t ramdac580)
} }
void void
setPLL_double_highregs(struct nvkm_devinit *devinit, u32 reg1, setPLL_double_highregs(struct nvkm_devinit *init, u32 reg1,
struct nvkm_pll_vals *pv) struct nvkm_pll_vals *pv)
{ {
int chip_version = nvkm_bios(devinit)->version.chip; struct nvkm_device *device = init->subdev.device;
int chip_version = device->bios->version.chip;
bool nv3035 = chip_version == 0x30 || chip_version == 0x35; bool nv3035 = chip_version == 0x30 || chip_version == 0x35;
uint32_t reg2 = reg1 + ((reg1 == 0x680520) ? 0x5c : 0x70); uint32_t reg2 = reg1 + ((reg1 == 0x680520) ? 0x5c : 0x70);
uint32_t oldpll1 = nv_rd32(devinit, reg1); uint32_t oldpll1 = nvkm_rd32(device, reg1);
uint32_t oldpll2 = !nv3035 ? nv_rd32(devinit, reg2) : 0; uint32_t oldpll2 = !nv3035 ? nvkm_rd32(device, reg2) : 0;
uint32_t pll1 = (oldpll1 & 0xfff80000) | pv->log2P << 16 | pv->NM1; uint32_t pll1 = (oldpll1 & 0xfff80000) | pv->log2P << 16 | pv->NM1;
uint32_t pll2 = (oldpll2 & 0x7fff0000) | 1 << 31 | pv->NM2; uint32_t pll2 = (oldpll2 & 0x7fff0000) | 1 << 31 | pv->NM2;
uint32_t oldramdac580 = 0, ramdac580 = 0; uint32_t oldramdac580 = 0, ramdac580 = 0;
...@@ -215,7 +217,7 @@ setPLL_double_highregs(struct nvkm_devinit *devinit, u32 reg1, ...@@ -215,7 +217,7 @@ setPLL_double_highregs(struct nvkm_devinit *devinit, u32 reg1,
pll2 = 0; pll2 = 0;
} }
if (chip_version > 0x40 && reg1 >= 0x680508) { /* !nv40 */ if (chip_version > 0x40 && reg1 >= 0x680508) { /* !nv40 */
oldramdac580 = nv_rd32(devinit, 0x680580); oldramdac580 = nvkm_rd32(device, 0x680580);
ramdac580 = new_ramdac580(reg1, single_stage, oldramdac580); ramdac580 = new_ramdac580(reg1, single_stage, oldramdac580);
if (oldramdac580 != ramdac580) if (oldramdac580 != ramdac580)
oldpll1 = ~0; /* force mismatch */ oldpll1 = ~0; /* force mismatch */
...@@ -231,8 +233,8 @@ setPLL_double_highregs(struct nvkm_devinit *devinit, u32 reg1, ...@@ -231,8 +233,8 @@ setPLL_double_highregs(struct nvkm_devinit *devinit, u32 reg1,
return; /* already set */ return; /* already set */
if (shift_powerctrl_1 >= 0) { if (shift_powerctrl_1 >= 0) {
saved_powerctrl_1 = nv_rd32(devinit, 0x001584); saved_powerctrl_1 = nvkm_rd32(device, 0x001584);
nv_wr32(devinit, 0x001584, nvkm_wr32(device, 0x001584,
(saved_powerctrl_1 & ~(0xf << shift_powerctrl_1)) | (saved_powerctrl_1 & ~(0xf << shift_powerctrl_1)) |
1 << shift_powerctrl_1); 1 << shift_powerctrl_1);
} }
...@@ -251,26 +253,26 @@ setPLL_double_highregs(struct nvkm_devinit *devinit, u32 reg1, ...@@ -251,26 +253,26 @@ setPLL_double_highregs(struct nvkm_devinit *devinit, u32 reg1,
shift_c040 += 2; shift_c040 += 2;
} }
savedc040 = nv_rd32(devinit, 0xc040); savedc040 = nvkm_rd32(device, 0xc040);
if (shift_c040 != 14) if (shift_c040 != 14)
nv_wr32(devinit, 0xc040, savedc040 & ~(3 << shift_c040)); nvkm_wr32(device, 0xc040, savedc040 & ~(3 << shift_c040));
} }
if (oldramdac580 != ramdac580) if (oldramdac580 != ramdac580)
nv_wr32(devinit, 0x680580, ramdac580); nvkm_wr32(device, 0x680580, ramdac580);
if (!nv3035) if (!nv3035)
nv_wr32(devinit, reg2, pll2); nvkm_wr32(device, reg2, pll2);
nv_wr32(devinit, reg1, pll1); nvkm_wr32(device, reg1, pll1);
if (shift_powerctrl_1 >= 0) if (shift_powerctrl_1 >= 0)
nv_wr32(devinit, 0x001584, saved_powerctrl_1); nvkm_wr32(device, 0x001584, saved_powerctrl_1);
if (chip_version >= 0x40) if (chip_version >= 0x40)
nv_wr32(devinit, 0xc040, savedc040); nvkm_wr32(device, 0xc040, savedc040);
} }
void void
setPLL_double_lowregs(struct nvkm_devinit *devinit, u32 NMNMreg, setPLL_double_lowregs(struct nvkm_devinit *init, u32 NMNMreg,
struct nvkm_pll_vals *pv) struct nvkm_pll_vals *pv)
{ {
/* When setting PLLs, there is a merry game of disabling and enabling /* When setting PLLs, there is a merry game of disabling and enabling
...@@ -280,10 +282,10 @@ setPLL_double_lowregs(struct nvkm_devinit *devinit, u32 NMNMreg, ...@@ -280,10 +282,10 @@ setPLL_double_lowregs(struct nvkm_devinit *devinit, u32 NMNMreg,
* combined herein. Without luck it deviates from each card's formula * combined herein. Without luck it deviates from each card's formula
* so as to not work on any :) * so as to not work on any :)
*/ */
struct nvkm_device *device = init->subdev.device;
uint32_t Preg = NMNMreg - 4; uint32_t Preg = NMNMreg - 4;
bool mpll = Preg == 0x4020; bool mpll = Preg == 0x4020;
uint32_t oldPval = nv_rd32(devinit, Preg); uint32_t oldPval = nvkm_rd32(device, Preg);
uint32_t NMNM = pv->NM2 << 16 | pv->NM1; uint32_t NMNM = pv->NM2 << 16 | pv->NM1;
uint32_t Pval = (oldPval & (mpll ? ~(0x77 << 16) : ~(7 << 16))) | uint32_t Pval = (oldPval & (mpll ? ~(0x77 << 16) : ~(7 << 16))) |
0xc << 28 | pv->log2P << 16; 0xc << 28 | pv->log2P << 16;
...@@ -292,7 +294,7 @@ setPLL_double_lowregs(struct nvkm_devinit *devinit, u32 NMNMreg, ...@@ -292,7 +294,7 @@ setPLL_double_lowregs(struct nvkm_devinit *devinit, u32 NMNMreg,
uint32_t maskc040 = ~(3 << 14), savedc040; uint32_t maskc040 = ~(3 << 14), savedc040;
bool single_stage = !pv->NM2 || pv->N2 == pv->M2; bool single_stage = !pv->NM2 || pv->N2 == pv->M2;
if (nv_rd32(devinit, NMNMreg) == NMNM && (oldPval & 0xc0070000) == Pval) if (nvkm_rd32(device, NMNMreg) == NMNM && (oldPval & 0xc0070000) == Pval)
return; return;
if (Preg == 0x4000) if (Preg == 0x4000)
...@@ -304,7 +306,7 @@ setPLL_double_lowregs(struct nvkm_devinit *devinit, u32 NMNMreg, ...@@ -304,7 +306,7 @@ setPLL_double_lowregs(struct nvkm_devinit *devinit, u32 NMNMreg,
struct nvbios_pll info; struct nvbios_pll info;
uint8_t Pval2; uint8_t Pval2;
if (nvbios_pll_parse(nvkm_bios(devinit), Preg, &info)) if (nvbios_pll_parse(device->bios, Preg, &info))
return; return;
Pval2 = pv->log2P + info.bias_p; Pval2 = pv->log2P + info.bias_p;
...@@ -312,40 +314,40 @@ setPLL_double_lowregs(struct nvkm_devinit *devinit, u32 NMNMreg, ...@@ -312,40 +314,40 @@ setPLL_double_lowregs(struct nvkm_devinit *devinit, u32 NMNMreg,
Pval2 = info.max_p; Pval2 = info.max_p;
Pval |= 1 << 28 | Pval2 << 20; Pval |= 1 << 28 | Pval2 << 20;
saved4600 = nv_rd32(devinit, 0x4600); saved4600 = nvkm_rd32(device, 0x4600);
nv_wr32(devinit, 0x4600, saved4600 | 8 << 28); nvkm_wr32(device, 0x4600, saved4600 | 8 << 28);
} }
if (single_stage) if (single_stage)
Pval |= mpll ? 1 << 12 : 1 << 8; Pval |= mpll ? 1 << 12 : 1 << 8;
nv_wr32(devinit, Preg, oldPval | 1 << 28); nvkm_wr32(device, Preg, oldPval | 1 << 28);
nv_wr32(devinit, Preg, Pval & ~(4 << 28)); nvkm_wr32(device, Preg, Pval & ~(4 << 28));
if (mpll) { if (mpll) {
Pval |= 8 << 20; Pval |= 8 << 20;
nv_wr32(devinit, 0x4020, Pval & ~(0xc << 28)); nvkm_wr32(device, 0x4020, Pval & ~(0xc << 28));
nv_wr32(devinit, 0x4038, Pval & ~(0xc << 28)); nvkm_wr32(device, 0x4038, Pval & ~(0xc << 28));
} }
savedc040 = nv_rd32(devinit, 0xc040); savedc040 = nvkm_rd32(device, 0xc040);
nv_wr32(devinit, 0xc040, savedc040 & maskc040); nvkm_wr32(device, 0xc040, savedc040 & maskc040);
nv_wr32(devinit, NMNMreg, NMNM); nvkm_wr32(device, NMNMreg, NMNM);
if (NMNMreg == 0x4024) if (NMNMreg == 0x4024)
nv_wr32(devinit, 0x403c, NMNM); nvkm_wr32(device, 0x403c, NMNM);
nv_wr32(devinit, Preg, Pval); nvkm_wr32(device, Preg, Pval);
if (mpll) { if (mpll) {
Pval &= ~(8 << 20); Pval &= ~(8 << 20);
nv_wr32(devinit, 0x4020, Pval); nvkm_wr32(device, 0x4020, Pval);
nv_wr32(devinit, 0x4038, Pval); nvkm_wr32(device, 0x4038, Pval);
nv_wr32(devinit, 0x4600, saved4600); nvkm_wr32(device, 0x4600, saved4600);
} }
nv_wr32(devinit, 0xc040, savedc040); nvkm_wr32(device, 0xc040, savedc040);
if (mpll) { if (mpll) {
nv_wr32(devinit, 0x4020, Pval & ~(1 << 28)); nvkm_wr32(device, 0x4020, Pval & ~(1 << 28));
nv_wr32(devinit, 0x4038, Pval & ~(1 << 28)); nvkm_wr32(device, 0x4038, Pval & ~(1 << 28));
} }
} }
...@@ -391,10 +393,11 @@ int ...@@ -391,10 +393,11 @@ int
nv04_devinit_fini(struct nvkm_object *object, bool suspend) nv04_devinit_fini(struct nvkm_object *object, bool suspend)
{ {
struct nv04_devinit *init = (void *)object; struct nv04_devinit *init = (void *)object;
struct nvkm_device *device = init->base.subdev.device;
int ret; int ret;
/* make i2c busses accessible */ /* make i2c busses accessible */
nv_mask(init, 0x000200, 0x00000001, 0x00000001); nvkm_mask(device, 0x000200, 0x00000001, 0x00000001);
ret = nvkm_devinit_fini(&init->base, suspend); ret = nvkm_devinit_fini(&init->base, suspend);
if (ret) if (ret)
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
View file @ 8ac3f64f
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <subdev/vga.h> #include <subdev/vga.h>
static void static void
nv05_devinit_meminit(struct nvkm_devinit *devinit) nv05_devinit_meminit(struct nvkm_devinit *init)
{ {
static const u8 default_config_tab[][2] = { static const u8 default_config_tab[][2] = {
{ 0x24, 0x00 }, { 0x24, 0x00 },
...@@ -44,8 +44,8 @@ nv05_devinit_meminit(struct nvkm_devinit *devinit) ...@@ -44,8 +44,8 @@ nv05_devinit_meminit(struct nvkm_devinit *devinit)
{ 0x06, 0x00 }, { 0x06, 0x00 },
{ 0x00, 0x00 } { 0x00, 0x00 }
}; };
struct nv04_devinit *init = (void *)devinit; struct nvkm_device *device = init->subdev.device;
struct nvkm_bios *bios = nvkm_bios(init); struct nvkm_bios *bios = device->bios;
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) ...@@ -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(init)); fb = fbmem_init(device);
if (!fb) { if (!fb) {
nv_error(init, "failed to map fb\n"); nv_error(init, "failed to map fb\n");
return; return;
} }
strap = (nv_rd32(init, 0x101000) & 0x0000003c) >> 2; strap = (nvkm_rd32(device, 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);
...@@ -71,52 +71,52 @@ nv05_devinit_meminit(struct nvkm_devinit *devinit) ...@@ -71,52 +71,52 @@ nv05_devinit_meminit(struct nvkm_devinit *devinit)
/* Sequencer off */ /* Sequencer off */
nv_wrvgas(init, 0, 1, nv_rdvgas(init, 0, 1) | 0x20); nv_wrvgas(init, 0, 1, nv_rdvgas(init, 0, 1) | 0x20);
if (nv_rd32(init, NV04_PFB_BOOT_0) & NV04_PFB_BOOT_0_UMA_ENABLE) if (nvkm_rd32(device, NV04_PFB_BOOT_0) & NV04_PFB_BOOT_0_UMA_ENABLE)
goto out; goto out;
nv_mask(init, NV04_PFB_DEBUG_0, NV04_PFB_DEBUG_0_REFRESH_OFF, 0); nvkm_mask(device, 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(init, NV04_PFB_SCRAMBLE(i), scramble); nvkm_wr32(device, 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(init, NV04_PFB_BOOT_0, 0x3f, ramcfg[0]); nvkm_mask(device, NV04_PFB_BOOT_0, 0x3f, ramcfg[0]);
if (ramcfg[1] & 0x80) if (ramcfg[1] & 0x80)
nv_mask(init, NV04_PFB_CFG0, 0, NV04_PFB_CFG0_SCRAMBLE); nvkm_mask(device, NV04_PFB_CFG0, 0, NV04_PFB_CFG0_SCRAMBLE);
nv_mask(init, NV04_PFB_CFG1, 0x700001, (ramcfg[1] & 1) << 20); nvkm_mask(device, NV04_PFB_CFG1, 0x700001, (ramcfg[1] & 1) << 20);
nv_mask(init, NV04_PFB_CFG1, 0, 1); nvkm_mask(device, 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(init, NV04_PFB_BOOT_0, nvkm_mask(device, 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(init, NV04_PFB_BOOT_0) & NV04_PFB_BOOT_0_RAM_AMOUNT; v = nvkm_rd32(device, 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(init, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT, nvkm_mask(device, 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(init, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT, nvkm_mask(device, 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(init, NV04_PFB_BOOT_0, NV04_PFB_BOOT_0_RAM_AMOUNT, nvkm_mask(device, 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:
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv10.c
View file @ 8ac3f64f
...@@ -30,33 +30,32 @@ ...@@ -30,33 +30,32 @@
#include <subdev/bios/init.h> #include <subdev/bios/init.h>
static void static void
nv10_devinit_meminit(struct nvkm_devinit *devinit) nv10_devinit_meminit(struct nvkm_devinit *init)
{ {
struct nv04_devinit *init = (void *)devinit; struct nvkm_device *device = init->subdev.device;
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(init)->card_type >= NV_11 && if (device->card_type >= NV_11 && device->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(init)); fb = fbmem_init(device);
if (!fb) { if (!fb) {
nv_error(init, "failed to map fb\n"); nv_error(init, "failed to map fb\n");
return; return;
} }
nv_wr32(init, NV10_PFB_REFCTRL, NV10_PFB_REFCTRL_VALID_1); nvkm_wr32(device, 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(init, NV04_PFB_CFG0, 0x30, mem_width[i]); nvkm_mask(device, 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 +74,7 @@ nv10_devinit_meminit(struct nvkm_devinit *devinit) ...@@ -75,7 +74,7 @@ nv10_devinit_meminit(struct nvkm_devinit *devinit)
/* 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(init, 0x10020c) - 0x100000; int off = nvkm_rd32(device, 0x10020c) - 0x100000;
fbmem_poke(fb, off, patt); fbmem_poke(fb, off, patt);
fbmem_poke(fb, 0, 0); fbmem_poke(fb, 0, 0);
...@@ -90,7 +89,7 @@ nv10_devinit_meminit(struct nvkm_devinit *devinit) ...@@ -90,7 +89,7 @@ nv10_devinit_meminit(struct nvkm_devinit *devinit)
} }
/* IC missing - disable the upper half memory space. */ /* IC missing - disable the upper half memory space. */
nv_mask(init, NV04_PFB_CFG0, 0x1000, 0); nvkm_mask(device, NV04_PFB_CFG0, 0x1000, 0);
amount_found: amount_found:
fbmem_fini(fb); fbmem_fini(fb);
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv20.c
View file @ 8ac3f64f
...@@ -45,19 +45,19 @@ nv20_devinit_meminit(struct nvkm_devinit *devinit) ...@@ -45,19 +45,19 @@ nv20_devinit_meminit(struct nvkm_devinit *devinit)
return; return;
} }
nv_wr32(init, NV10_PFB_REFCTRL, NV10_PFB_REFCTRL_VALID_1); nvkm_wr32(device, NV10_PFB_REFCTRL, NV10_PFB_REFCTRL_VALID_1);
/* Allow full addressing */ /* Allow full addressing */
nv_mask(init, NV04_PFB_CFG0, 0, mask); nvkm_mask(device, NV04_PFB_CFG0, 0, mask);
amount = nv_rd32(init, 0x10020c); amount = nvkm_rd32(device, 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(init, 0x10020c); amount = nvkm_rd32(device, 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(init, NV04_PFB_CFG0, mask, 0); nvkm_mask(device, NV04_PFB_CFG0, mask, 0);
fbmem_fini(fb); fbmem_fini(fb);
} }
......
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
View file @ 8ac3f64f
...@@ -33,43 +33,45 @@ ...@@ -33,43 +33,45 @@
#include <subdev/vga.h> #include <subdev/vga.h>
int int
nv50_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) nv50_devinit_pll_set(struct nvkm_devinit *init, u32 type, u32 freq)
{ {
struct nv50_devinit *init = (void *)devinit; struct nvkm_subdev *subdev = &init->subdev;
struct nvkm_bios *bios = nvkm_bios(init); struct nvkm_device *device = subdev->device;
struct nvkm_bios *bios = device->bios;
struct nvbios_pll info; struct nvbios_pll info;
int N1, M1, N2, M2, P; int N1, M1, N2, M2, P;
int ret; int ret;
ret = nvbios_pll_parse(bios, type, &info); ret = nvbios_pll_parse(bios, type, &info);
if (ret) { if (ret) {
nv_error(devinit, "failed to retrieve pll data, %d\n", ret); nv_error(subdev, "failed to retrieve pll data, %d\n", ret);
return ret; return ret;
} }
ret = nv04_pll_calc(nv_subdev(devinit), &info, freq, &N1, &M1, &N2, &M2, &P); ret = nv04_pll_calc(subdev, &info, freq, &N1, &M1, &N2, &M2, &P);
if (!ret) { if (!ret) {
nv_error(devinit, "failed pll calculation\n"); nv_error(subdev, "failed pll calculation\n");
return ret; return ret;
} }
switch (info.type) { switch (info.type) {
case PLL_VPLL0: case PLL_VPLL0:
case PLL_VPLL1: case PLL_VPLL1:
nv_wr32(init, info.reg + 0, 0x10000611); nvkm_wr32(device, info.reg + 0, 0x10000611);
nv_mask(init, info.reg + 4, 0x00ff00ff, (M1 << 16) | N1); nvkm_mask(device, info.reg + 4, 0x00ff00ff, (M1 << 16) | N1);
nv_mask(init, info.reg + 8, 0x7fff00ff, (P << 28) | nvkm_mask(device, info.reg + 8, 0x7fff00ff, (P << 28) |
(M2 << 16) | N2); (M2 << 16) | N2);
break; break;
case PLL_MEMORY: case PLL_MEMORY:
nv_mask(init, info.reg + 0, 0x01ff0000, (P << 22) | nvkm_mask(device, info.reg + 0, 0x01ff0000,
(info.bias_p << 19) | (P << 22) |
(P << 16)); (info.bias_p << 19) |
nv_wr32(init, info.reg + 4, (N1 << 8) | M1); (P << 16));
nvkm_wr32(device, info.reg + 4, (N1 << 8) | M1);
break; break;
default: default:
nv_mask(init, info.reg + 0, 0x00070000, (P << 16)); nvkm_mask(device, info.reg + 0, 0x00070000, (P << 16));
nv_wr32(init, info.reg + 4, (N1 << 8) | M1); nvkm_wr32(device, info.reg + 4, (N1 << 8) | M1);
break; break;
} }
...@@ -77,10 +79,10 @@ nv50_devinit_pll_set(struct nvkm_devinit *devinit, u32 type, u32 freq) ...@@ -77,10 +79,10 @@ 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 *init)
{ {
struct nv50_devinit *init = (void *)devinit; struct nvkm_device *device = init->subdev.device;
u32 r001540 = nv_rd32(init, 0x001540); u32 r001540 = nvkm_rd32(device, 0x001540);
u64 disable = 0ULL; u64 disable = 0ULL;
if (!(r001540 & 0x40000000)) if (!(r001540 & 0x40000000))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7