dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2012-08-14 15:02:29 +10:00
parent 503b0f1cd6
commit a7c6e75eb2
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/core/engine/fifo/nv04.c
View File

@ -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))

2
drivers/gpu/drm/nouveau/core/engine/fifo/nv10.c
View File

@ -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))

2
drivers/gpu/drm/nouveau/core/engine/fifo/nv17.c
View File

@ -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))

2
drivers/gpu/drm/nouveau/core/engine/fifo/nv40.c
View File

@ -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))

2
drivers/gpu/drm/nouveau/core/include/core/class.h
View File

@ -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;

2
drivers/gpu/drm/nouveau/nouveau_chan.c
View File

@ -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;