diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-01-14 02:37:00 (GMT) |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-01-22 02:17:47 (GMT) |
commit | bd8369ecf5e7f5fce9f72b2934dc43a844134a13 (patch) | |
tree | a8efea03304e96c1d53da6e2fbf031e744c1bd91 /drivers/gpu/drm/nouveau/nvkm/engine/fifo | |
parent | 8700287be2b12d091d477fe0568c3858bdedf4e7 (diff) | |
download | linux-bd8369ecf5e7f5fce9f72b2934dc43a844134a13.tar.xz |
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/engine/fifo')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c index 81dc280..ea31e2d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/nve0.c @@ -53,7 +53,7 @@ static const struct { _(NVDEV_ENGINE_MSVLD , 0), _(NVDEV_ENGINE_CE0 , 0), _(NVDEV_ENGINE_CE1 , 0), - _(NVDEV_ENGINE_VENC , 0), + _(NVDEV_ENGINE_MSENC , 0), }; #undef _ #define FIFO_ENGINE_NR ARRAY_SIZE(fifo_engine) @@ -421,7 +421,7 @@ nve0_fifo_engidx(struct nve0_fifo_priv *priv, u32 engn) case NVDEV_ENGINE_VP : engn = 3; break; case NVDEV_ENGINE_CE0 : engn = 4; break; case NVDEV_ENGINE_CE1 : engn = 5; break; - case NVDEV_ENGINE_VENC : engn = 6; break; + case NVDEV_ENGINE_MSENC: engn = 6; break; default: return -1; } @@ -626,7 +626,7 @@ nve0_fifo_fault_engine[] = { { 0x15, "CE0", NULL, NVDEV_ENGINE_CE0 }, { 0x16, "CE1", NULL, NVDEV_ENGINE_CE1 }, { 0x17, "PMU" }, - { 0x19, "MSENC", NULL, NVDEV_ENGINE_VENC }, + { 0x19, "MSENC", NULL, NVDEV_ENGINE_MSENC }, { 0x1b, "CE2", NULL, NVDEV_ENGINE_CE2 }, {} }; |