diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 04:54:05 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 02:40:06 (GMT) |
| commit | d351b8569e3c57bf5dc3dd5a1295974a9e04316e (patch) | |
| tree | 37bee5277efff81600a6457c758da1bdae6fb23b /drivers/gpu/drm/nouveau/nvkm | |
| parent | 0d5dd3f301bbc66c41b219f50fa97a6df1965cfe (diff) | |
| download | linux-d351b8569e3c57bf5dc3dd5a1295974a9e04316e.tar.xz | |
drm/nouveau/subdev: add direct pointer to nvkm_device
Will be utilised in upcoming commits to remove the need for heuristics
to lookup the device a subdev belongs to.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c index c5fb3a79..b96cb2c 100644 --- a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c +++ b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c @@ -114,6 +114,9 @@ nvkm_subdev_create_(struct nvkm_object *parent, struct nvkm_object *engine, struct nvkm_device *device = nv_device(parent); subdev->debug = nvkm_dbgopt(device->dbgopt, subname); subdev->mmio = nv_subdev(device)->mmio; + subdev->device = device; + } else { + subdev->device = nv_device(subdev); } return 0; diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c index dea5816..980822d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c @@ -44,6 +44,7 @@ static int nvkm_gpio_find(struct nvkm_gpio *gpio, int idx, u8 tag, u8 line, struct dcb_gpio_func *func) { + struct nvkm_device *device = gpio->base.device; struct nvkm_bios *bios = nvkm_bios(gpio); u8 ver, len; u16 data; @@ -56,7 +57,7 @@ nvkm_gpio_find(struct nvkm_gpio *gpio, int idx, u8 tag, u8 line, return 0; /* Apple iMac G4 NV18 */ - if (nv_device_match(nv_object(gpio), 0x0189, 0x10de, 0x0010)) { + if (nv_device_match(device, 0x0189, 0x10de, 0x0010)) { if (tag == DCB_GPIO_TVDAC0) { *func = (struct dcb_gpio_func) { .func = DCB_GPIO_TVDAC0, diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c index b744136..1e9f1d0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c @@ -54,7 +54,6 @@ static void gk104_pmu_pgob(struct nvkm_pmu *pmu, bool enable) { struct nvkm_device *device = nv_device(pmu); - struct nvkm_object *dev = nv_object(device); nv_mask(pmu, 0x000200, 0x00001000, 0x00000000); nv_rd32(pmu, 0x000200); @@ -76,8 +75,8 @@ gk104_pmu_pgob(struct nvkm_pmu *pmu, bool enable) nv_mask(pmu, 0x000200, 0x00001000, 0x00001000); nv_rd32(pmu, 0x000200); - if (nv_device_match(dev, 0x11fc, 0x17aa, 0x2211) /* Lenovo W541 */ - || nv_device_match(dev, 0x11fc, 0x17aa, 0x221e) /* Lenovo W541 */ + if (nv_device_match(device, 0x11fc, 0x17aa, 0x2211) /* Lenovo W541 */ + || nv_device_match(device, 0x11fc, 0x17aa, 0x221e) /* Lenovo W541 */ || nvkm_boolopt(device->cfgopt, "War00C800_0", false)) { nv_info(pmu, "hw bug workaround enabled\n"); switch (device->chipset) { |