diff options
| author | Ben Skeggs | 2015-01-14 03:37:00 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2015-01-22 03:17:47 +0100 |
| commit | bd8369ecf5e7f5fce9f72b2934dc43a844134a13 (patch) | |
| tree | a8efea03304e96c1d53da6e2fbf031e744c1bd91 /drivers/gpu/drm/nouveau/nvkm/subdev/devinit | |
| parent | drm/nouveau/sw: rename from software (no binary change) (diff) | |
| download | kernel-qcow2-linux-bd8369ecf5e7f5fce9f72b2934dc43a844134a13.tar.gz kernel-qcow2-linux-bd8369ecf5e7f5fce9f72b2934dc43a844134a13.tar.xz kernel-qcow2-linux-bd8369ecf5e7f5fce9f72b2934dc43a844134a13.zip | |
drm/nouveau/msenc: rename from venc (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/subdev/devinit')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nvc0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nvc0.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nvc0.c index 4fbe8e9c97f0..4ad22a48ff3a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nvc0.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nvc0.c @@ -77,7 +77,7 @@ nvc0_devinit_disable(struct nouveau_devinit *devinit) if (r022500 & 0x00000004) disable |= (1ULL << NVDEV_ENGINE_MSVLD); if (r022500 & 0x00000008) - disable |= (1ULL << NVDEV_ENGINE_VENC); + disable |= (1ULL << NVDEV_ENGINE_MSENC); if (r022500 & 0x00000100) disable |= (1ULL << NVDEV_ENGINE_CE0); if (r022500 & 0x00000200) |