diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 11:50:20 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-19 14:23:00 +1000 |
| commit | 174e0a84f7405fb25b73d777fc07657d28d9ab11 (patch) | |
| tree | 679dc2c8150275c096d70481145570e6921fcb3a /drm/nouveau/nvkm/subdev/devinit | |
| parent | 50535e63c7a018040d929a49ba939cb300976e16 (diff) | |
| download | nouveau-174e0a84f7405fb25b73d777fc07657d28d9ab11.tar.gz | |
ce: rename from copy (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 'drm/nouveau/nvkm/subdev/devinit')
| -rw-r--r-- | drm/nouveau/nvkm/subdev/devinit/gm107.c | 4 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/devinit/nva3.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/devinit/nvaf.c | 2 | ||||
| -rw-r--r-- | drm/nouveau/nvkm/subdev/devinit/nvc0.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drm/nouveau/nvkm/subdev/devinit/gm107.c b/drm/nouveau/nvkm/subdev/devinit/gm107.c index 4ba43d6a1..04c04efcc 100644 --- a/drm/nouveau/nvkm/subdev/devinit/gm107.c +++ b/drm/nouveau/nvkm/subdev/devinit/gm107.c @@ -33,9 +33,9 @@ gm107_devinit_disable(struct nouveau_devinit *devinit) u64 disable = 0ULL; if (r021c00 & 0x00000001) - disable |= (1ULL << NVDEV_ENGINE_COPY0); + disable |= (1ULL << NVDEV_ENGINE_CE0); if (r021c00 & 0x00000004) - disable |= (1ULL << NVDEV_ENGINE_COPY2); + disable |= (1ULL << NVDEV_ENGINE_CE2); if (r021c04 & 0x00000001) disable |= (1ULL << NVDEV_ENGINE_DISP); diff --git a/drm/nouveau/nvkm/subdev/devinit/nva3.c b/drm/nouveau/nvkm/subdev/devinit/nva3.c index f662a261c..b116f8040 100644 --- a/drm/nouveau/nvkm/subdev/devinit/nva3.c +++ b/drm/nouveau/nvkm/subdev/devinit/nva3.c @@ -76,7 +76,7 @@ nva3_devinit_disable(struct nouveau_devinit *devinit) if (!(r00154c & 0x00000020)) disable |= (1ULL << NVDEV_ENGINE_MSVLD); if (!(r00154c & 0x00000200)) - disable |= (1ULL << NVDEV_ENGINE_COPY0); + disable |= (1ULL << NVDEV_ENGINE_CE0); return disable; } diff --git a/drm/nouveau/nvkm/subdev/devinit/nvaf.c b/drm/nouveau/nvkm/subdev/devinit/nvaf.c index 6f8ef894e..140c300c7 100644 --- a/drm/nouveau/nvkm/subdev/devinit/nvaf.c +++ b/drm/nouveau/nvkm/subdev/devinit/nvaf.c @@ -44,7 +44,7 @@ nvaf_devinit_disable(struct nouveau_devinit *devinit) if (!(r00154c & 0x00000040)) disable |= (1ULL << NVDEV_ENGINE_VIC); if (!(r00154c & 0x00000200)) - disable |= (1ULL << NVDEV_ENGINE_COPY0); + disable |= (1ULL << NVDEV_ENGINE_CE0); return disable; } diff --git a/drm/nouveau/nvkm/subdev/devinit/nvc0.c b/drm/nouveau/nvkm/subdev/devinit/nvc0.c index ac699a366..c7b2311f4 100644 --- a/drm/nouveau/nvkm/subdev/devinit/nvc0.c +++ b/drm/nouveau/nvkm/subdev/devinit/nvc0.c @@ -79,9 +79,9 @@ nvc0_devinit_disable(struct nouveau_devinit *devinit) if (r022500 & 0x00000008) disable |= (1ULL << NVDEV_ENGINE_VENC); if (r022500 & 0x00000100) - disable |= (1ULL << NVDEV_ENGINE_COPY0); + disable |= (1ULL << NVDEV_ENGINE_CE0); if (r022500 & 0x00000200) - disable |= (1ULL << NVDEV_ENGINE_COPY1); + disable |= (1ULL << NVDEV_ENGINE_CE1); return disable; } |