Skip to content

L
linux
Commit ccdfdf21 authored by Ben Skeggs's avatar Ben Skeggs
Browse files
Options

drm/nouveau/cipher: namespace + nvidia gpu names (no binary change) 

The namespace of NVKM is being changed to nvkm_ instead of nouveau_,
which will be used for the DRM part of the driver.  This is being
done in order to make it very clear as to what part of the driver a
given symbol belongs to, and as a minor step towards splitting the
DRM driver out to be able to stand on its own (for virt).

Because there's already a large amount of churn here anyway, this is
as good a time as any to also switch to NVIDIA's device and chipset
naming to ease collaboration with them.

A comparison of objdump disassemblies proves no code changes.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent bd6c5cab
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 74 deletions
drivers/gpu/drm/nouveau/include/nvkm/engine/cipher.h
View file @ ccdfdf21
#ifndef __NVKM_CIPHER_H__ #ifndef __NVKM_CIPHER_H__
#define __NVKM_CIPHER_H__ #define __NVKM_CIPHER_H__
extern struct nouveau_oclass nv84_cipher_oclass; #include <core/engine.h>
extern struct nvkm_oclass g84_cipher_oclass;
#endif #endif
drivers/gpu/drm/nouveau/nvkm/engine/cipher/Kbuild
View file @ ccdfdf21
nvkm-y += nvkm/engine/cipher/nv84.o nvkm-y += nvkm/engine/cipher/g84.o
drivers/gpu/drm/nouveau/nvkm/engine/cipher/nv84.c → drivers/gpu/drm/nouveau/nvkm/engine/cipher/g84.c
View file @ ccdfdf21
...@@ -21,20 +21,15 @@ ...@@ -21,20 +21,15 @@
* *
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include <engine/cipher.h>
#include <engine/fifo.h>
#include <core/client.h> #include <core/client.h>
#include <core/os.h>
#include <core/enum.h>
#include <core/engctx.h> #include <core/engctx.h>
#include <core/gpuobj.h> #include <core/enum.h>
#include <subdev/fb.h>
#include <engine/fifo.h>
#include <engine/cipher.h>
struct nv84_cipher_priv { struct g84_cipher_priv {
struct nouveau_engine base; struct nvkm_engine base;
}; };
/******************************************************************************* /*******************************************************************************
...@@ -42,15 +37,15 @@ struct nv84_cipher_priv { ...@@ -42,15 +37,15 @@ struct nv84_cipher_priv {
******************************************************************************/ ******************************************************************************/
static int static int
nv84_cipher_object_ctor(struct nouveau_object *parent, g84_cipher_object_ctor(struct nvkm_object *parent,
struct nouveau_object *engine, struct nvkm_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size, struct nvkm_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject) struct nvkm_object **pobject)
{ {
struct nouveau_gpuobj *obj; struct nvkm_gpuobj *obj;
int ret; int ret;
ret = nouveau_gpuobj_create(parent, engine, oclass, 0, parent, ret = nvkm_gpuobj_create(parent, engine, oclass, 0, parent,
16, 16, 0, &obj); 16, 16, 0, &obj);
*pobject = nv_object(obj); *pobject = nv_object(obj);
if (ret) if (ret)
...@@ -63,19 +58,19 @@ nv84_cipher_object_ctor(struct nouveau_object *parent, ...@@ -63,19 +58,19 @@ nv84_cipher_object_ctor(struct nouveau_object *parent,
return 0; return 0;
} }
static struct nouveau_ofuncs static struct nvkm_ofuncs
nv84_cipher_ofuncs = { g84_cipher_ofuncs = {
.ctor = nv84_cipher_object_ctor, .ctor = g84_cipher_object_ctor,
.dtor = _nouveau_gpuobj_dtor, .dtor = _nvkm_gpuobj_dtor,
.init = _nouveau_gpuobj_init, .init = _nvkm_gpuobj_init,
.fini = _nouveau_gpuobj_fini, .fini = _nvkm_gpuobj_fini,
.rd32 = _nouveau_gpuobj_rd32, .rd32 = _nvkm_gpuobj_rd32,
.wr32 = _nouveau_gpuobj_wr32, .wr32 = _nvkm_gpuobj_wr32,
}; };
static struct nouveau_oclass static struct nvkm_oclass
nv84_cipher_sclass[] = { g84_cipher_sclass[] = {
{ 0x74c1, &nv84_cipher_ofuncs }, { 0x74c1, &g84_cipher_ofuncs },
{} {}
}; };
...@@ -83,16 +78,16 @@ nv84_cipher_sclass[] = { ...@@ -83,16 +78,16 @@ nv84_cipher_sclass[] = {
* PCIPHER context * PCIPHER context
******************************************************************************/ ******************************************************************************/
static struct nouveau_oclass static struct nvkm_oclass
nv84_cipher_cclass = { g84_cipher_cclass = {
.handle = NV_ENGCTX(CIPHER, 0x84), .handle = NV_ENGCTX(CIPHER, 0x84),
.ofuncs = &(struct nouveau_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = _nouveau_engctx_ctor, .ctor = _nvkm_engctx_ctor,
.dtor = _nouveau_engctx_dtor, .dtor = _nvkm_engctx_dtor,
.init = _nouveau_engctx_init, .init = _nvkm_engctx_init,
.fini = _nouveau_engctx_fini, .fini = _nvkm_engctx_fini,
.rd32 = _nouveau_engctx_rd32, .rd32 = _nvkm_engctx_rd32,
.wr32 = _nouveau_engctx_wr32, .wr32 = _nvkm_engctx_wr32,
}, },
}; };
...@@ -100,7 +95,8 @@ nv84_cipher_cclass = { ...@@ -100,7 +95,8 @@ nv84_cipher_cclass = {
* PCIPHER engine/subdev functions * PCIPHER engine/subdev functions
******************************************************************************/ ******************************************************************************/
static const struct nouveau_bitfield nv84_cipher_intr_mask[] = { static const struct nvkm_bitfield
g84_cipher_intr_mask[] = {
{ 0x00000001, "INVALID_STATE" }, { 0x00000001, "INVALID_STATE" },
{ 0x00000002, "ILLEGAL_MTHD" }, { 0x00000002, "ILLEGAL_MTHD" },
{ 0x00000004, "ILLEGAL_CLASS" }, { 0x00000004, "ILLEGAL_CLASS" },
...@@ -110,63 +106,63 @@ static const struct nouveau_bitfield nv84_cipher_intr_mask[] = { ...@@ -110,63 +106,63 @@ static const struct nouveau_bitfield nv84_cipher_intr_mask[] = {
}; };
static void static void
nv84_cipher_intr(struct nouveau_subdev *subdev) g84_cipher_intr(struct nvkm_subdev *subdev)
{ {
struct nouveau_fifo *pfifo = nouveau_fifo(subdev); struct nvkm_fifo *pfifo = nvkm_fifo(subdev);
struct nouveau_engine *engine = nv_engine(subdev); struct nvkm_engine *engine = nv_engine(subdev);
struct nouveau_object *engctx; struct nvkm_object *engctx;
struct nv84_cipher_priv *priv = (void *)subdev; struct g84_cipher_priv *priv = (void *)subdev;
u32 stat = nv_rd32(priv, 0x102130); u32 stat = nv_rd32(priv, 0x102130);
u32 mthd = nv_rd32(priv, 0x102190); u32 mthd = nv_rd32(priv, 0x102190);
u32 data = nv_rd32(priv, 0x102194); u32 data = nv_rd32(priv, 0x102194);
u32 inst = nv_rd32(priv, 0x102188) & 0x7fffffff; u32 inst = nv_rd32(priv, 0x102188) & 0x7fffffff;
int chid; int chid;
engctx = nouveau_engctx_get(engine, inst); engctx = nvkm_engctx_get(engine, inst);
chid = pfifo->chid(pfifo, engctx); chid = pfifo->chid(pfifo, engctx);
if (stat) { if (stat) {
nv_error(priv, "%s", ""); nv_error(priv, "%s", "");
nouveau_bitfield_print(nv84_cipher_intr_mask, stat); nvkm_bitfield_print(g84_cipher_intr_mask, stat);
pr_cont(" ch %d [0x%010llx %s] mthd 0x%04x data 0x%08x\n", pr_cont(" ch %d [0x%010llx %s] mthd 0x%04x data 0x%08x\n",
chid, (u64)inst << 12, nouveau_client_name(engctx), chid, (u64)inst << 12, nvkm_client_name(engctx),
mthd, data); mthd, data);
} }
nv_wr32(priv, 0x102130, stat); nv_wr32(priv, 0x102130, stat);
nv_wr32(priv, 0x10200c, 0x10); nv_wr32(priv, 0x10200c, 0x10);
nouveau_engctx_put(engctx); nvkm_engctx_put(engctx);
} }
static int static int
nv84_cipher_ctor(struct nouveau_object *parent, struct nouveau_object *engine, g84_cipher_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nouveau_oclass *oclass, void *data, u32 size, struct nvkm_oclass *oclass, void *data, u32 size,
struct nouveau_object **pobject) struct nvkm_object **pobject)
{ {
struct nv84_cipher_priv *priv; struct g84_cipher_priv *priv;
int ret; int ret;
ret = nouveau_engine_create(parent, engine, oclass, true, ret = nvkm_engine_create(parent, engine, oclass, true,
"PCIPHER", "cipher", &priv); "PCIPHER", "cipher", &priv);
*pobject = nv_object(priv); *pobject = nv_object(priv);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00004000; nv_subdev(priv)->unit = 0x00004000;
nv_subdev(priv)->intr = nv84_cipher_intr; nv_subdev(priv)->intr = g84_cipher_intr;
nv_engine(priv)->cclass = &nv84_cipher_cclass; nv_engine(priv)->cclass = &g84_cipher_cclass;
nv_engine(priv)->sclass = nv84_cipher_sclass; nv_engine(priv)->sclass = g84_cipher_sclass;
return 0; return 0;
} }
static int static int
nv84_cipher_init(struct nouveau_object *object) g84_cipher_init(struct nvkm_object *object)
{ {
struct nv84_cipher_priv *priv = (void *)object; struct g84_cipher_priv *priv = (void *)object;
int ret; int ret;
ret = nouveau_engine_init(&priv->base); ret = nvkm_engine_init(&priv->base);
if (ret) if (ret)
return ret; return ret;
...@@ -176,13 +172,13 @@ nv84_cipher_init(struct nouveau_object *object) ...@@ -176,13 +172,13 @@ nv84_cipher_init(struct nouveau_object *object)
return 0; return 0;
} }
struct nouveau_oclass struct nvkm_oclass
nv84_cipher_oclass = { g84_cipher_oclass = {
.handle = NV_ENGINE(CIPHER, 0x84), .handle = NV_ENGINE(CIPHER, 0x84),
.ofuncs = &(struct nouveau_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nv84_cipher_ctor, .ctor = g84_cipher_ctor,
.dtor = _nouveau_engine_dtor, .dtor = _nvkm_engine_dtor,
.init = nv84_cipher_init, .init = g84_cipher_init,
.fini = _nouveau_engine_fini, .fini = _nvkm_engine_fini,
}, },
}; };
drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
View file @ ccdfdf21
...@@ -111,7 +111,7 @@ nv50_identify(struct nouveau_device *device) ...@@ -111,7 +111,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass;
device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass;
device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass; device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass;
device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass; device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass; device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nv84_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nv84_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass;
...@@ -140,7 +140,7 @@ nv50_identify(struct nouveau_device *device) ...@@ -140,7 +140,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass;
device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass;
device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass; device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass;
device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass; device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass; device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nv84_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nv84_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass;
...@@ -169,7 +169,7 @@ nv50_identify(struct nouveau_device *device) ...@@ -169,7 +169,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass;
device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass;
device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass; device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass;
device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass; device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass; device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nv84_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nv84_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass;
...@@ -198,7 +198,7 @@ nv50_identify(struct nouveau_device *device) ...@@ -198,7 +198,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass;
device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass;
device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass; device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass;
device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass; device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass; device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nv94_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nv94_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass;
...@@ -227,7 +227,7 @@ nv50_identify(struct nouveau_device *device) ...@@ -227,7 +227,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass;
device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass;
device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass; device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass;
device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass; device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass; device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nv94_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nv94_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass;
...@@ -285,7 +285,7 @@ nv50_identify(struct nouveau_device *device) ...@@ -285,7 +285,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = &nv50_gr_oclass;
device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass; device->oclass[NVDEV_ENGINE_MPEG ] = &nv84_mpeg_oclass;
device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass; device->oclass[NVDEV_ENGINE_VP ] = &nv84_vp_oclass;
device->oclass[NVDEV_ENGINE_CIPHER ] = &nv84_cipher_oclass; device->oclass[NVDEV_ENGINE_CIPHER ] = &g84_cipher_oclass;
device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass; device->oclass[NVDEV_ENGINE_BSP ] = &g84_bsp_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva0_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva0_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nv84_pm_oclass;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7