lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/nouveau/fifo: use defines instead of hardcoded class ids

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2012-08-19 16:03:00 +10:00
parent 1971f04e16
commit c97f8c922e
9 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,7 +247,7 @@ nv04_fifo_ofuncs = {
static struct nouveau_oclass static struct nouveau_oclass
nv04_fifo_sclass[] = { nv04_fifo_sclass[] = {
{ 0x006b, &nv04_fifo_ofuncs }, { NV03_CHANNEL_DMA_CLASS, &nv04_fifo_ofuncs },
{} {}
}; };

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

@@ -106,7 +106,7 @@ nv10_fifo_ofuncs = {
static struct nouveau_oclass static struct nouveau_oclass
nv10_fifo_sclass[] = { nv10_fifo_sclass[] = {
{ 0x006e, &nv10_fifo_ofuncs }, { NV10_CHANNEL_DMA_CLASS, &nv10_fifo_ofuncs },
{} {}
}; };

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

@@ -113,7 +113,7 @@ nv17_fifo_ofuncs = {
static struct nouveau_oclass static struct nouveau_oclass
nv17_fifo_sclass[] = { nv17_fifo_sclass[] = {
{ 0x176e, &nv17_fifo_ofuncs }, { NV17_CHANNEL_DMA_CLASS, &nv17_fifo_ofuncs },
{} {}
}; };

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

@@ -232,7 +232,7 @@ nv40_fifo_ofuncs = {
static struct nouveau_oclass static struct nouveau_oclass
nv40_fifo_sclass[] = { nv40_fifo_sclass[] = {
{ 0x406e, &nv40_fifo_ofuncs }, { NV40_CHANNEL_DMA_CLASS, &nv40_fifo_ofuncs },
{} {}
}; };

4
drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c
View File

@@ -346,8 +346,8 @@ nv50_fifo_ofuncs_ind = {
static struct nouveau_oclass static struct nouveau_oclass
nv50_fifo_sclass[] = { nv50_fifo_sclass[] = {
{ 0x506e, &nv50_fifo_ofuncs_dma }, { NV50_CHANNEL_DMA_CLASS, &nv50_fifo_ofuncs_dma },
{ 0x506f, &nv50_fifo_ofuncs_ind }, { NV50_CHANNEL_IND_CLASS, &nv50_fifo_ofuncs_ind },
{} {}
}; };

4
drivers/gpu/drm/nouveau/core/engine/fifo/nv84.c
View File

@@ -310,8 +310,8 @@ nv84_fifo_ofuncs_ind = {
static struct nouveau_oclass static struct nouveau_oclass
nv84_fifo_sclass[] = { nv84_fifo_sclass[] = {
{ 0x826e, &nv84_fifo_ofuncs_dma }, { NV84_CHANNEL_DMA_CLASS, &nv84_fifo_ofuncs_dma },
{ 0x826f, &nv84_fifo_ofuncs_ind }, { NV84_CHANNEL_IND_CLASS, &nv84_fifo_ofuncs_ind },
{} {}
}; };

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

@@ -258,7 +258,7 @@ nvc0_fifo_ofuncs = {
static struct nouveau_oclass static struct nouveau_oclass
nvc0_fifo_sclass[] = { nvc0_fifo_sclass[] = {
{ 0x906f, &nvc0_fifo_ofuncs }, { NVC0_CHANNEL_IND_CLASS, &nvc0_fifo_ofuncs },
{} {}
}; };

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

@@ -303,7 +303,7 @@ nve0_fifo_ofuncs = {
static struct nouveau_oclass static struct nouveau_oclass
nve0_fifo_sclass[] = { nve0_fifo_sclass[] = {
{ 0xa06f, &nve0_fifo_ofuncs }, { NVE0_CHANNEL_IND_CLASS, &nve0_fifo_ofuncs },
{} {}
}; };

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

@@ -187,7 +187,11 @@ nouveau_channel_ind(struct nouveau_drm *drm, struct nouveau_cli *cli,
u32 parent, u32 handle, u32 engine, u32 parent, u32 handle, u32 engine,
struct nouveau_channel **pchan) struct nouveau_channel **pchan)
{ {
static const u16 oclasses[] = { 0xa06f, 0x906f, 0x826f, 0x506f, 0 }; static const u16 oclasses[] = { NVE0_CHANNEL_IND_CLASS,
NVC0_CHANNEL_IND_CLASS,
NV84_CHANNEL_IND_CLASS,
NV50_CHANNEL_IND_CLASS,
0 };
const u16 *oclass = oclasses; const u16 *oclass = oclasses;
struct nve0_channel_ind_class args; struct nve0_channel_ind_class args;
struct nouveau_channel *chan; struct nouveau_channel *chan;
@@ -221,7 +225,11 @@ static int
nouveau_channel_dma(struct nouveau_drm *drm, struct nouveau_cli *cli, nouveau_channel_dma(struct nouveau_drm *drm, struct nouveau_cli *cli,
u32 parent, u32 handle, struct nouveau_channel **pchan) u32 parent, u32 handle, struct nouveau_channel **pchan)
{ {
static const u16 oclasses[] = { 0x406e, 0x176e, 0x006e, 0x006b, 0 }; static const u16 oclasses[] = { NV40_CHANNEL_DMA_CLASS,
NV17_CHANNEL_DMA_CLASS,
NV10_CHANNEL_DMA_CLASS,
NV03_CHANNEL_DMA_CLASS,
0 };
const u16 *oclass = oclasses; const u16 *oclass = oclasses;
struct nv03_channel_dma_class args; struct nv03_channel_dma_class args;
struct nouveau_channel *chan; struct nouveau_channel *chan;