Commit 19fef52d authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/dma: split user classes out from engine implementations



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0e29998a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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 **);
+3 −3
Original line number Diff line number Diff line
#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 */
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ include $(src)/nvkm/engine/ce/Kbuild
include $(src)/nvkm/engine/cipher/Kbuild
include $(src)/nvkm/engine/device/Kbuild
include $(src)/nvkm/engine/disp/Kbuild
include $(src)/nvkm/engine/dmaobj/Kbuild
include $(src)/nvkm/engine/dma/Kbuild
include $(src)/nvkm/engine/fifo/Kbuild
include $(src)/nvkm/engine/gr/Kbuild
include $(src)/nvkm/engine/mpeg/Kbuild
+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
#include <engine/ce.h>
#include <engine/cipher.h>
#include <engine/disp.h>
#include <engine/dmaobj.h>
#include <engine/dma.h>
#include <engine/fifo.h>
#include <engine/gr.h>
#include <engine/mpeg.h>
+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@
#include <subdev/fb.h>
#include <subdev/instmem.h>
#include <subdev/timer.h>
#include <engine/disp.h>
#include <engine/dmaobj.h>
#include <engine/fifo.h>
#include <engine/pm.h>

#include <nvif/class.h>
#include <nvif/unpack.h>
Loading