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: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
82d23aea10
commit
344e107df7
5 changed files with 88 additions and 3 deletions
|
@ -121,6 +121,7 @@ nouveau-y += core/engine/dmaobj/base.o
|
||||||
nouveau-y += core/engine/dmaobj/nv04.o
|
nouveau-y += core/engine/dmaobj/nv04.o
|
||||||
nouveau-y += core/engine/dmaobj/nv50.o
|
nouveau-y += core/engine/dmaobj/nv50.o
|
||||||
nouveau-y += core/engine/dmaobj/nvc0.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/bsp/nv84.o
|
||||||
nouveau-y += core/engine/copy/nva3.o
|
nouveau-y += core/engine/copy/nva3.o
|
||||||
nouveau-y += core/engine/copy/nvc0.o
|
nouveau-y += core/engine/copy/nvc0.o
|
||||||
|
|
83
drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c
Normal file
83
drivers/gpu/drm/nouveau/core/engine/dmaobj/nvd0.c
Normal file
|
@ -0,0 +1,83 @@
|
||||||
|
/*
|
||||||
|
* 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,
|
||||||
|
},
|
||||||
|
};
|
|
@ -40,6 +40,7 @@ struct nouveau_dmaeng {
|
||||||
extern struct nouveau_oclass nv04_dmaeng_oclass;
|
extern struct nouveau_oclass nv04_dmaeng_oclass;
|
||||||
extern struct nouveau_oclass nv50_dmaeng_oclass;
|
extern struct nouveau_oclass nv50_dmaeng_oclass;
|
||||||
extern struct nouveau_oclass nvc0_dmaeng_oclass;
|
extern struct nouveau_oclass nvc0_dmaeng_oclass;
|
||||||
|
extern struct nouveau_oclass nvd0_dmaeng_oclass;
|
||||||
|
|
||||||
extern struct nouveau_oclass nouveau_dmaobj_sclass[];
|
extern struct nouveau_oclass nouveau_dmaobj_sclass[];
|
||||||
|
|
||||||
|
|
|
@ -266,7 +266,7 @@ nvc0_identify(struct nouveau_device *device)
|
||||||
device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;
|
device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;
|
||||||
device->oclass[NVDEV_SUBDEV_VM ] = &nvc0_vmmgr_oclass;
|
device->oclass[NVDEV_SUBDEV_VM ] = &nvc0_vmmgr_oclass;
|
||||||
device->oclass[NVDEV_SUBDEV_BAR ] = &nvc0_bar_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_FIFO ] = &nvc0_fifo_oclass;
|
||||||
device->oclass[NVDEV_ENGINE_SW ] = &nvc0_software_oclass;
|
device->oclass[NVDEV_ENGINE_SW ] = &nvc0_software_oclass;
|
||||||
device->oclass[NVDEV_ENGINE_GR ] = &nvc0_graph_oclass;
|
device->oclass[NVDEV_ENGINE_GR ] = &nvc0_graph_oclass;
|
||||||
|
|
|
@ -67,7 +67,7 @@ nve0_identify(struct nouveau_device *device)
|
||||||
device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;
|
device->oclass[NVDEV_SUBDEV_INSTMEM] = &nv50_instmem_oclass;
|
||||||
device->oclass[NVDEV_SUBDEV_VM ] = &nvc0_vmmgr_oclass;
|
device->oclass[NVDEV_SUBDEV_VM ] = &nvc0_vmmgr_oclass;
|
||||||
device->oclass[NVDEV_SUBDEV_BAR ] = &nvc0_bar_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_FIFO ] = &nve0_fifo_oclass;
|
||||||
device->oclass[NVDEV_ENGINE_SW ] = &nvc0_software_oclass;
|
device->oclass[NVDEV_ENGINE_SW ] = &nvc0_software_oclass;
|
||||||
device->oclass[NVDEV_ENGINE_GR ] = &nve0_graph_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_INSTMEM] = &nv50_instmem_oclass;
|
||||||
device->oclass[NVDEV_SUBDEV_VM ] = &nvc0_vmmgr_oclass;
|
device->oclass[NVDEV_SUBDEV_VM ] = &nvc0_vmmgr_oclass;
|
||||||
device->oclass[NVDEV_SUBDEV_BAR ] = &nvc0_bar_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_FIFO ] = &nve0_fifo_oclass;
|
||||||
device->oclass[NVDEV_ENGINE_SW ] = &nvc0_software_oclass;
|
device->oclass[NVDEV_ENGINE_SW ] = &nvc0_software_oclass;
|
||||||
device->oclass[NVDEV_ENGINE_GR ] = &nve0_graph_oclass;
|
device->oclass[NVDEV_ENGINE_GR ] = &nve0_graph_oclass;
|
||||||
|
|
Loading…
Add table
Reference in a new issue