提交 b3c98150 编写于 作者: B Ben Skeggs

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

Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
上级 e5ff1127
...@@ -124,13 +124,12 @@ ...@@ -124,13 +124,12 @@
#define FERMI_COMPUTE_A 0x000090c0 #define FERMI_COMPUTE_A 0x000090c0
#define FERMI_COMPUTE_B 0x000091c0 #define FERMI_COMPUTE_B 0x000091c0
#define KEPLER_COMPUTE_A 0x0000a0c0 #define KEPLER_COMPUTE_A 0x0000a0c0
#define KEPLER_COMPUTE_B 0x0000a1c0 #define KEPLER_COMPUTE_B 0x0000a1c0
#define MAXWELL_COMPUTE_A 0x0000b0c0 #define MAXWELL_COMPUTE_A 0x0000b0c0
#define MAXWELL_COMPUTE_B 0x0000b1c0 #define MAXWELL_COMPUTE_B 0x0000b1c0
#define NV74_CIPHER 0x000074c1
/******************************************************************************* /*******************************************************************************
* client * client
......
...@@ -25,74 +25,47 @@ ...@@ -25,74 +25,47 @@
#include <engine/fifo.h> #include <engine/fifo.h>
#include <core/client.h> #include <core/client.h>
#include <core/engctx.h>
#include <core/enum.h> #include <core/enum.h>
#include <core/gpuobj.h>
/******************************************************************************* #include <nvif/class.h>
* Crypt object classes
******************************************************************************/
static int static int
g84_cipher_object_ctor(struct nvkm_object *parent, g84_cipher_oclass_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent,
struct nvkm_object *engine, int align, struct nvkm_gpuobj **pgpuobj)
struct nvkm_oclass *oclass, void *data, u32 size,
struct nvkm_object **pobject)
{ {
struct nvkm_gpuobj *obj; int ret = nvkm_gpuobj_new(object->engine->subdev.device, 16,
int ret; align, false, parent, pgpuobj);
if (ret == 0) {
ret = nvkm_gpuobj_create(parent, engine, oclass, 0, parent, nvkm_kmap(*pgpuobj);
16, 16, 0, &obj); nvkm_wo32(*pgpuobj, 0x00, object->oclass_name);
*pobject = nv_object(obj); nvkm_wo32(*pgpuobj, 0x04, 0x00000000);
if (ret) nvkm_wo32(*pgpuobj, 0x08, 0x00000000);
return ret; nvkm_wo32(*pgpuobj, 0x0c, 0x00000000);
nvkm_done(*pgpuobj);
nvkm_kmap(obj); }
nvkm_wo32(obj, 0x00, nv_mclass(obj)); return ret;
nvkm_wo32(obj, 0x04, 0x00000000);
nvkm_wo32(obj, 0x08, 0x00000000);
nvkm_wo32(obj, 0x0c, 0x00000000);
nvkm_done(obj);
return 0;
} }
static struct nvkm_ofuncs static const struct nvkm_object_func
g84_cipher_ofuncs = { g84_cipher_oclass_func = {
.ctor = g84_cipher_object_ctor, .bind = g84_cipher_oclass_bind,
.dtor = _nvkm_gpuobj_dtor,
.init = _nvkm_gpuobj_init,
.fini = _nvkm_gpuobj_fini,
.rd32 = _nvkm_gpuobj_rd32,
.wr32 = _nvkm_gpuobj_wr32,
}; };
static struct nvkm_oclass static int
g84_cipher_sclass[] = { g84_cipher_cclass_bind(struct nvkm_object *object, struct nvkm_gpuobj *parent,
{ 0x74c1, &g84_cipher_ofuncs }, int align, struct nvkm_gpuobj **pgpuobj)
{} {
}; return nvkm_gpuobj_new(object->engine->subdev.device, 256,
align, true, parent, pgpuobj);
/******************************************************************************* }
* PCIPHER context
******************************************************************************/
static struct nvkm_oclass static const struct nvkm_object_func
g84_cipher_cclass = { g84_cipher_cclass = {
.handle = NV_ENGCTX(CIPHER, 0x84), .bind = g84_cipher_cclass_bind,
.ofuncs = &(struct nvkm_ofuncs) {
.ctor = _nvkm_engctx_ctor,
.dtor = _nvkm_engctx_dtor,
.init = _nvkm_engctx_init,
.fini = _nvkm_engctx_fini,
.rd32 = _nvkm_engctx_rd32,
.wr32 = _nvkm_engctx_wr32,
},
}; };
/*******************************************************************************
* PCIPHER engine/subdev functions
******************************************************************************/
static const struct nvkm_bitfield static const struct nvkm_bitfield
g84_cipher_intr_mask[] = { g84_cipher_intr_mask[] = {
{ 0x00000001, "INVALID_STATE" }, { 0x00000001, "INVALID_STATE" },
...@@ -132,6 +105,15 @@ g84_cipher_intr(struct nvkm_subdev *subdev) ...@@ -132,6 +105,15 @@ g84_cipher_intr(struct nvkm_subdev *subdev)
nvkm_wr32(device, 0x10200c, 0x10); nvkm_wr32(device, 0x10200c, 0x10);
} }
static const struct nvkm_engine_func
g84_cipher = {
.cclass = &g84_cipher_cclass,
.sclass = {
{ -1, -1, NV74_CIPHER, &g84_cipher_oclass_func },
{}
}
};
static int static int
g84_cipher_ctor(struct nvkm_object *parent, struct nvkm_object *engine, g84_cipher_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_oclass *oclass, void *data, u32 size, struct nvkm_oclass *oclass, void *data, u32 size,
...@@ -146,10 +128,9 @@ g84_cipher_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -146,10 +128,9 @@ g84_cipher_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
if (ret) if (ret)
return ret; return ret;
cipher->func = &g84_cipher,
nv_subdev(cipher)->unit = 0x00004000; nv_subdev(cipher)->unit = 0x00004000;
nv_subdev(cipher)->intr = g84_cipher_intr; nv_subdev(cipher)->intr = g84_cipher_intr;
nv_engine(cipher)->cclass = &g84_cipher_cclass;
nv_engine(cipher)->sclass = g84_cipher_sclass;
return 0; return 0;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册