drm/nouveau/disp/nv50-: split chid into chid.ctrl and chid.user

GP102/GP104 make life difficult by redefining the channel indices for
some registers, but not others.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
index 26990d44ae755f91619f7772e4398051dd622da9..566d2d1b8cb2e8fb837b584fc9c7d65e3f6041c2 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
@@ -82,7 +82,7 @@ nv50_disp_chan_mthd(struct nv50_disp_chan *chan, int debug)
 
                        if (mthd->addr) {
                                snprintf(cname_, sizeof(cname_), "%s %d",
-                                        mthd->name, chan->chid);
+                                        mthd->name, chan->chid.user);
                                cname = cname_;
                        }
 
@@ -139,7 +139,7 @@ nv50_disp_chan_uevent_ctor(struct nvkm_object *object, void *data, u32 size,
        if (!(ret = nvif_unvers(ret, &data, &size, args->none))) {
                notify->size  = sizeof(struct nvif_notify_uevent_rep);
                notify->types = 1;
-               notify->index = chan->chid;
+               notify->index = chan->chid.user;
                return 0;
        }
 
@@ -159,7 +159,7 @@ nv50_disp_chan_rd32(struct nvkm_object *object, u64 addr, u32 *data)
        struct nv50_disp_chan *chan = nv50_disp_chan(object);
        struct nv50_disp *disp = chan->root->disp;
        struct nvkm_device *device = disp->base.engine.subdev.device;
-       *data = nvkm_rd32(device, 0x640000 + (chan->chid * 0x1000) + addr);
+       *data = nvkm_rd32(device, 0x640000 + (chan->chid.user * 0x1000) + addr);
        return 0;
 }
 
@@ -169,7 +169,7 @@ nv50_disp_chan_wr32(struct nvkm_object *object, u64 addr, u32 data)
        struct nv50_disp_chan *chan = nv50_disp_chan(object);
        struct nv50_disp *disp = chan->root->disp;
        struct nvkm_device *device = disp->base.engine.subdev.device;
-       nvkm_wr32(device, 0x640000 + (chan->chid * 0x1000) + addr, data);
+       nvkm_wr32(device, 0x640000 + (chan->chid.user * 0x1000) + addr, data);
        return 0;
 }
 
@@ -196,7 +196,7 @@ nv50_disp_chan_map(struct nvkm_object *object, u64 *addr, u32 *size)
        struct nv50_disp *disp = chan->root->disp;
        struct nvkm_device *device = disp->base.engine.subdev.device;
        *addr = device->func->resource_addr(device, 0) +
-               0x640000 + (chan->chid * 0x1000);
+               0x640000 + (chan->chid.user * 0x1000);
        *size = 0x001000;
        return 0;
 }
@@ -243,8 +243,8 @@ nv50_disp_chan_dtor(struct nvkm_object *object)
 {
        struct nv50_disp_chan *chan = nv50_disp_chan(object);
        struct nv50_disp *disp = chan->root->disp;
-       if (chan->chid >= 0)
-               disp->chan[chan->chid] = NULL;
+       if (chan->chid.user >= 0)
+               disp->chan[chan->chid.user] = NULL;
        return chan->func->dtor ? chan->func->dtor(chan) : chan;
 }
 
