diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-08-14 15:02:29 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:13:04 +1000 |
| commit | a7c6e75eb28d18ed8d53182891330f5c1fa4477c (patch) | |
| tree | e3ea6dcfd0513ca4bcc49eeb4434b2eee3890dbb | |
| parent | 503b0f1cd66c54dd88e644fa1a521ebd764bf54e (diff) | |
| download | linux-stable-a7c6e75eb28d18ed8d53182891330f5c1fa4477c.tar.gz linux-stable-a7c6e75eb28d18ed8d53182891330f5c1fa4477c.tar.bz2 linux-stable-a7c6e75eb28d18ed8d53182891330f5c1fa4477c.zip | |
drm/nouveau/fifo: version the dma channel class struct
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/include/core/class.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_chan.c | 2 |
6 files changed, 6 insertions, 6 deletions
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; |