iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/fb/ram/nv40-: use new devinit script interpreter entry-point

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2017-05-19 23:59:34 +10:00
parent 28c62976a8
commit 4fdc6ba32e
3 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c
View File

@ -1424,12 +1424,7 @@ gk104_ram_init(struct nvkm_ram *ram)
for (i = 0; i < cnt; i++, data += 4) { for (i = 0; i < cnt; i++, data += 4) {
if (i != save >> 4) { if (i != save >> 4) {
nvkm_mask(device, 0x10f65c, 0x000000f0, i << 4); nvkm_mask(device, 0x10f65c, 0x000000f0, i << 4);
nvbios_exec(&(struct nvbios_init) { nvbios_init(subdev, nvbios_rd32(bios, data));
.subdev = subdev,
.bios = bios,
.offset = nvbios_rd32(bios, data),
.execute = 1,
});
} }
} }
nvkm_mask(device, 0x10f65c, 0x000000f0, save); nvkm_mask(device, 0x10f65c, 0x000000f0, save);

7
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
View File

@ -59,12 +59,7 @@ gp100_ram_init(struct nvkm_ram *ram)
for (i = 0; i < cnt; i++, data += 4) { for (i = 0; i < cnt; i++, data += 4) {
if (i != save >> 4) { if (i != save >> 4) {
nvkm_mask(device, 0x9a065c, 0x000000f0, i << 4); nvkm_mask(device, 0x9a065c, 0x000000f0, i << 4);
nvbios_exec(&(struct nvbios_init) { nvbios_init(subdev, nvbios_rd32(bios, data));
.subdev = subdev,
.bios = bios,
.offset = nvbios_rd32(bios, data),
.execute = 1,
});
} }
} }
nvkm_mask(device, 0x9a065c, 0x000000f0, save); nvkm_mask(device, 0x9a065c, 0x000000f0, save);

12
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c
View File

@ -150,16 +150,8 @@ nv40_ram_prog(struct nvkm_ram *base)
udelay(100); udelay(100);
/* execute memory reset script from vbios */ /* execute memory reset script from vbios */
if (!bit_entry(bios, 'M', &M)) { if (!bit_entry(bios, 'M', &M))
struct nvbios_init init = { nvbios_init(subdev, nvbios_rd16(bios, M.offset + 0x00));
.subdev = subdev,
.bios = bios,
.offset = nvbios_rd16(bios, M.offset + 0x00),
.execute = 1,
};
nvbios_exec(&init);
}
/* make sure we're in vblank (hopefully the same one as before), and /* make sure we're in vblank (hopefully the same one as before), and
* then re-enable crtc memory access * then re-enable crtc memory access