From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 14 Aug 2012 05:02:29 +0000 (+1000)
Subject: drm/nouveau/fifo: version the dma channel class struct
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a7c6e75eb28d18ed8d53182891330f5c1fa4477c;p=openwrt%2Fstaging%2Fblogic.git

drm/nouveau/fifo: version the dma channel class struct

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
index ed771921e924..cc49284be181 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
@@ -118,7 +118,7 @@ nv04_fifo_chan_ctor(struct nouveau_object *parent,
 {
 	struct nv04_fifo_priv *priv = (void *)engine;
 	struct nv04_fifo_chan *chan;
-	struct nv_channel_dma_class *args = data;
+	struct nv03_channel_dma_class *args = data;
 	int ret;
 
 	if (size < sizeof(*args))
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c
index 5d3638bddb8b..c4c78d50b396 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c
@@ -61,7 +61,7 @@ nv10_fifo_chan_ctor(struct nouveau_object *parent,
 {
 	struct nv04_fifo_priv *priv = (void *)engine;
 	struct nv04_fifo_chan *chan;
-	struct nv_channel_dma_class *args = data;
+	struct nv03_channel_dma_class *args = data;
 	int ret;
 
 	if (size < sizeof(*args))
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c
index 347b91e13477..1733765e8bf2 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c
@@ -66,7 +66,7 @@ nv17_fifo_chan_ctor(struct nouveau_object *parent,
 {
 	struct nv04_fifo_priv *priv = (void *)engine;
 	struct nv04_fifo_chan *chan;
-	struct nv_channel_dma_class *args = data;
+	struct nv03_channel_dma_class *args = data;
 	int ret;
 
 	if (size < sizeof(*args))
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
index 48114e6aa527..aef8ca106ac0 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
@@ -184,7 +184,7 @@ nv40_fifo_chan_ctor(struct nouveau_object *parent,
 {
 	struct nv04_fifo_priv *priv = (void *)engine;
 	struct nv04_fifo_chan *chan;
-	struct nv_channel_dma_class *args = data;
+	struct nv03_channel_dma_class *args = data;
 	int ret;
 
 	if (size < sizeof(*args))
diff --git a/drivers/gpu/drm/nouveau/core/include/core/class.h b/drivers/gpu/drm/nouveau/core/include/core/class.h
index 55b53ed8a0b8..10279d25f6c6 100644
--- a/drivers/gpu/drm/nouveau/core/include/core/class.h
+++ b/drivers/gpu/drm/nouveau/core/include/core/class.h
@@ -57,7 +57,7 @@ struct nv_dma_class {
  * 406e: NV40_CHANNEL_DMA
  */
 
-struct nv_channel_dma_class {
+struct nv03_channel_dma_class {
 	u32 pushbuf;
 	u32 pad0;
 	u64 offset;
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index cf61dc0226a3..e6451847df4a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -223,7 +223,7 @@ nouveau_channel_dma(struct nouveau_drm *drm, struct nouveau_cli *cli,
 {
 	static const u16 oclasses[] = { 0x406e, 0x176e, 0x006e, 0x006b, 0 };
 	const u16 *oclass = oclasses;
-	struct nv_channel_dma_class args;
+	struct nv03_channel_dma_class args;
 	struct nouveau_channel *chan;
 	int ret;