diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:14 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:29 +1000 |
| commit | a8dae9fe0e8ad94de1bb2bfda90d288c1b9eb6e6 (patch) | |
| tree | 7db67236539b5945ee61c9cdcc5202098761806d /drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c | |
| parent | 95cf469cc3b266324cd9129f93a2d44b85ea27ed (diff) | |
| download | op-kernel-dev-a8dae9fe0e8ad94de1bb2bfda90d288c1b9eb6e6.zip op-kernel-dev-a8dae9fe0e8ad94de1bb2bfda90d288c1b9eb6e6.tar.gz | |
drm/nouveau/vga: require nvkm_device pointer in accessor functions
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c index 4338e43..989513f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c @@ -36,7 +36,7 @@ _nvkm_devinit_fini(struct nvkm_object *object, bool suspend) init->post = true; /* unlock the extended vga crtc regs */ - nv_lockvgac(init, false); + nvkm_lockvgac(init->subdev.device, false); return nvkm_subdev_fini(&init->subdev, suspend); } @@ -67,7 +67,7 @@ _nvkm_devinit_dtor(struct nvkm_object *object) struct nvkm_devinit *init = (void *)object; /* lock crtc regs */ - nv_lockvgac(init, true); + nvkm_lockvgac(init->subdev.device, true); nvkm_subdev_destroy(&init->subdev); } |
