diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-10-12 12:30:25 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-10-12 12:30:25 +1000 |
| commit | a8ede6474c1eb85978837453fad39b4b5fccef46 (patch) | |
| tree | b946bff28d9bbee98d96cf7485af9dcc76a8364f /drm | |
| parent | 37ad451418b5e53ddfe7143c16c20322972a3442 (diff) | |
| download | nouveau-a8ede6474c1eb85978837453fad39b4b5fccef46.tar.gz | |
v4.3-rc5
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/nouveau/dispnv04/dfp.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/engine/gr/nv10.c | 4 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/bios/shadowof.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drm/nouveau/dispnv04/dfp.c b/drm/nouveau/dispnv04/dfp.c index 522e91ab5..429ab5e30 100644 --- a/drm/nouveau/dispnv04/dfp.c +++ b/drm/nouveau/dispnv04/dfp.c @@ -485,7 +485,7 @@ static void nv04_dfp_update_backlight(struct drm_encoder *encoder, int mode) { #ifdef __powerpc__ struct drm_device *dev = encoder->dev; - struct nvif_device *device = &nouveau_drm(dev)->device; + struct nvif_object *device = &nouveau_drm(dev)->device.object; /* BIOS scripts usually take care of the backlight, thanks * Apple for your consistency. diff --git a/drm/nouveau/nvkm/engine/gr/nv10.c b/drm/nouveau/nvkm/engine/gr/nv10.c index 9436ada62..4542867fa 100644 --- a/drm/nouveau/nvkm/engine/gr/nv10.c +++ b/drm/nouveau/nvkm/engine/gr/nv10.c @@ -791,7 +791,7 @@ nv10_gr_ctx_regs_find_offset(struct nv10_gr *gr, int reg) if (nv10_gr_ctx_regs[i] == reg) return i; } - nvkm_error(subdev, "unknow offset nv10_ctx_regs %d\n", reg); + nvkm_error(subdev, "unknown offset nv10_ctx_regs %d\n", reg); return -1; } @@ -804,7 +804,7 @@ nv17_gr_ctx_regs_find_offset(struct nv10_gr *gr, int reg) if (nv17_gr_ctx_regs[i] == reg) return i; } - nvkm_error(subdev, "unknow offset nv17_ctx_regs %d\n", reg); + nvkm_error(subdev, "unknown offset nv17_ctx_regs %d\n", reg); return -1; } diff --git a/drm/nouveau/nvkm/subdev/bios/shadowof.c b/drm/nouveau/nvkm/subdev/bios/shadowof.c index 29a37f03e..bd60d7dd0 100644 --- a/drm/nouveau/nvkm/subdev/bios/shadowof.c +++ b/drm/nouveau/nvkm/subdev/bios/shadowof.c @@ -21,7 +21,7 @@ * */ #include "priv.h" - +#include <core/pci.h> #if defined(__powerpc__) struct priv { @@ -43,7 +43,7 @@ of_read(void *data, u32 offset, u32 length, struct nvkm_bios *bios) static void * of_init(struct nvkm_bios *bios, const char *name) { - struct pci_dev *pdev = bios->subdev.device->pdev; + struct pci_dev *pdev = bios->subdev.device->func->pci(bios->subdev.device)->pdev; struct device_node *dn; struct priv *priv; if (!(dn = pci_device_to_OF_node(pdev))) |