aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-01-13 21:26:28 -0500
committerBen Skeggs <bskeggs@redhat.com>2015-01-21 21:17:46 -0500
commitfd8666f7db94afc1b63b8439d902783b27a2f27f (patch)
tree1c391b89e03e1ef786ea61890642b502c36c50fa /drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
parentd5752b9b86fbfb8febd9d45ac4431325031e25e0 (diff)
drm/nouveau/msppp: rename from ppp (no binary change)
Switch to NVIDIA's name for the device. The namespace of NVKM is being changed to nvkm_ instead of nouveau_, which will be used for the DRM part of the driver. This is being done in order to make it very clear as to what part of the driver a given symbol belongs to, and as a minor step towards splitting the DRM driver out to be able to stand on its own (for virt). Because there's already a large amount of churn here anyway, this is as good a time as any to also switch to NVIDIA's device and chipset naming to ease collaboration with them. A comparison of objdump disassemblies proves no code changes. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/device/base.c')
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/engine/device/base.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
index 5b226cb04298..fda8d729aa30 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
@@ -234,7 +234,7 @@ static const u64 disable_map[] = {
234 [NVDEV_ENGINE_VP] = NV_DEVICE_V0_DISABLE_VP, 234 [NVDEV_ENGINE_VP] = NV_DEVICE_V0_DISABLE_VP,
235 [NVDEV_ENGINE_CIPHER] = NV_DEVICE_V0_DISABLE_CIPHER, 235 [NVDEV_ENGINE_CIPHER] = NV_DEVICE_V0_DISABLE_CIPHER,
236 [NVDEV_ENGINE_BSP] = NV_DEVICE_V0_DISABLE_BSP, 236 [NVDEV_ENGINE_BSP] = NV_DEVICE_V0_DISABLE_BSP,
237 [NVDEV_ENGINE_PPP] = NV_DEVICE_V0_DISABLE_PPP, 237 [NVDEV_ENGINE_MSPPP] = NV_DEVICE_V0_DISABLE_MSPPP,
238 [NVDEV_ENGINE_CE0] = NV_DEVICE_V0_DISABLE_CE0, 238 [NVDEV_ENGINE_CE0] = NV_DEVICE_V0_DISABLE_CE0,
239 [NVDEV_ENGINE_CE1] = NV_DEVICE_V0_DISABLE_CE1, 239 [NVDEV_ENGINE_CE1] = NV_DEVICE_V0_DISABLE_CE1,
240 [NVDEV_ENGINE_CE2] = NV_DEVICE_V0_DISABLE_CE2, 240 [NVDEV_ENGINE_CE2] = NV_DEVICE_V0_DISABLE_CE2,