summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nvkm
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:08 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:40:13 +1000
commit94bab102233e30d08fcb33a424ec56520b22eb1b (patch)
treec6f6a399f731abf54b9ff4fc96d544470c2e15f0 /drivers/gpu/drm/nouveau/nvkm
parentdd64694208d7c902ba7a5bcd2bf012c1087ba0f0 (diff)
drm/nouveau/core: switch to device pri macros
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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c
index b96cb2cca55e..fd1a94c5bf38 100644
--- a/drivers/gpu/drm/nouveau/nvkm/core/subdev.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/subdev.c
@@ -64,9 +64,11 @@ _nvkm_subdev_init(struct nvkm_object *object)
int
nvkm_subdev_fini(struct nvkm_subdev *subdev, bool suspend)
{
+ struct nvkm_device *device = subdev->device;
+
if (subdev->unit) {
- nv_mask(subdev, 0x000200, subdev->unit, 0x00000000);
- nv_mask(subdev, 0x000200, subdev->unit, subdev->unit);
+ nvkm_mask(device, 0x000200, subdev->unit, 0x00000000);
+ nvkm_mask(device, 0x000200, subdev->unit, subdev->unit);
}
return nvkm_object_fini(&subdev->object, suspend);