diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:19 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:40 +1000 |
| commit | 9d498e0f7a5ece8f61c8a174b40668a2621a82e3 (patch) | |
| tree | b4ede5e2fb34147754dcba948f74014972aaeaa0 /drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c | |
| parent | drm/nouveau/fifo: convert user classes to new-style nvkm_object (diff) | |
| download | linux-dev-9d498e0f7a5ece8f61c8a174b40668a2621a82e3.tar.xz linux-dev-9d498e0f7a5ece8f61c8a174b40668a2621a82e3.zip | |
drm/nouveau/falcon: convert user classes to new-style nvkm_object
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c index cdb7de5a7305..0ee767373f79 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/msvld/g98.c @@ -24,38 +24,7 @@ #include <engine/msvld.h> #include <engine/falcon.h> -/******************************************************************************* - * MSVLD object classes - ******************************************************************************/ - -static struct nvkm_oclass -g98_msvld_sclass[] = { - { 0x88b1, &nvkm_object_ofuncs }, - { 0x85b1, &nvkm_object_ofuncs }, - { 0x86b1, &nvkm_object_ofuncs }, - {}, -}; - -/******************************************************************************* - * PMSVLD context - ******************************************************************************/ - -static struct nvkm_oclass -g98_msvld_cclass = { - .handle = NV_ENGCTX(MSVLD, 0x98), - .ofuncs = &(struct nvkm_ofuncs) { - .ctor = _nvkm_falcon_context_ctor, - .dtor = _nvkm_falcon_context_dtor, - .init = _nvkm_falcon_context_init, - .fini = _nvkm_falcon_context_fini, - .rd32 = _nvkm_falcon_context_rd32, - .wr32 = _nvkm_falcon_context_wr32, - }, -}; - -/******************************************************************************* - * PMSVLD engine/subdev functions - ******************************************************************************/ +#include <nvif/class.h> static int g98_msvld_init(struct nvkm_object *object) @@ -75,6 +44,12 @@ g98_msvld_init(struct nvkm_object *object) static const struct nvkm_falcon_func g98_msvld_func = { + .sclass = { + { -1, -1, G98_MSVLD }, + { -1, -1, GT212_MSVLD }, + { -1, -1, IGT21A_MSVLD }, + {} + } }; static int @@ -92,8 +67,6 @@ g98_msvld_ctor(struct nvkm_object *parent, struct nvkm_object *engine, return ret; nv_subdev(msvld)->unit = 0x04008000; - nv_engine(msvld)->cclass = &g98_msvld_cclass; - nv_engine(msvld)->sclass = g98_msvld_sclass; return 0; } |