diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:20 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:37:42 +1000 |
| commit | 6b799c060126a4ca3da6e49460fd0ebe2b76d5cf (patch) | |
| tree | 51c6ab203de1bcc408bbe77b404d16d0d837ea1e /drm/nouveau/include/nvkm | |
| parent | 2f2bbfbbe37511bac672572903ac2a5ff7a37fda (diff) | |
| download | nouveau-6b799c060126a4ca3da6e49460fd0ebe2b76d5cf.tar.gz | |
devinit: run devinit scripts right after preinit
This ensures we have a valid mask of disabled engines before we start
trying to execute fini()/init() on the subdevs, potentially touching
devices that don't exist.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/include/nvkm')
| -rw-r--r-- | drm/nouveau/include/nvkm/subdev/devinit.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drm/nouveau/include/nvkm/subdev/devinit.h b/drm/nouveau/include/nvkm/subdev/devinit.h index 9e053460a..6c1407fd3 100644 --- a/drm/nouveau/include/nvkm/subdev/devinit.h +++ b/drm/nouveau/include/nvkm/subdev/devinit.h @@ -13,6 +13,7 @@ u32 nvkm_devinit_mmio(struct nvkm_devinit *, u32 addr); int nvkm_devinit_pll_set(struct nvkm_devinit *, u32 type, u32 khz); void nvkm_devinit_meminit(struct nvkm_devinit *); u64 nvkm_devinit_disable(struct nvkm_devinit *); +int nvkm_devinit_post(struct nvkm_devinit *, u64 *disable); int nv04_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **); int nv05_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **); |