@@ -273,14 +273,15 @@ nv50_disp_chan_ctor(const struct nv50_disp_chan_func *func,
        chan->func = func;
        chan->mthd = mthd;
        chan->root = root;
-       chan->chid = chid;
+       chan->chid.ctrl = chid;
+       chan->chid.user = chid;
        chan->head = head;
 
-       if (disp->chan[chan->chid]) {
-               chan->chid = -1;
+       if (disp->chan[chan->chid.user]) {
+               chan->chid.user = -1;
                return -EBUSY;
        }
-       disp->chan[chan->chid] = chan;
+       disp->chan[chan->chid.user] = chan;
        return 0;
 }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h
index f5f683d9fd20225815518f4867c2e4a873248d9f..de8db9cfe87dcc6e0467abe4b154489d1918762f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h
@@ -7,7 +7,11 @@ struct nv50_disp_chan {
        const struct nv50_disp_chan_func *func;
        const struct nv50_disp_chan_mthd *mthd;
        struct nv50_disp_root *root;
-       int chid;
+
+       struct {
+               int ctrl;
+               int user;
+       } chid;
        int head;
 
        struct nvkm_object object;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c
index a57f7cef307a89fae14784ee369b9bc9733ab930..ce7cd74fbd5dbad174a4272ea24aa2106784c81f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c
@@ -32,8 +32,8 @@ gf119_disp_dmac_bind(struct nv50_disp_dmac *chan,
                     struct nvkm_object *object, u32 handle)
 {
        return nvkm_ramht_insert(chan->base.root->ramht, object,
-                                chan->base.chid, -9, handle,
-                                chan->base.chid << 27 | 0x00000001);
+                                chan->base.chid.user, -9, handle,
+                                chan->base.chid.user << 27 | 0x00000001);
 }
 
 void
@@ -42,22 +42,23 @@ gf119_disp_dmac_fini(struct nv50_disp_dmac *chan)
        struct nv50_disp *disp = chan->base.root->disp;
        struct nvkm_subdev *subdev = &disp->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       int chid = chan->base.chid;
+       int ctrl = chan->base.chid.ctrl;
+       int user = chan->base.chid.user;
 
        /* deactivate channel */
-       nvkm_mask(device, 0x610490 + (chid * 0x0010), 0x00001010, 0x00001000);
-       nvkm_mask(device, 0x610490 + (chid * 0x0010), 0x00000003, 0x00000000);
+       nvkm_mask(device, 0x610490 + (ctrl * 0x0010), 0x00001010, 0x00001000);
+       nvkm_mask(device, 0x610490 + (ctrl * 0x0010), 0x00000003, 0x00000000);
        if (nvkm_msec(device, 2000,
-               if (!(nvkm_rd32(device, 0x610490 + (chid * 0x10)) & 0x001e0000))
+               if (!(nvkm_rd32(device, 0x610490 + (ctrl * 0x10)) & 0x001e0000))
                        break;
        ) < 0) {
-               nvkm_error(subdev, "ch %d fini: %08x\n", chid,
-                          nvkm_rd32(device, 0x610490 + (chid * 0x10)));
+               nvkm_error(subdev, "ch %d fini: %08x\n", user,
+                          nvkm_rd32(device, 0x610490 + (ctrl * 0x10)));
        }
 
        /* disable error reporting and completion notification */
-       nvkm_mask(device, 0x610090, 0x00000001 << chid, 0x00000000);
-       nvkm_mask(device, 0x6100a0, 0x00000001 << chid, 0x00000000);
+       nvkm_mask(device, 0x610090, 0x00000001 << user, 0x00000000);
+       nvkm_mask(device, 0x6100a0, 0x00000001 << user, 0x00000000);
 }
 
 static int
@@ -66,26 +67,27 @@ gf119_disp_dmac_init(struct nv50_disp_dmac *chan)
        struct nv50_disp *disp = chan->base.root->disp;
        struct nvkm_subdev *subdev = &disp->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       int chid = chan->base.chid;
+       int ctrl = chan->base.chid.ctrl;
+       int user = chan->base.chid.user;
 
        /* enable error reporting */
-       nvkm_mask(device, 0x6100a0, 0x00000001 << chid, 0x00000001 << chid);
+       nvkm_mask(device, 0x6100a0, 0x00000001 << user, 0x00000001 << user);
 
        /* initialise channel for dma command submission */
