diff options
| author | Maarten Lankhorst | 2012-11-23 02:08:23 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2012-11-29 00:58:07 +0100 |
| commit | 23c14ed2eccc925c2afabcfb7e46b4b45d7fdf70 (patch) | |
| tree | c2a6231e4cfd3f2c4121915e0bdd922d596473bc /drivers/gpu/drm/nouveau/core/engine/fifo | |
| parent | drm/nouveau/vdec: remove nouveau_{bsp,vp} base classes, use nouveau_engine di... (diff) | |
| download | kernel-qcow2-linux-23c14ed2eccc925c2afabcfb7e46b4b45d7fdf70.tar.gz kernel-qcow2-linux-23c14ed2eccc925c2afabcfb7e46b4b45d7fdf70.tar.xz kernel-qcow2-linux-23c14ed2eccc925c2afabcfb7e46b4b45d7fdf70.zip | |
nvc0/bsp: initial implementation of engine
Will allow use of the engine if firmware (nvXX_fuc084) provided.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/engine/fifo')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c index 6f21be600557..d7c3f3ef30ae 100644 --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c @@ -103,6 +103,9 @@ nvc0_fifo_context_attach(struct nouveau_object *parent, case NVDEV_ENGINE_GR : addr = 0x0210; break; case NVDEV_ENGINE_COPY0: addr = 0x0230; break; case NVDEV_ENGINE_COPY1: addr = 0x0240; break; + case NVDEV_ENGINE_BSP : addr = 0x0270; break; + case NVDEV_ENGINE_VP : addr = 0x0250; break; + case NVDEV_ENGINE_PPP : addr = 0x0260; break; default: return -EINVAL; } @@ -137,6 +140,9 @@ nvc0_fifo_context_detach(struct nouveau_object *parent, bool suspend, case NVDEV_ENGINE_GR : addr = 0x0210; break; case NVDEV_ENGINE_COPY0: addr = 0x0230; break; case NVDEV_ENGINE_COPY1: addr = 0x0240; break; + case NVDEV_ENGINE_BSP : addr = 0x0270; break; + case NVDEV_ENGINE_VP : addr = 0x0250; break; + case NVDEV_ENGINE_PPP : addr = 0x0260; break; default: return -EINVAL; } @@ -178,7 +184,10 @@ nvc0_fifo_chan_ctor(struct nouveau_object *parent, (1 << NVDEV_ENGINE_SW) | (1 << NVDEV_ENGINE_GR) | (1 << NVDEV_ENGINE_COPY0) | - (1 << NVDEV_ENGINE_COPY1), &chan); + (1 << NVDEV_ENGINE_COPY1) | + (1 << NVDEV_ENGINE_BSP) | + (1 << NVDEV_ENGINE_VP) | + (1 << NVDEV_ENGINE_PPP), &chan); *pobject = nv_object(chan); if (ret) return ret; |