diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-08-21 13:26:42 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-11-05 16:15:43 +1000 |
| commit | 156813516058fdc72406a81095fe9021dde46f92 (patch) | |
| tree | 9f4764eafd8cbbb59155d7fab11a0e93a02db688 | |
| parent | 4faf7f2c6cb9cf68be4e8cb1136653036542da4c (diff) | |
| download | nouveau-156813516058fdc72406a81095fe9021dde46f92.tar.gz | |
vic: rename PUNK1C1 to PVIC
NVIDIA's name for what rnndb calls PVCOMP.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | nvkm/engine/device/base.c | 2 | ||||
| -rw-r--r-- | nvkm/engine/fifo/nv84.c | 6 | ||||
| -rw-r--r-- | nvkm/include/core/class.h | 2 | ||||
| -rw-r--r-- | nvkm/include/core/device.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/nvkm/engine/device/base.c b/nvkm/engine/device/base.c index 4c7257165..1407d80b9 100644 --- a/nvkm/engine/device/base.c +++ b/nvkm/engine/device/base.c @@ -87,7 +87,7 @@ static const u64 disable_map[] = { [NVDEV_ENGINE_PPP] = NV_DEVICE_DISABLE_PPP, [NVDEV_ENGINE_COPY0] = NV_DEVICE_DISABLE_COPY0, [NVDEV_ENGINE_COPY1] = NV_DEVICE_DISABLE_COPY1, - [NVDEV_ENGINE_UNK1C1] = NV_DEVICE_DISABLE_UNK1C1, + [NVDEV_ENGINE_VIC] = NV_DEVICE_DISABLE_VIC, [NVDEV_ENGINE_VENC] = NV_DEVICE_DISABLE_VENC, [NVDEV_ENGINE_DISP] = NV_DEVICE_DISABLE_DISP, [NVDEV_SUBDEV_NR] = 0, diff --git a/nvkm/engine/fifo/nv84.c b/nvkm/engine/fifo/nv84.c index 91a87cd71..0c2c18bea 100644 --- a/nvkm/engine/fifo/nv84.c +++ b/nvkm/engine/fifo/nv84.c @@ -144,7 +144,7 @@ nv84_fifo_object_attach(struct nouveau_object *parent, case NVDEV_ENGINE_COPY0 : context |= 0x00300000; break; case NVDEV_ENGINE_VP : context |= 0x00400000; break; case NVDEV_ENGINE_CRYPT : - case NVDEV_ENGINE_UNK1C1: context |= 0x00500000; break; + case NVDEV_ENGINE_VIC : context |= 0x00500000; break; case NVDEV_ENGINE_BSP : context |= 0x00600000; break; default: return -EINVAL; @@ -180,7 +180,7 @@ nv84_fifo_chan_ctor_dma(struct nouveau_object *parent, (1ULL << NVDEV_ENGINE_BSP) | (1ULL << NVDEV_ENGINE_PPP) | (1ULL << NVDEV_ENGINE_COPY0) | - (1ULL << NVDEV_ENGINE_UNK1C1), &chan); + (1ULL << NVDEV_ENGINE_VIC), &chan); *pobject = nv_object(chan); if (ret) return ret; @@ -243,7 +243,7 @@ nv84_fifo_chan_ctor_ind(struct nouveau_object *parent, (1ULL << NVDEV_ENGINE_BSP) | (1ULL << NVDEV_ENGINE_PPP) | (1ULL << NVDEV_ENGINE_COPY0) | - (1ULL << NVDEV_ENGINE_UNK1C1), &chan); + (1ULL << NVDEV_ENGINE_VIC), &chan); *pobject = nv_object(chan); if (ret) return ret; diff --git a/nvkm/include/core/class.h b/nvkm/include/core/class.h index 5a5961b6a..cf9e73c01 100644 --- a/nvkm/include/core/class.h +++ b/nvkm/include/core/class.h @@ -22,7 +22,7 @@ #define NV_DEVICE_DISABLE_PPP 0x0000004000000000ULL #define NV_DEVICE_DISABLE_COPY0 0x0000008000000000ULL #define NV_DEVICE_DISABLE_COPY1 0x0000010000000000ULL -#define NV_DEVICE_DISABLE_UNK1C1 0x0000020000000000ULL +#define NV_DEVICE_DISABLE_VIC 0x0000020000000000ULL #define NV_DEVICE_DISABLE_VENC 0x0000040000000000ULL struct nv_device_class { diff --git a/nvkm/include/core/device.h b/nvkm/include/core/device.h index 99b6600fe..0a1698fae 100644 --- a/nvkm/include/core/device.h +++ b/nvkm/include/core/device.h @@ -50,7 +50,7 @@ enum nv_subdev_type { NVDEV_ENGINE_COPY0, NVDEV_ENGINE_COPY1, NVDEV_ENGINE_COPY2, - NVDEV_ENGINE_UNK1C1, + NVDEV_ENGINE_VIC, NVDEV_ENGINE_VENC, NVDEV_ENGINE_DISP, |