-       nvkm_wr32(device, 0x610494 + (chid * 0x0010), chan->push);
-       nvkm_wr32(device, 0x610498 + (chid * 0x0010), 0x00010000);
-       nvkm_wr32(device, 0x61049c + (chid * 0x0010), 0x00000001);
-       nvkm_mask(device, 0x610490 + (chid * 0x0010), 0x00000010, 0x00000010);
-       nvkm_wr32(device, 0x640000 + (chid * 0x1000), 0x00000000);
-       nvkm_wr32(device, 0x610490 + (chid * 0x0010), 0x00000013);
+       nvkm_wr32(device, 0x610494 + (ctrl * 0x0010), chan->push);
+       nvkm_wr32(device, 0x610498 + (ctrl * 0x0010), 0x00010000);
+       nvkm_wr32(device, 0x61049c + (ctrl * 0x0010), 0x00000001);
+       nvkm_mask(device, 0x610490 + (ctrl * 0x0010), 0x00000010, 0x00000010);
+       nvkm_wr32(device, 0x640000 + (ctrl * 0x1000), 0x00000000);
+       nvkm_wr32(device, 0x610490 + (ctrl * 0x0010), 0x00000013);
 
        /* wait for it to go inactive */
        if (nvkm_msec(device, 2000,
-               if (!(nvkm_rd32(device, 0x610490 + (chid * 0x10)) & 0x80000000))
+               if (!(nvkm_rd32(device, 0x610490 + (ctrl * 0x10)) & 0x80000000))
                        break;
        ) < 0) {
-               nvkm_error(subdev, "ch %d init: %08x\n", chid,
-                          nvkm_rd32(device, 0x610490 + (chid * 0x10)));
+               nvkm_error(subdev, "ch %d init: %08x\n", user,
+                          nvkm_rd32(device, 0x610490 + (ctrl * 0x10)));
                return -EBUSY;
        }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp104.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp104.c
index ad24c2c57696998349c5c127163e999fbaf44f2c..d26d3b4c41a4e9739fc5ee12e1c5876117658663 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgp104.c
@@ -32,26 +32,27 @@ gp104_disp_dmac_init(struct nv50_disp_dmac *chan)
        struct nv50_disp *disp = chan->base.root->disp;
        struct nvkm_subdev *subdev = &disp->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       int chid = chan->base.chid;
+       int ctrl = chan->base.chid.ctrl;
+       int user = chan->base.chid.user;
 
        /* enable error reporting */
-       nvkm_mask(device, 0x6100a0, 0x00000001 << chid, 0x00000001 << chid);
+       nvkm_mask(device, 0x6100a0, 0x00000001 << user, 0x00000001 << user);
 
        /* initialise channel for dma command submission */
-       nvkm_wr32(device, 0x611494 + (chid * 0x0010), chan->push);
-       nvkm_wr32(device, 0x611498 + (chid * 0x0010), 0x00010000);
-       nvkm_wr32(device, 0x61149c + (chid * 0x0010), 0x00000001);
-       nvkm_mask(device, 0x610490 + (chid * 0x0010), 0x00000010, 0x00000010);
-       nvkm_wr32(device, 0x640000 + (chid * 0x1000), 0x00000000);
-       nvkm_wr32(device, 0x610490 + (chid * 0x0010), 0x00000013);
+       nvkm_wr32(device, 0x611494 + (ctrl * 0x0010), chan->push);
+       nvkm_wr32(device, 0x611498 + (ctrl * 0x0010), 0x00010000);
+       nvkm_wr32(device, 0x61149c + (ctrl * 0x0010), 0x00000001);
+       nvkm_mask(device, 0x610490 + (ctrl * 0x0010), 0x00000010, 0x00000010);
+       nvkm_wr32(device, 0x640000 + (ctrl * 0x1000), 0x00000000);
+       nvkm_wr32(device, 0x610490 + (ctrl * 0x0010), 0x00000013);
 
        /* wait for it to go inactive */
        if (nvkm_msec(device, 2000,
-               if (!(nvkm_rd32(device, 0x610490 + (chid * 0x10)) & 0x80000000))
+               if (!(nvkm_rd32(device, 0x610490 + (ctrl * 0x10)) & 0x80000000))
                        break;
        ) < 0) {
-               nvkm_error(subdev, "ch %d init: %08x\n", chid,
-                          nvkm_rd32(device, 0x610490 + (chid * 0x10)));
+               nvkm_error(subdev, "ch %d init: %08x\n", user,
+                          nvkm_rd32(device, 0x610490 + (ctrl * 0x10)));
                return -EBUSY;
        }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c
