Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d3ae380 authored by Ben Skeggs's avatar Ben Skeggs Committed by android-build-merger
Browse files

drm/nouveau/disp/nv50-: specify ctrl/user separately when constructing classes 

am: 0042afe1

Change-Id: Iba38972b02698d32e79dccd40c4a689540f0e9fa
parents 0480f8c1 0042afe1

drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c

+6 −5
Original line number Diff line number Diff line
@@ -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)

{
@@ -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]) {
@@ -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)

{
@@ -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);

}

drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h

+9 −6
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -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

drivers/gpu/drm/nouveau/nvkm/engine/disp/cursg84.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },

};

drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgf119.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },

};

drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgk104.c

+1 −1
Original line number Diff line number Diff line
@@ -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 },

};