diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:22 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:37:44 +1000 |
| commit | ed4bb4e997bd83443c9bf6766c2de60d3a2f8897 (patch) | |
| tree | 631a8691e3b81f1227d63328e30d7b27887f0245 /drm/nouveau/nvkm/subdev/devinit/g98.c | |
| parent | 724b52d8519cd6ed1f8123d08f4ff09fe7a85e4c (diff) | |
| download | nouveau-ed4bb4e997bd83443c9bf6766c2de60d3a2f8897.tar.gz | |
core: remove the remainder of the previous style
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/subdev/devinit/g98.c')
| -rw-r--r-- | drm/nouveau/nvkm/subdev/devinit/g98.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drm/nouveau/nvkm/subdev/devinit/g98.c b/drm/nouveau/nvkm/subdev/devinit/g98.c index a381efa9a..a9d45844d 100644 --- a/drm/nouveau/nvkm/subdev/devinit/g98.c +++ b/drm/nouveau/nvkm/subdev/devinit/g98.c @@ -35,17 +35,17 @@ g98_devinit_disable(struct nvkm_devinit *init) u64 disable = 0ULL; if (!(r001540 & 0x40000000)) { - disable |= (1ULL << NVDEV_ENGINE_MSPDEC); - disable |= (1ULL << NVDEV_ENGINE_MSVLD); - disable |= (1ULL << NVDEV_ENGINE_MSPPP); + disable |= (1ULL << NVKM_ENGINE_MSPDEC); + disable |= (1ULL << NVKM_ENGINE_MSVLD); + disable |= (1ULL << NVKM_ENGINE_MSPPP); } if (!(r00154c & 0x00000004)) - disable |= (1ULL << NVDEV_ENGINE_DISP); + disable |= (1ULL << NVKM_ENGINE_DISP); if (!(r00154c & 0x00000020)) - disable |= (1ULL << NVDEV_ENGINE_MSVLD); + disable |= (1ULL << NVKM_ENGINE_MSVLD); if (!(r00154c & 0x00000040)) - disable |= (1ULL << NVDEV_ENGINE_SEC); + disable |= (1ULL << NVKM_ENGINE_SEC); return disable; } |