Commit a7c6e75e authored by Ben Skeggs's avatar Ben Skeggs

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

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 503b0f1c
...@@ -118,7 +118,7 @@ nv04_fifo_chan_ctor(struct nouveau_object *parent, ...@@ -118,7 +118,7 @@ nv04_fifo_chan_ctor(struct nouveau_object *parent,
{ {
struct nv04_fifo_priv *priv = (void *)engine; struct nv04_fifo_priv *priv = (void *)engine;
struct nv04_fifo_chan *chan; struct nv04_fifo_chan *chan;
struct nv_channel_dma_class *args = data; struct nv03_channel_dma_class *args = data;
int ret; int ret;
if (size < sizeof(*args)) if (size < sizeof(*args))
......
...@@ -61,7 +61,7 @@ nv10_fifo_chan_ctor(struct nouveau_object *parent, ...@@ -61,7 +61,7 @@ nv10_fifo_chan_ctor(struct nouveau_object *parent,
{ {
struct nv04_fifo_priv *priv = (void *)engine; struct nv04_fifo_priv *priv = (void *)engine;
struct nv04_fifo_chan *chan; struct nv04_fifo_chan *chan;
struct nv_channel_dma_class *args = data; struct nv03_channel_dma_class *args = data;
int ret; int ret;
if (size < sizeof(*args)) if (size < sizeof(*args))
......
...@@ -66,7 +66,7 @@ nv17_fifo_chan_ctor(struct nouveau_object *parent, ...@@ -66,7 +66,7 @@ nv17_fifo_chan_ctor(struct nouveau_object *parent,
{ {
struct nv04_fifo_priv *priv = (void *)engine; struct nv04_fifo_priv *priv = (void *)engine;
struct nv04_fifo_chan *chan; struct nv04_fifo_chan *chan;
struct nv_channel_dma_class *args = data; struct nv03_channel_dma_class *args = data;
int ret; int ret;
if (size < sizeof(*args)) if (size < sizeof(*args))
......
...@@ -184,7 +184,7 @@ nv40_fifo_chan_ctor(struct nouveau_object *parent, ...@@ -184,7 +184,7 @@ nv40_fifo_chan_ctor(struct nouveau_object *parent,
{ {
struct nv04_fifo_priv *priv = (void *)engine; struct nv04_fifo_priv *priv = (void *)engine;
struct nv04_fifo_chan *chan; struct nv04_fifo_chan *chan;
struct nv_channel_dma_class *args = data; struct nv03_channel_dma_class *args = data;
int ret; int ret;
if (size < sizeof(*args)) if (size < sizeof(*args))
......
...@@ -57,7 +57,7 @@ struct nv_dma_class { ...@@ -57,7 +57,7 @@ struct nv_dma_class {
* 406e: NV40_CHANNEL_DMA * 406e: NV40_CHANNEL_DMA
*/ */
struct nv_channel_dma_class { struct nv03_channel_dma_class {
u32 pushbuf; u32 pushbuf;
u32 pad0; u32 pad0;
u64 offset; u64 offset;
......
...@@ -223,7 +223,7 @@ nouveau_channel_dma(struct nouveau_drm *drm, struct nouveau_cli *cli, ...@@ -223,7 +223,7 @@ nouveau_channel_dma(struct nouveau_drm *drm, struct nouveau_cli *cli,
{ {
static const u16 oclasses[] = { 0x406e, 0x176e, 0x006e, 0x006b, 0 }; static const u16 oclasses[] = { 0x406e, 0x176e, 0x006e, 0x006b, 0 };
const u16 *oclass = oclasses; const u16 *oclass = oclasses;
struct nv_channel_dma_class args; struct nv03_channel_dma_class args;
struct nouveau_channel *chan; struct nouveau_channel *chan;
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment