Commit 0ce41e3c authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/disp: convert user classes to new-style nvkm_object 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 2a7909c0

drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
#ifndef __NVKM_OPROXY_H__

#define __NVKM_OPROXY_H__

#define nvkm_oproxy(p) container_of((p), struct nvkm_oproxy, base)

#include <core/object.h>



struct nvkm_oproxy {

	const struct nvkm_oproxy_func *func;

	struct nvkm_object base;

	struct nvkm_object *object;

};



struct nvkm_oproxy_func {

	void (*dtor[2])(struct nvkm_oproxy *);

	int  (*init[2])(struct nvkm_oproxy *);

	int  (*fini[2])(struct nvkm_oproxy *, bool suspend);

};



void nvkm_oproxy_ctor(const struct nvkm_oproxy_func *,

		      const struct nvkm_oclass *, struct nvkm_oproxy *);

int  nvkm_oproxy_new_(const struct nvkm_oproxy_func *,

		      const struct nvkm_oclass *, struct nvkm_oproxy **);

#endif

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

+8 −0
Original line number Diff line number Diff line 
#ifndef __NVKM_DISP_H__

#define __NVKM_DISP_H__

#define nvkm_disp(p) container_of((p), struct nvkm_disp, engine)

#include <core/engine.h>

#include <core/event.h>



struct nvkm_disp {

	struct nvkm_engine engine;

	const struct nvkm_disp_func *func;



	struct nvkm_oproxy *client;



	struct list_head outp;

	struct list_head conn;
@@ -13,6 +17,10 @@ struct nvkm_disp { 
	struct nvkm_event vblank;

};



struct nvkm_disp_func {

	const struct nvkm_disp_oclass *root;

};



extern struct nvkm_oclass *nv04_disp_oclass;

extern struct nvkm_oclass *nv50_disp_oclass;

extern struct nvkm_oclass *g84_disp_oclass;

drivers/gpu/drm/nouveau/nvkm/core/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ nvkm-y += nvkm/core/mm.o 
nvkm-y += nvkm/core/namedb.o

nvkm-y += nvkm/core/notify.o

nvkm-y += nvkm/core/object.o

nvkm-y += nvkm/core/oproxy.o

nvkm-y += nvkm/core/option.o

nvkm-y += nvkm/core/parent.o

nvkm-y += nvkm/core/ramht.o

drivers/gpu/drm/nouveau/nvkm/core/oproxy.c

0 → 100644
+198 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Red Hat Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 * Authors: Ben Skeggs <bskeggs@redhat.com>

 */

#include <core/oproxy.h>



static int

nvkm_oproxy_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size)

{

	return nvkm_object_mthd(nvkm_oproxy(object)->object, mthd, data, size);

}



static int

nvkm_oproxy_ntfy(struct nvkm_object *object, u32 mthd,

		 struct nvkm_event **pevent)

{

	return nvkm_object_ntfy(nvkm_oproxy(object)->object, mthd, pevent);

}



static int

nvkm_oproxy_map(struct nvkm_object *object, u64 *addr, u32 *size)

{

	return nvkm_object_map(nvkm_oproxy(object)->object, addr, size);

}



static int

nvkm_oproxy_rd08(struct nvkm_object *object, u64 addr, u8 *data)

{

	return nvkm_object_rd08(nvkm_oproxy(object)->object, addr, data);

}



static int

nvkm_oproxy_rd16(struct nvkm_object *object, u64 addr, u16 *data)

{

	return nvkm_object_rd16(nvkm_oproxy(object)->object, addr, data);

}



static int

nvkm_oproxy_rd32(struct nvkm_object *object, u64 addr, u32 *data)

{

	return nvkm_object_rd32(nvkm_oproxy(object)->object, addr, data);

}



static int

nvkm_oproxy_wr08(struct nvkm_object *object, u64 addr, u8 data)

{

	return nvkm_object_wr08(nvkm_oproxy(object)->object, addr, data);

}



static int

nvkm_oproxy_wr16(struct nvkm_object *object, u64 addr, u16 data)

{

	return nvkm_object_wr16(nvkm_oproxy(object)->object, addr, data);

}



static int

nvkm_oproxy_wr32(struct nvkm_object *object, u64 addr, u32 data)

{

	return nvkm_object_wr32(nvkm_oproxy(object)->object, addr, data);

}



static int

nvkm_oproxy_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent,

		 int align, struct nvkm_gpuobj **pgpuobj)

{

	return nvkm_object_bind(nvkm_oproxy(object)->object,

				parent, align, pgpuobj);

}



static int

nvkm_oproxy_sclass(struct nvkm_object *object, int index,

		   struct nvkm_oclass *oclass)

{

	struct nvkm_oproxy *oproxy = nvkm_oproxy(object);

	oclass->parent = oproxy->object;

	if (oproxy->object->oclass)

		return -ENOSYS;

	if (!oproxy->object->func->sclass)

		return -ENODEV;

	return oproxy->object->func->sclass(oproxy->object, index, oclass);

}



static int

nvkm_oproxy_fini(struct nvkm_object *object, bool suspend)

