int
nouveau_channel_idle(struct nouveau_channel *chan)
{
- struct nouveau_drm *drm = chan->drm;
+ struct nouveau_cli *cli = chan->cli;
struct nouveau_fence *fence = NULL;
int ret;
}
if (ret)
- NV_ERROR(drm, "failed to idle channel 0x%08x\n", chan->handle);
+ NV_ERROR(cli, "failed to idle channel 0x%08x\n", chan->handle);
return ret;
}
return 0;
}
-int
+static int
nouveau_channel_ind(struct nouveau_drm *drm, struct nouveau_cli *cli,
- u32 parent, u32 handle, struct nouveau_channel **pchan)
+ u32 parent, u32 handle, u32 engine,
+ 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;
- struct nv_channel_ind_class args;
+ struct nve0_channel_ind_class args;
struct nouveau_channel *chan;
int ret;
args.pushbuf = chan->push.handle;
args.ioffset = 0x10000 + chan->push.vma.offset;
args.ilength = 0x02000;
+ args.engine = engine;
do {
ret = nouveau_object_new(nv_object(cli), parent, handle,
nouveau_channel_dma(struct nouveau_drm *drm, struct nouveau_cli *cli,
u32 parent, u32 handle, struct nouveau_channel **pchan)
{
- static const u16 oclasses[] = { 0x006e, 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;
- struct nv_channel_dma_class args;
+ struct nv03_channel_dma_class args;
struct nouveau_channel *chan;
int ret;
struct nv_dma_class args;
int ret, i;
- chan->vram = vram;
- chan->gart = gart;
-
/* allocate dma objects to cover all allowed vram, and gart */
if (device->card_type < NV_C0) {
if (device->card_type >= NV_50) {
0x003d, &args, sizeof(args), &object);
if (ret)
return ret;
+
+ chan->vram = vram;
+ chan->gart = gart;
}
/* initialise dma tracking parameters */
- switch (nv_hclass(chan->object) & 0xffff) {
+ switch (nv_hclass(chan->object) & 0x00ff) {
+ case 0x006b:
case 0x006e:
chan->user_put = 0x40;
chan->user_get = 0x44;
/* allocate software object class (used for fences on <= nv05, and
* to signal flip completion), bind it to a subchannel.
*/
- ret = nouveau_object_new(nv_object(client), chan->handle,
- NvSw, nouveau_abi16_swclass(chan->drm),
- NULL, 0, &object);
- if (ret)
- return ret;
+ if (chan != chan->drm->cechan) {
+ ret = nouveau_object_new(nv_object(client), chan->handle,
+ NvSw, nouveau_abi16_swclass(chan->drm),
+ NULL, 0, &object);
+ if (ret)
+ return ret;
- swch = (void *)object->parent;
- swch->flip = nouveau_flip_complete;
- swch->flip_data = chan;
+ swch = (void *)object->parent;
+ swch->flip = nouveau_flip_complete;
+ swch->flip_data = chan;
+ }
if (device->card_type < NV_C0) {
ret = RING_SPACE(chan, 2);
int
nouveau_channel_new(struct nouveau_drm *drm, struct nouveau_cli *cli,
- u32 parent, u32 handle, u32 vram, u32 gart,
+ u32 parent, u32 handle, u32 arg0, u32 arg1,
struct nouveau_channel **pchan)
{
int ret;
- ret = nouveau_channel_ind(drm, cli, parent, handle, pchan);
+ ret = nouveau_channel_ind(drm, cli, parent, handle, arg0, pchan);
if (ret) {
- NV_DEBUG(drm, "ib channel create, %d\n", ret);
+ NV_DEBUG(cli, "ib channel create, %d\n", ret);
ret = nouveau_channel_dma(drm, cli, parent, handle, pchan);
if (ret) {
- NV_DEBUG(drm, "dma channel create, %d\n", ret);
+ NV_DEBUG(cli, "dma channel create, %d\n", ret);
return ret;
}
}
- ret = nouveau_channel_init(*pchan, vram, gart);
+ ret = nouveau_channel_init(*pchan, arg0, arg1);
if (ret) {
- NV_ERROR(drm, "channel failed to initialise, %d\n", ret);
+ NV_ERROR(cli, "channel failed to initialise, %d\n", ret);
nouveau_channel_del(pchan);
return ret;
}