diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-05-19 16:59:34 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-06-16 07:04:44 +0300 |
| commit | 28c62976a8a7de7cbdc6908ec0d575cef3cfe288 (patch) | |
| tree | 5d4b875fbf1423ef409645bfa837d7f586cf198b /drivers/gpu/drm/nouveau/nvkm/subdev/devinit | |
| parent | 74bcb2e98a3cac5456c9d3bc38c64963d61e481e (diff) | |
| download | linux-28c62976a8a7de7cbdc6908ec0d575cef3cfe288.tar.xz | |
drm/nouveau/devinit: use new devinit script interpreter entry-point
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/devinit')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c index 59362f8dee22..d7947c4391dc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c @@ -137,16 +137,11 @@ nv50_devinit_init(struct nvkm_devinit *base) while (init->base.post && dcb_outp_parse(bios, i, &ver, &hdr, &outp)) { if (nvbios_outp_match(bios, outp.hasht, outp.hashm, &ver, &hdr, &cnt, &len, &info)) { - struct nvbios_init exec = { - .subdev = subdev, - .bios = bios, - .offset = info.script[0], - .outp = &outp, - .crtc = -1, - .execute = 1, - }; - - nvbios_exec(&exec); + nvbios_init(subdev, info.script[0], + init.outp = &outp; + init.or = ffs(outp.or) - 1; + init.link = outp.sorconf.link == 2; + ); } i++; } |