diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-10-01 09:42:54 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-11-03 14:57:29 +1000 |
| commit | c1b14b5e1121613fd9de2bb7be6a575ac2557cd4 (patch) | |
| tree | 68a85cd9dcc88d246a74c1b80f54fa4db1d7a5d8 | |
| parent | d6e3bb37c468e942d490275eb2e762a0451136ee (diff) | |
| download | nouveau-c1b14b5e1121613fd9de2bb7be6a575ac2557cd4.tar.gz | |
pci: prepare for chipset-specific initialisation tasks
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau/nvkm/subdev/pci/base.c | 3 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/pci/priv.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drm/nouveau/nvkm/subdev/pci/base.c b/drm/nouveau/nvkm/subdev/pci/base.c index d1c148e51..21106223c 100644 --- a/drm/nouveau/nvkm/subdev/pci/base.c +++ b/drm/nouveau/nvkm/subdev/pci/base.c @@ -111,6 +111,9 @@ nvkm_pci_init(struct nvkm_subdev *subdev) return ret; } + if (pci->func->init) + pci->func->init(pci); + ret = request_irq(pdev->irq, nvkm_pci_intr, IRQF_SHARED, "nvkm", pci); if (ret) return ret; diff --git a/drm/nouveau/nvkm/subdev/pci/priv.h b/drm/nouveau/nvkm/subdev/pci/priv.h index 473b8ab25..1acd4bc64 100644 --- a/drm/nouveau/nvkm/subdev/pci/priv.h +++ b/drm/nouveau/nvkm/subdev/pci/priv.h @@ -7,6 +7,7 @@ int nvkm_pci_new_(const struct nvkm_pci_func *, struct nvkm_device *, int index, struct nvkm_pci **); struct nvkm_pci_func { + void (*init)(struct nvkm_pci *); u32 (*rd32)(struct nvkm_pci *, u16 addr); void (*wr08)(struct nvkm_pci *, u16 addr, u8 data); void (*wr32)(struct nvkm_pci *, u16 addr, u32 data); |