summaryrefslogtreecommitdiff
path: root/drm/nouveau/nvkm/engine/disp/oimmnv50.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-11-16 14:49:35 +1000
committerBen Skeggs <bskeggs@redhat.com>2016-11-16 15:18:48 +1000
commit0d874f550816a6d7038658c3ec78c992e40c132f (patch)
treefcf1ac6eb0faf12a8023f852774dba0576931ea6 /drm/nouveau/nvkm/engine/disp/oimmnv50.c
parent88a1b714678ad1f5bda441052383e70a9d52f100 (diff)
downloadnouveau-0d874f550816a6d7038658c3ec78c992e40c132f.tar.gz
disp/nv50-: specify ctrl/user separately when constructing classes
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/engine/disp/oimmnv50.c')
-rw-r--r--drm/nouveau/nvkm/engine/disp/oimmnv50.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drm/nouveau/nvkm/engine/disp/oimmnv50.c b/drm/nouveau/nvkm/engine/disp/oimmnv50.c
index 3940b9c96..07540f3d3 100644
--- a/drm/nouveau/nvkm/engine/disp/oimmnv50.c
+++ b/drm/nouveau/nvkm/engine/disp/oimmnv50.c
@@ -33,7 +33,7 @@
int
nv50_disp_oimm_new(const struct nv50_disp_chan_func *func,
const struct nv50_disp_chan_mthd *mthd,
- struct nv50_disp_root *root, int chid,
+ struct nv50_disp_root *root, int ctrl, int user,
const struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject)
{
@@ -54,7 +54,7 @@ nv50_disp_oimm_new(const struct nv50_disp_chan_func *func,
} else
return ret;
- return nv50_disp_chan_new_(func, mthd, root, chid + head,
+ return nv50_disp_chan_new_(func, mthd, root, ctrl + head, user + head,
head, oclass, pobject);
}
@@ -65,5 +65,5 @@ nv50_disp_oimm_oclass = {
.base.maxver = 0,
.ctor = nv50_disp_oimm_new,
.func = &nv50_disp_pioc_func,
- .chid = 5,
+ .chid = { 5, 5 },
};