index 9c6645a357b93a3c063c49d31b0b6d8564b79e2d..cfba994bef4d3fc1fe8d317a5fe72d786292f514 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c
@@ -179,9 +179,9 @@ nv50_disp_dmac_bind(struct nv50_disp_dmac *chan,
                    struct nvkm_object *object, u32 handle)
 {
        return nvkm_ramht_insert(chan->base.root->ramht, object,
-                                chan->base.chid, -10, handle,
-                                chan->base.chid << 28 |
-                                chan->base.chid);
+                                chan->base.chid.user, -10, handle,
+                                chan->base.chid.user << 28 |
+                                chan->base.chid.user);
 }
 
 static void
@@ -190,21 +190,22 @@ nv50_disp_dmac_fini(struct nv50_disp_dmac *chan)
        struct nv50_disp *disp = chan->base.root->disp;
        struct nvkm_subdev *subdev = &disp->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       int chid = chan->base.chid;
+       int ctrl = chan->base.chid.ctrl;
+       int user = chan->base.chid.user;
 
        /* deactivate channel */
-       nvkm_mask(device, 0x610200 + (chid * 0x0010), 0x00001010, 0x00001000);
-       nvkm_mask(device, 0x610200 + (chid * 0x0010), 0x00000003, 0x00000000);
+       nvkm_mask(device, 0x610200 + (ctrl * 0x0010), 0x00001010, 0x00001000);
+       nvkm_mask(device, 0x610200 + (ctrl * 0x0010), 0x00000003, 0x00000000);
        if (nvkm_msec(device, 2000,
-               if (!(nvkm_rd32(device, 0x610200 + (chid * 0x10)) & 0x001e0000))
+               if (!(nvkm_rd32(device, 0x610200 + (ctrl * 0x10)) & 0x001e0000))
                        break;
        ) < 0) {
-               nvkm_error(subdev, "ch %d fini timeout, %08x\n", chid,
-                          nvkm_rd32(device, 0x610200 + (chid * 0x10)));
+               nvkm_error(subdev, "ch %d fini timeout, %08x\n", user,
+                          nvkm_rd32(device, 0x610200 + (ctrl * 0x10)));
        }
 
        /* disable error reporting and completion notifications */
-       nvkm_mask(device, 0x610028, 0x00010001 << chid, 0x00000000 << chid);
+       nvkm_mask(device, 0x610028, 0x00010001 << user, 0x00000000 << user);
 }
 
 static int
@@ -213,26 +214,27 @@ nv50_disp_dmac_init(struct nv50_disp_dmac *chan)
        struct nv50_disp *disp = chan->base.root->disp;
        struct nvkm_subdev *subdev = &disp->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       int chid = chan->base.chid;
+       int ctrl = chan->base.chid.ctrl;
+       int user = chan->base.chid.user;
 
        /* enable error reporting */
-       nvkm_mask(device, 0x610028, 0x00010000 << chid, 0x00010000 << chid);
+       nvkm_mask(device, 0x610028, 0x00010000 << user, 0x00010000 << user);
 
        /* initialise channel for dma command submission */
