drm/nve0/fifo: allow copy engine channel to be looked up by instance
authorBen Skeggs <bskeggs@redhat.com>
Mon, 13 Jan 2014 23:38:50 +0000 (09:38 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 26 Mar 2014 04:00:53 +0000 (14:00 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c

index bd67906ba0b7a04d40fcb3f8b8adbac7dbb70594..0271337548966ab474dd54399727348b0231a1ae 100644 (file)
@@ -137,9 +137,11 @@ nve0_fifo_context_attach(struct nouveau_object *parent,
 
        switch (nv_engidx(object->engine)) {
        case NVDEV_ENGINE_SW   :
+               return 0;
        case NVDEV_ENGINE_COPY0:
        case NVDEV_ENGINE_COPY1:
        case NVDEV_ENGINE_COPY2:
+               nv_engctx(ectx)->addr = nv_gpuobj(base)->addr >> 12;
                return 0;
        case NVDEV_ENGINE_GR   : addr = 0x0210; break;
        case NVDEV_ENGINE_BSP  : addr = 0x0270; break;