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 ed771921e924a3b26da9a3bb083cb7652322b53c..cc49284be181ed6c941803d369ffe1a44488af01 100644 (file)
--- 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 5d3638bddb8bbd96c168a6eaaad864d5c1e2f44a..c4c78d50b39650ef0d40c452cf7c32fbf7dd65fd 100644 (file)
--- 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 347b91e134771f2d350e2ea236de6e080f787067..1733765e8bf2fc5f2c3cdb0e594579398754616b 100644 (file)
--- 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 48114e6aa527d5439d50a9267db26d50b5ad1446..aef8ca106ac0f90d9445ec2e627b743d5128f2e5 100644 (file)
--- 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 55b53ed8a0b8018c22551160f7d264df5c45cf2a..10279d25f6c6ef0acfcca11faeeac7e8c3278e7d 100644 (file)
--- 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 cf61dc0226a3d9b0861c0f018315238342cfdf3b..e6451847df4a042f873e1676a1c87e37b999ff59 100644 (file)
--- 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;