Skip to content

Commit

Permalink
drm/nouveau/disp/nv50-: specify ctrl/user separately when constructin…
Browse files Browse the repository at this point in the history 
…g classes

[ Upstream commit 2a32b9b ]

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
@popcornmix
Ben Skeggs authored and popcornmix committed Mar 23, 2017
1 parent a3370a6 commit 6915193
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 28 deletions.
11 changes: 6 additions & 5 deletions drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
View file
Expand Up @@ -263,7 +263,7 @@ nv50_disp_chan = {
int
nv50_disp_chan_ctor(const struct nv50_disp_chan_func *func,
const struct nv50_disp_chan_mthd *mthd,
struct nv50_disp_root *root, int chid, int head,
struct nv50_disp_root *root, int ctrl, int user, int head,
const struct nvkm_oclass *oclass,
struct nv50_disp_chan *chan)
{
Expand All @@ -273,8 +273,8 @@ nv50_disp_chan_ctor(const struct nv50_disp_chan_func *func,
chan->func = func;
chan->mthd = mthd;
chan->root = root;
chan->chid.ctrl = chid;
chan->chid.user = chid;
chan->chid.ctrl = ctrl;
chan->chid.user = user;
chan->head = head;

if (disp->chan[chan->chid.user]) {
Expand All @@ -288,7 +288,7 @@ nv50_disp_chan_ctor(const struct nv50_disp_chan_func *func,
int
nv50_disp_chan_new_(const struct nv50_disp_chan_func *func,
const struct nv50_disp_chan_mthd *mthd,
struct nv50_disp_root *root, int chid, int head,
struct nv50_disp_root *root, int ctrl, int user, int head,
const struct nvkm_oclass *oclass,
struct nvkm_object **pobject)
{
Expand All @@ -298,5 +298,6 @@ nv50_disp_chan_new_(const struct nv50_disp_chan_func *func,
return -ENOMEM;
*pobject = &chan->object;

return nv50_disp_chan_ctor(func, mthd, root, chid, head, oclass, chan);
return nv50_disp_chan_ctor(func, mthd, root, ctrl, user,
head, oclass, chan);
}
15 changes: 9 additions & 6 deletions drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h
View file
Expand Up @@ -29,11 +29,11 @@ struct nv50_disp_chan_func {

int nv50_disp_chan_ctor(const struct nv50_disp_chan_func *,
const struct nv50_disp_chan_mthd *,
struct nv50_disp_root *, int chid, int head,
struct nv50_disp_root *, int ctrl, int user, int head,
const struct nvkm_oclass *, struct nv50_disp_chan *);
int nv50_disp_chan_new_(const struct nv50_disp_chan_func *,
const struct nv50_disp_chan_mthd *,
struct nv50_disp_root *, int chid, int head,
struct nv50_disp_root *, int ctrl, int user, int head,
const struct nvkm_oclass *, struct nvkm_object **);

extern const struct nv50_disp_chan_func nv50_disp_pioc_func;
Expand Down Expand Up @@ -94,13 +94,16 @@ extern const struct nv50_disp_chan_mthd gk104_disp_ovly_chan_mthd;
struct nv50_disp_pioc_oclass {
int (*ctor)(const struct nv50_disp_chan_func *,
const struct nv50_disp_chan_mthd *,
struct nv50_disp_root *, int chid,
struct nv50_disp_root *, int ctrl, int user,
const struct nvkm_oclass *, void *data, u32 size,
struct nvkm_object **);
struct nvkm_sclass base;
const struct nv50_disp_chan_func *func;
const struct nv50_disp_chan_mthd *mthd;
int chid;
struct {
int ctrl;
int user;
} chid;
};

extern const struct nv50_disp_pioc_oclass nv50_disp_oimm_oclass;
Expand All @@ -123,12 +126,12 @@ extern const struct nv50_disp_pioc_oclass gp102_disp_curs_oclass;

int nv50_disp_curs_new(const struct nv50_disp_chan_func *,
const struct nv50_disp_chan_mthd *,
struct nv50_disp_root *, int chid,
struct nv50_disp_root *, int ctrl, int user,
const struct nvkm_oclass *, void *data, u32 size,
struct nvkm_object **);
int nv50_disp_oimm_new(const struct nv50_disp_chan_func *,
const struct nv50_disp_chan_mthd *,
struct nv50_disp_root *, int chid,
struct nv50_disp_root *, int ctrl, int user,
const struct nvkm_oclass *, void *data, u32 size,
struct nvkm_object **);
#endif
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nvkm/engine/disp/cursg84.c
View file
Expand Up @@ -33,5 +33,5 @@ g84_disp_curs_oclass = {
.base.maxver = 0,
.ctor = nv50_disp_curs_new,
.func = &nv50_disp_pioc_func,
.chid = 7,
.chid = { 7, 7 },
};
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgf119.c
View file
Expand Up @@ -33,5 +33,5 @@ gf119_disp_curs_oclass = {
.base.maxver = 0,
.ctor = nv50_disp_curs_new,
.func = &gf119_disp_pioc_func,
.chid = 13,
.chid = { 13, 13 },
};
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgk104.c
View file
Expand Up @@ -33,5 +33,5 @@ gk104_disp_curs_oclass = {
.base.maxver = 0,
.ctor = nv50_disp_curs_new,
.func = &gf119_disp_pioc_func,
.chid = 13,
.chid = { 13, 13 },
};
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgt215.c
View file
Expand Up @@ -33,5 +33,5 @@ gt215_disp_curs_oclass = {
.base.maxver = 0,
.ctor = nv50_disp_curs_new,
.func = &nv50_disp_pioc_func,
.chid = 7,
.chid = { 7, 7 },
};
6 changes: 3 additions & 3 deletions drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c
View file
Expand Up @@ -33,7 +33,7 @@
int
nv50_disp_curs_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)
{
Expand All @@ -54,7 +54,7 @@ nv50_disp_curs_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);
}

Expand All @@ -65,5 +65,5 @@ nv50_disp_curs_oclass = {
.base.maxver = 0,
.ctor = nv50_disp_curs_new,
.func = &nv50_disp_pioc_func,
.chid = 7,
.chid = { 7, 7 },
};
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c
View file
Expand Up @@ -149,7 +149,7 @@ nv50_disp_dmac_new_(const struct nv50_disp_dmac_func *func,
chan->func = func;

ret = nv50_disp_chan_ctor(&nv50_disp_dmac_func_, mthd, root,
chid, head, oclass, &chan->base);
chid, chid, head, oclass, &chan->base);
if (ret)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmg84.c
View file
Expand Up @@ -33,5 +33,5 @@ g84_disp_oimm_oclass = {
.base.maxver = 0,
.ctor = nv50_disp_oimm_new,
.func = &nv50_disp_pioc_func,
.chid = 5,
.chid = { 5, 5 },
};
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgf119.c
View file
Expand Up @@ -33,5 +33,5 @@ gf119_disp_oimm_oclass = {
.base.maxver = 0,
.ctor = nv50_disp_oimm_new,
.func = &gf119_disp_pioc_func,
.chid = 9,
.chid = { 9, 9 },
};
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgk104.c
View file
Expand Up @@ -33,5 +33,5 @@ gk104_disp_oimm_oclass = {
.base.maxver = 0,
.ctor = nv50_disp_oimm_new,
.func = &gf119_disp_pioc_func,
.chid = 9,
.chid = { 9, 9 },
};
2 changes: 1 addition & 1 deletion drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgt215.c
View file
Expand Up @@ -33,5 +33,5 @@ gt215_disp_oimm_oclass = {
.base.maxver = 0,
.ctor = nv50_disp_oimm_new,
.func = &nv50_disp_pioc_func,
.chid = 5,
.chid = { 5, 5 },
};
6 changes: 3 additions & 3 deletions drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c
View file
Expand Up @@ -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)
{
Expand All @@ -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);
}

Expand All @@ -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 },
};
4 changes: 2 additions & 2 deletions drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
View file
Expand Up @@ -207,8 +207,8 @@ nv50_disp_root_pioc_new_(const struct nvkm_oclass *oclass,
{
const struct nv50_disp_pioc_oclass *sclass = oclass->priv;
struct nv50_disp_root *root = nv50_disp_root(oclass->parent);
return sclass->ctor(sclass->func, sclass->mthd, root, sclass->chid,
oclass, data, size, pobject);
return sclass->ctor(sclass->func, sclass->mthd, root, sclass->chid.ctrl,
sclass->chid.user, oclass, data, size, pobject);
}

static int
Expand Down

0 comments on commit 6915193

Please sign in to comment.