summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/subdev/devinit
diff options
context:
space:
mode:
authorBen Skeggs2015-08-20 06:54:20 +0200
committerBen Skeggs2015-08-28 04:40:44 +0200
commit551d341755e2ade4a915d889524a4187f2cd210e (patch)
treecceb0afe2c554a138b1d2cff734314b9d75f2adb /drivers/gpu/drm/nouveau/nvkm/subdev/devinit
parentdrm/nouveau/i2c: convert to new-style nvkm_subdev (diff)
downloadkernel-qcow2-linux-551d341755e2ade4a915d889524a4187f2cd210e.tar.gz
kernel-qcow2-linux-551d341755e2ade4a915d889524a4187f2cd210e.tar.xz
kernel-qcow2-linux-551d341755e2ade4a915d889524a4187f2cd210e.zip
drm/nouveau/ibus: convert to new-style nvkm_subdev
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.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
index b9ffe56d9eff..e183729bfee0 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c
@@ -29,7 +29,6 @@
#include <subdev/bios/init.h>
#include <subdev/bios/pll.h>
#include <subdev/clk/pll.h>
-#include <subdev/ibus.h>
#include <subdev/vga.h>
int
@@ -97,7 +96,6 @@ nv50_devinit_preinit(struct nvkm_devinit *base)
struct nv50_devinit *init = nv50_devinit(base);
struct nvkm_subdev *subdev = &init->base.subdev;
struct nvkm_device *device = subdev->device;
- struct nvkm_subdev *ibus = device->ibus;
/* our heuristics can't detect whether the board has had its
* devinit scripts executed or not if the display engine is
@@ -119,13 +117,6 @@ nv50_devinit_preinit(struct nvkm_devinit *base)
init->base.post = true;
}
}
-
- /* some boards appear to require certain init register timeouts
- * to be bumped before runing devinit scripts. not a clue why
- * the vbios engineers didn't make the scripts just work...
- */
- if (init->base.post && ibus)
- nvkm_object_init(&ibus->object);
}
void