diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-05-19 23:59:34 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-06-16 14:04:45 +1000 |
| commit | 4fdc6ba32eba1b90a39a65e19dacb67329f8c0e5 (patch) | |
| tree | addb883ec05f4eaead3f1cc0288c129a58a5486d | |
| parent | 28c62976a8a7de7cbdc6908ec0d575cef3cfe288 (diff) | |
drm/nouveau/fb/ram/nv40-: use new devinit script interpreter entry-point
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c | 12 |
3 files changed, 4 insertions, 22 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c index f6c00791722c..75814f15eb53 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c @@ -1424,12 +1424,7 @@ gk104_ram_init(struct nvkm_ram *ram) for (i = 0; i < cnt; i++, data += 4) { if (i != save >> 4) { nvkm_mask(device, 0x10f65c, 0x000000f0, i << 4); - nvbios_exec(&(struct nvbios_init) { - .subdev = subdev, - .bios = bios, - .offset = nvbios_rd32(bios, data), - .execute = 1, - }); + nvbios_init(subdev, nvbios_rd32(bios, data)); } } nvkm_mask(device, 0x10f65c, 0x000000f0, save); diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c index cac70047ad5a..df8a87333b67 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c @@ -59,12 +59,7 @@ gp100_ram_init(struct nvkm_ram *ram) for (i = 0; i < cnt; i++, data += 4) { if (i != save >> 4) { nvkm_mask(device, 0x9a065c, 0x000000f0, i << 4); - nvbios_exec(&(struct nvbios_init) { - .subdev = subdev, - .bios = bios, - .offset = nvbios_rd32(bios, data), - .execute = 1, - }); + nvbios_init(subdev, nvbios_rd32(bios, data)); } } nvkm_mask(device, 0x9a065c, 0x000000f0, save); diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c index 56f8cffc2560..70c63535d56b 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c @@ -150,16 +150,8 @@ nv40_ram_prog(struct nvkm_ram *base) udelay(100); /* execute memory reset script from vbios */ - if (!bit_entry(bios, 'M', &M)) { - struct nvbios_init init = { - .subdev = subdev, - .bios = bios, - .offset = nvbios_rd16(bios, M.offset + 0x00), - .execute = 1, - }; - - nvbios_exec(&init); - } + if (!bit_entry(bios, 'M', &M)) + nvbios_init(subdev, nvbios_rd16(bios, M.offset + 0x00)); /* make sure we're in vblank (hopefully the same one as before), and * then re-enable crtc memory access |