diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 04:54:18 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 02:40:39 (GMT) |
| commit | 19fef52d93518cc01fd284b55ee93c0a9967634f (patch) | |
| tree | c795241f4d7f285f0e0da8a7303d522566679054 /drivers/gpu/drm/nouveau/nvkm/engine/fifo | |
| parent | 0e29998a89a6254f5ca9f78167f9ce790d01da45 (diff) | |
| download | linux-19fef52d93518cc01fd284b55ee93c0a9967634f.tar.xz | |
drm/nouveau/dma: split user classes out from engine implementations
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/base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c index 60e5fab..a3b6638 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c @@ -26,7 +26,7 @@ #include <core/client.h> #include <core/handle.h> #include <core/notify.h> -#include <engine/dmaobj.h> +#include <engine/dma.h> #include <nvif/class.h> #include <nvif/event.h> @@ -104,7 +104,7 @@ nvkm_fifo_channel_create_(struct nvkm_object *parent, struct nvkm_fifo *fifo = (void *)engine; struct nvkm_fifo_base *base = (void *)parent; struct nvkm_fifo_chan *chan; - struct nvkm_dmaeng *dmaeng; + struct nvkm_dma *dma; struct nvkm_subdev *subdev = &fifo->engine.subdev; struct nvkm_device *device = subdev->device; unsigned long flags; @@ -124,7 +124,7 @@ nvkm_fifo_channel_create_(struct nvkm_object *parent, return -ENOENT; dmaobj = (void *)handle->object; - dmaeng = (void *)dmaobj->base.engine; + dma = (void *)dmaobj->base.engine; switch (dmaobj->base.oclass->handle) { case NV_DMA_FROM_MEMORY: case NV_DMA_IN_MEMORY: @@ -133,7 +133,7 @@ nvkm_fifo_channel_create_(struct nvkm_object *parent, return -EINVAL; } - ret = dmaeng->bind(dmaobj, &base->gpuobj, &chan->pushgpu); + ret = dma->bind(dmaobj, &base->gpuobj, &chan->pushgpu); if (ret) return ret; } |