{

	struct nvkm_oproxy *oproxy = nvkm_oproxy(object);

	int ret;



	if (oproxy->func->fini[0]) {

		ret = oproxy->func->fini[0](oproxy, suspend);

		if (ret && suspend)

			return ret;

	}



	ret = nvkm_object_fini(oproxy->object, suspend);

	if (ret && suspend)

		return ret;



	if (oproxy->func->fini[1]) {

		ret = oproxy->func->fini[1](oproxy, suspend);

		if (ret && suspend)

			return ret;

	}



	return 0;

}



static int

nvkm_oproxy_init(struct nvkm_object *object)

{

	struct nvkm_oproxy *oproxy = nvkm_oproxy(object);

	int ret;



	if (oproxy->func->init[0]) {

		ret = oproxy->func->init[0](oproxy);

		if (ret)

			return ret;

	}



	ret = nvkm_object_init(oproxy->object);

	if (ret)

		return ret;



	if (oproxy->func->init[1]) {

		ret = oproxy->func->init[1](oproxy);

		if (ret)

			return ret;

	}



	return 0;

}



static void *

nvkm_oproxy_dtor(struct nvkm_object *object)

{

	struct nvkm_oproxy *oproxy = nvkm_oproxy(object);

	if (oproxy->func->dtor[0])

		oproxy->func->dtor[0](oproxy);

	nvkm_object_ref(NULL, &oproxy->object);

	if (oproxy->func->dtor[1])

		oproxy->func->dtor[1](oproxy);

	return oproxy;

}



static const struct nvkm_object_func

nvkm_oproxy_func = {

	.dtor = nvkm_oproxy_dtor,

	.init = nvkm_oproxy_init,

	.fini = nvkm_oproxy_fini,

	.mthd = nvkm_oproxy_mthd,

	.ntfy = nvkm_oproxy_ntfy,

	.map = nvkm_oproxy_map,

	.rd08 = nvkm_oproxy_rd08,

	.rd16 = nvkm_oproxy_rd16,

	.rd32 = nvkm_oproxy_rd32,

	.wr08 = nvkm_oproxy_wr08,

	.wr16 = nvkm_oproxy_wr16,

	.wr32 = nvkm_oproxy_wr32,

	.bind = nvkm_oproxy_bind,

	.sclass = nvkm_oproxy_sclass,

};



void

nvkm_oproxy_ctor(const struct nvkm_oproxy_func *func,

		 const struct nvkm_oclass *oclass, struct nvkm_oproxy *oproxy)

{

	nvkm_object_ctor(&nvkm_oproxy_func, oclass, &oproxy->base);

	oproxy->func = func;

}



int

nvkm_oproxy_new_(const struct nvkm_oproxy_func *func,

		 const struct nvkm_oclass *oclass, struct nvkm_oproxy **poproxy)

{

	if (!(*poproxy = kzalloc(sizeof(**poproxy), GFP_KERNEL)))

		return -ENOMEM;

	nvkm_oproxy_ctor(func, oclass, *poproxy);

	return 0;

}

drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild

+16 −0
Original line number Diff line number Diff line
@@ -53,17 +53,27 @@ nvkm-y += nvkm/engine/disp/dmacgf119.o 


nvkm-y += nvkm/engine/disp/basenv50.o

nvkm-y += nvkm/engine/disp/baseg84.o

nvkm-y += nvkm/engine/disp/basegt200.o

nvkm-y += nvkm/engine/disp/basegt215.o

nvkm-y += nvkm/engine/disp/basegf119.o

nvkm-y += nvkm/engine/disp/basegk104.o

nvkm-y += nvkm/engine/disp/basegk110.o



nvkm-y += nvkm/engine/disp/corenv50.o

nvkm-y += nvkm/engine/disp/coreg84.o

nvkm-y += nvkm/engine/disp/coreg94.o

nvkm-y += nvkm/engine/disp/coregt200.o

nvkm-y += nvkm/engine/disp/coregt215.o

nvkm-y += nvkm/engine/disp/coregf119.o

nvkm-y += nvkm/engine/disp/coregk104.o

nvkm-y += nvkm/engine/disp/coregk110.o

nvkm-y += nvkm/engine/disp/coregm107.o

nvkm-y += nvkm/engine/disp/coregm204.o



nvkm-y += nvkm/engine/disp/ovlynv50.o

nvkm-y += nvkm/engine/disp/ovlyg84.o

nvkm-y += nvkm/engine/disp/ovlygt200.o

nvkm-y += nvkm/engine/disp/ovlygt215.o

nvkm-y += nvkm/engine/disp/ovlygf119.o

nvkm-y += nvkm/engine/disp/ovlygk104.o
@@ -71,7 +81,13 @@ nvkm-y += nvkm/engine/disp/piocnv50.o 
nvkm-y += nvkm/engine/disp/piocgf119.o



nvkm-y += nvkm/engine/disp/cursnv50.o

nvkm-y += nvkm/engine/disp/cursg84.o

nvkm-y += nvkm/engine/disp/cursgt215.o

nvkm-y += nvkm/engine/disp/cursgf119.o

nvkm-y += nvkm/engine/disp/cursgk104.o



nvkm-y += nvkm/engine/disp/oimmnv50.o

nvkm-y += nvkm/engine/disp/oimmg84.o

nvkm-y += nvkm/engine/disp/oimmgt215.o

nvkm-y += nvkm/engine/disp/oimmgf119.o

nvkm-y += nvkm/engine/disp/oimmgk104.o