diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_chan.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_chan.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index e6451847df4a..55dc51c1b92e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c | |||
@@ -187,7 +187,11 @@ nouveau_channel_ind(struct nouveau_drm *drm, struct nouveau_cli *cli, | |||
187 | u32 parent, u32 handle, u32 engine, | 187 | u32 parent, u32 handle, u32 engine, |
188 | struct nouveau_channel **pchan) | 188 | struct nouveau_channel **pchan) |
189 | { | 189 | { |
190 | static const u16 oclasses[] = { 0xa06f, 0x906f, 0x826f, 0x506f, 0 }; | 190 | static const u16 oclasses[] = { NVE0_CHANNEL_IND_CLASS, |
191 | NVC0_CHANNEL_IND_CLASS, | ||
192 | NV84_CHANNEL_IND_CLASS, | ||
193 | NV50_CHANNEL_IND_CLASS, | ||
194 | 0 }; | ||
191 | const u16 *oclass = oclasses; | 195 | const u16 *oclass = oclasses; |
192 | struct nve0_channel_ind_class args; | 196 | struct nve0_channel_ind_class args; |
193 | struct nouveau_channel *chan; | 197 | struct nouveau_channel *chan; |
@@ -221,7 +225,11 @@ static int | |||
221 | nouveau_channel_dma(struct nouveau_drm *drm, struct nouveau_cli *cli, | 225 | nouveau_channel_dma(struct nouveau_drm *drm, struct nouveau_cli *cli, |
222 | u32 parent, u32 handle, struct nouveau_channel **pchan) | 226 | u32 parent, u32 handle, struct nouveau_channel **pchan) |
223 | { | 227 | { |
224 | static const u16 oclasses[] = { 0x406e, 0x176e, 0x006e, 0x006b, 0 }; | 228 | static const u16 oclasses[] = { NV40_CHANNEL_DMA_CLASS, |
229 | NV17_CHANNEL_DMA_CLASS, | ||
230 | NV10_CHANNEL_DMA_CLASS, | ||
231 | NV03_CHANNEL_DMA_CLASS, | ||
232 | 0 }; | ||
225 | const u16 *oclass = oclasses; | 233 | const u16 *oclass = oclasses; |
226 | struct nv03_channel_dma_class args; | 234 | struct nv03_channel_dma_class args; |
227 | struct nouveau_channel *chan; | 235 | struct nouveau_channel *chan; |