From: Ben Skeggs Date: Mon, 13 Jan 2014 23:38:50 +0000 (+1000) Subject: drm/nve0/fifo: allow copy engine channel to be looked up by instance X-Git-Tag: v3.15-rc1~51^2~39^2~48 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=448a4532a059470635b67e48340d6c374905db5f;p=karo-tx-linux.git drm/nve0/fifo: allow copy engine channel to be looked up by instance Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c index bd67906ba0b7..027133754896 100644 --- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c +++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c @@ -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;