diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-11-16 14:49:35 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-11-17 09:50:38 +1000 |
| commit | 2a32b9b1866a2ee9f01fbf2a48d99012f0120739 (patch) | |
| tree | 5dd192aeb2767c67fa7165eefd625db7a527d9ce /drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c | |
| parent | 4391d7f5c79a9fe6fa11cf6c160ca7f7bdb49d2a (diff) | |
| download | blackbird-obmc-linux-2a32b9b1866a2ee9f01fbf2a48d99012f0120739.tar.gz blackbird-obmc-linux-2a32b9b1866a2ee9f01fbf2a48d99012f0120739.zip | |
drm/nouveau/disp/nv50-: specify ctrl/user separately when constructing classes
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c index 3940b9c966ec..07540f3d32dc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c +++ b/drivers/gpu/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 }, }; |
