Merge tag 'nfsd-4.13' of git://linux-nfs.org/~bfields/linux

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / nouveau / dispnv04 / disp.h

diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.h b/drivers/gpu/drm/nouveau/dispnv04/disp.h
index bea4543554bac8b2c796ec9d1288771d692877f9..74a8795c2c2bf16a427ecc64416e07741d9b42aa 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.h
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.h
@@ -169,18 +169,10 @@ static inline void
 nouveau_bios_run_init_table(struct drm_device *dev, u16 table,
                            struct dcb_output *outp, int crtc)
 {
-       struct nouveau_drm *drm = nouveau_drm(dev);
-       struct nvkm_bios *bios = nvxx_bios(&drm->client.device);
-       struct nvbios_init init = {
-               .subdev = &bios->subdev,
-               .bios = bios,
-               .offset = table,
-               .outp = outp,
-               .crtc = crtc,
-               .execute = 1,
-       };
-
-       nvbios_exec(&init);
+       nvbios_init(&nvxx_bios(&nouveau_drm(dev)->client.device)->subdev, table,
+               init.outp = outp;
+               init.head = crtc;
+       );
 }
 
 #endif