diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 07:54:18 +0300 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 05:40:39 +0300 |
| commit | 19fef52d93518cc01fd284b55ee93c0a9967634f (patch) | |
| tree | c795241f4d7f285f0e0da8a7303d522566679054 /drivers/gpu/drm/nouveau/include | |
| 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/include')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h (renamed from drivers/gpu/drm/nouveau/include/nvkm/engine/dmaobj.h) | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h index 334d64dbb641..1d72d670bed2 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/core/device.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/core/device.h @@ -133,7 +133,7 @@ struct nvkm_device { struct nvkm_engine *ce[3]; struct nvkm_engine *cipher; struct nvkm_disp *disp; - struct nvkm_dmaeng *dma; + struct nvkm_dma *dma; struct nvkm_fifo *fifo; struct nvkm_gr *gr; struct nvkm_engine *ifb; @@ -193,7 +193,7 @@ struct nvkm_device_chip { int (*ce[3] )(struct nvkm_device *, int idx, struct nvkm_engine **); int (*cipher )(struct nvkm_device *, int idx, struct nvkm_engine **); int (*disp )(struct nvkm_device *, int idx, struct nvkm_disp **); - int (*dma )(struct nvkm_device *, int idx, struct nvkm_dmaeng **); + int (*dma )(struct nvkm_device *, int idx, struct nvkm_dma **); int (*fifo )(struct nvkm_device *, int idx, struct nvkm_fifo **); int (*gr )(struct nvkm_device *, int idx, struct nvkm_gr **); int (*ifb )(struct nvkm_device *, int idx, struct nvkm_engine **); diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/dmaobj.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h index 343d2d73cd94..5f461e95987e 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/engine/dmaobj.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h @@ -1,5 +1,5 @@ -#ifndef __NVKM_DMAOBJ_H__ -#define __NVKM_DMAOBJ_H__ +#ifndef __NVKM_DMA_H__ +#define __NVKM_DMA_H__ #include <core/engine.h> struct nvkm_gpuobj; @@ -11,7 +11,7 @@ struct nvkm_dmaobj { u64 limit; }; -struct nvkm_dmaeng { +struct nvkm_dma { struct nvkm_engine engine; /* creates a "physical" dma object from a struct nvkm_dmaobj */ |