-       nvkm_wr32(device, 0x610204 + (chid * 0x0010), chan->push);
-       nvkm_wr32(device, 0x610208 + (chid * 0x0010), 0x00010000);
-       nvkm_wr32(device, 0x61020c + (chid * 0x0010), chid);
-       nvkm_mask(device, 0x610200 + (chid * 0x0010), 0x00000010, 0x00000010);
-       nvkm_wr32(device, 0x640000 + (chid * 0x1000), 0x00000000);
-       nvkm_wr32(device, 0x610200 + (chid * 0x0010), 0x00000013);
+       nvkm_wr32(device, 0x610204 + (ctrl * 0x0010), chan->push);
+       nvkm_wr32(device, 0x610208 + (ctrl * 0x0010), 0x00010000);
+       nvkm_wr32(device, 0x61020c + (ctrl * 0x0010), ctrl);
+       nvkm_mask(device, 0x610200 + (ctrl * 0x0010), 0x00000010, 0x00000010);
+       nvkm_wr32(device, 0x640000 + (ctrl * 0x1000), 0x00000000);
+       nvkm_wr32(device, 0x610200 + (ctrl * 0x0010), 0x00000013);
 
        /* wait for it to go inactive */
        if (nvkm_msec(device, 2000,
-               if (!(nvkm_rd32(device, 0x610200 + (chid * 0x10)) & 0x80000000))
+               if (!(nvkm_rd32(device, 0x610200 + (ctrl * 0x10)) & 0x80000000))
                        break;
        ) < 0) {
-               nvkm_error(subdev, "ch %d init timeout, %08x\n", chid,
-                          nvkm_rd32(device, 0x610200 + (chid * 0x10)));
+               nvkm_error(subdev, "ch %d init timeout, %08x\n", user,
+                          nvkm_rd32(device, 0x610200 + (ctrl * 0x10)));
                return -EBUSY;
        }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/piocgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/piocgf119.c
index a625a9876e34a909245f6c6c6fc425a23e862a17..0abaa6431943b917e693a3b06f8bfd22bac9af49 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/piocgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/piocgf119.c
@@ -32,20 +32,21 @@ gf119_disp_pioc_fini(struct nv50_disp_chan *chan)
        struct nv50_disp *disp = chan->root->disp;
        struct nvkm_subdev *subdev = &disp->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       int chid = chan->chid;
+       int ctrl = chan->chid.ctrl;
+       int user = chan->chid.user;
 
-       nvkm_mask(device, 0x610490 + (chid * 0x10), 0x00000001, 0x00000000);
+       nvkm_mask(device, 0x610490 + (ctrl * 0x10), 0x00000001, 0x00000000);
        if (nvkm_msec(device, 2000,
-               if (!(nvkm_rd32(device, 0x610490 + (chid * 0x10)) & 0x00030000))
+               if (!(nvkm_rd32(device, 0x610490 + (ctrl * 0x10)) & 0x00030000))
                        break;
        ) < 0) {
-               nvkm_error(subdev, "ch %d fini: %08x\n", chid,
-                          nvkm_rd32(device, 0x610490 + (chid * 0x10)));
+               nvkm_error(subdev, "ch %d fini: %08x\n", user,
+                          nvkm_rd32(device, 0x610490 + (ctrl * 0x10)));
        }
 
        /* disable error reporting and completion notification */
-       nvkm_mask(device, 0x610090, 0x00000001 << chid, 0x00000000);
-       nvkm_mask(device, 0x6100a0, 0x00000001 << chid, 0x00000000);
+       nvkm_mask(device, 0x610090, 0x00000001 << user, 0x00000000);
+       nvkm_mask(device, 0x6100a0, 0x00000001 << user, 0x00000000);
 }
 
 static int
@@ -54,20 +55,21 @@ gf119_disp_pioc_init(struct nv50_disp_chan *chan)
        struct nv50_disp *disp = chan->root->disp;
        struct nvkm_subdev *subdev = &disp->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       int chid = chan->chid;
+       int ctrl = chan->chid.ctrl;
+       int user = chan->chid.user;
 
        /* enable error reporting */
-       nvkm_mask(device, 0x6100a0, 0x00000001 << chid, 0x00000001 << chid);
+       nvkm_mask(device, 0x6100a0, 0x00000001 << user, 0x00000001 << user);
 
        /* activate channel */
