Commit 344e107d authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nvd0/dmaobj: duplicate fermi class, will diverge real soon now 



The hardware dmaobj format completely changed in GF119, so these will
need a separate implementation.

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

drivers/gpu/drm/nouveau/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ nouveau-y += core/engine/dmaobj/base.o 
nouveau-y += core/engine/dmaobj/nv04.o

nouveau-y += core/engine/dmaobj/nv50.o

nouveau-y += core/engine/dmaobj/nvc0.o

nouveau-y += core/engine/dmaobj/nvd0.o

nouveau-y += core/engine/bsp/nv84.o

nouveau-y += core/engine/copy/nva3.o

nouveau-y += core/engine/copy/nvc0.o

drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c

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

 * Copyright 2012 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

 */



#include <core/device.h>

#include <core/gpuobj.h>

#include <core/class.h>



#include <subdev/fb.h>

#include <engine/dmaobj.h>



struct nvd0_dmaeng_priv {

	struct nouveau_dmaeng base;

};



static int

nvd0_dmaobj_bind(struct nouveau_dmaeng *dmaeng,

		 struct nouveau_object *parent,

		 struct nouveau_dmaobj *dmaobj,

		 struct nouveau_gpuobj **pgpuobj)

{

	int ret = 0;



	if (!nv_iclass(parent, NV_ENGCTX_CLASS)) {

		switch (nv_mclass(parent->parent)) {

			break;

		default:

			return -EINVAL;

		}

	} else

		return 0;



	return ret;

}



static int

nvd0_dmaeng_ctor(struct nouveau_object *parent, struct nouveau_object *engine,

		 struct nouveau_oclass *oclass, void *data, u32 size,

		 struct nouveau_object **pobject)

{

	struct nvd0_dmaeng_priv *priv;

	int ret;



	ret = nouveau_dmaeng_create(parent, engine, oclass, &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;



	nv_engine(priv)->sclass = nouveau_dmaobj_sclass;

	priv->base.bind = nvd0_dmaobj_bind;

	return 0;

}



struct nouveau_oclass

nvd0_dmaeng_oclass = {

	.handle = NV_ENGINE(DMAOBJ, 0xd0),

	.ofuncs = &(struct nouveau_ofuncs) {

		.ctor = nvd0_dmaeng_ctor,

		.dtor = _nouveau_dmaeng_dtor,

		.init = _nouveau_dmaeng_init,

		.fini = _nouveau_dmaeng_fini,

	},

};

drivers/gpu/drm/nouveau/core/include/engine/dmaobj.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct nouveau_dmaeng { 
extern struct nouveau_oclass nv04_dmaeng_oclass;

extern struct nouveau_oclass nv50_dmaeng_oclass;

extern struct nouveau_oclass nvc0_dmaeng_oclass;

extern struct nouveau_oclass nvd0_dmaeng_oclass;



extern struct nouveau_oclass nouveau_dmaobj_sclass[];

drivers/gpu/drm/nouveau/core/subdev/device/nvc0.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ nvc0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] = &nvc0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nvc0_graph_oclass;

drivers/gpu/drm/nouveau/core/subdev/device/nve0.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] = &nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nve0_graph_oclass;
@@ -92,7 +92,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

		device->oclass[NVDEV_SUBDEV_BAR    ] = &nvc0_bar_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvc0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_DMAOBJ ] = &nvd0_dmaeng_oclass;

		device->oclass[NVDEV_ENGINE_FIFO   ] = &nve0_fifo_oclass;

		device->oclass[NVDEV_ENGINE_SW     ] = &nvc0_software_oclass;

		device->oclass[NVDEV_ENGINE_GR     ] = &nve0_graph_oclass;