---

yaml --- r: 329655 b: refs/heads/master c: a7c6e75 h: refs/heads/master i: 329653: 48b97a0 329651: fd917dd 329647: 44854bf v: v3
git-mirror · Oct 3, 2012 · 7322573 · 7322573
1 parent 936fd46
commit 7322573
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 503b0f1cd66c54dd88e644fa1a521ebd764bf54e
+refs/heads/master: a7c6e75eb28d18ed8d53182891330f5c1fa4477c
diff --git a/trunk/drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c b/trunk/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/trunk/drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c b/trunk/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/trunk/drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c b/trunk/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/trunk/drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c b/trunk/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/trunk/drivers/gpu/drm/nouveau/core/include/core/class.h b/trunk/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/trunk/drivers/gpu/drm/nouveau/nouveau_chan.c b/trunk/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;