-       nvkm_wr32(device, 0x610490 + (chid * 0x10), 0x00000001);
+       nvkm_wr32(device, 0x610490 + (ctrl * 0x10), 0x00000001);
        if (nvkm_msec(device, 2000,
-               u32 tmp = nvkm_rd32(device, 0x610490 + (chid * 0x10));
+               u32 tmp = nvkm_rd32(device, 0x610490 + (ctrl * 0x10));
                if ((tmp & 0x00030000) == 0x00010000)
                        break;
        ) < 0) {
-               nvkm_error(subdev, "ch %d init: %08x\n", chid,
-                          nvkm_rd32(device, 0x610490 + (chid * 0x10)));
+               nvkm_error(subdev, "ch %d init: %08x\n", user,
+                          nvkm_rd32(device, 0x610490 + (ctrl * 0x10)));
                return -EBUSY;
        }
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/piocnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/piocnv50.c
index 9d2618dacf20bd00425eac9e9d0ac65a538fe63e..0211e0e8a35f0fe6c83b676d98bd595bd17b5264 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/piocnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/piocnv50.c
@@ -32,15 +32,16 @@ nv50_disp_pioc_fini(struct nv50_disp_chan *chan)
        struct nv50_disp *disp = chan->root->disp;
        struct nvkm_subdev *subdev = &disp->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       int chid = chan->chid;
+       int ctrl = chan->chid.ctrl;
+       int user = chan->chid.user;
 
-       nvkm_mask(device, 0x610200 + (chid * 0x10), 0x00000001, 0x00000000);
+       nvkm_mask(device, 0x610200 + (ctrl * 0x10), 0x00000001, 0x00000000);
        if (nvkm_msec(device, 2000,
-               if (!(nvkm_rd32(device, 0x610200 + (chid * 0x10)) & 0x00030000))
+               if (!(nvkm_rd32(device, 0x610200 + (ctrl * 0x10)) & 0x00030000))
                        break;
        ) < 0) {
-               nvkm_error(subdev, "ch %d timeout: %08x\n", chid,
-                          nvkm_rd32(device, 0x610200 + (chid * 0x10)));
+               nvkm_error(subdev, "ch %d timeout: %08x\n", user,
+                          nvkm_rd32(device, 0x610200 + (ctrl * 0x10)));
        }
 }
 
@@ -50,26 +51,27 @@ nv50_disp_pioc_init(struct nv50_disp_chan *chan)
        struct nv50_disp *disp = chan->root->disp;
        struct nvkm_subdev *subdev = &disp->base.engine.subdev;
        struct nvkm_device *device = subdev->device;
-       int chid = chan->chid;
+       int ctrl = chan->chid.ctrl;
+       int user = chan->chid.user;
 
-       nvkm_wr32(device, 0x610200 + (chid * 0x10), 0x00002000);
+       nvkm_wr32(device, 0x610200 + (ctrl * 0x10), 0x00002000);
        if (nvkm_msec(device, 2000,
-               if (!(nvkm_rd32(device, 0x610200 + (chid * 0x10)) & 0x00030000))
+               if (!(nvkm_rd32(device, 0x610200 + (ctrl * 0x10)) & 0x00030000))
                        break;
        ) < 0) {
-               nvkm_error(subdev, "ch %d timeout0: %08x\n", chid,
-                          nvkm_rd32(device, 0x610200 + (chid * 0x10)));
+               nvkm_error(subdev, "ch %d timeout0: %08x\n", user,
+                          nvkm_rd32(device, 0x610200 + (ctrl * 0x10)));
                return -EBUSY;
        }
 
-       nvkm_wr32(device, 0x610200 + (chid * 0x10), 0x00000001);
+       nvkm_wr32(device, 0x610200 + (ctrl * 0x10), 0x00000001);
        if (nvkm_msec(device, 2000,
-               u32 tmp = nvkm_rd32(device, 0x610200 + (chid * 0x10));
+               u32 tmp = nvkm_rd32(device, 0x610200 + (ctrl * 0x10));
                if ((tmp & 0x00030000) == 0x00010000)
                        break;
        ) < 0) {
-               nvkm_error(subdev, "ch %d timeout1: %08x\n", chid,
-                          nvkm_rd32(device, 0x610200 + (chid * 0x10)));
+               nvkm_error(subdev, "ch %d timeout1: %08x\n", user,
+                          nvkm_rd32(device, 0x610200 + (ctrl * 0x10)));
                return -EBUSY;
        }