Skip to content

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

drm/nouveau/ce: 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 912a29c3
Hide whitespace changes
Inline Side-by-side
Showing with 353 additions and 203 deletions
drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h
View file @ bd6c5cab
...@@ -2,13 +2,12 @@ ...@@ -2,13 +2,12 @@
#define __NVKM_CE_H__ #define __NVKM_CE_H__
#include <core/engine.h> #include <core/engine.h>
void nva3_ce_intr(struct nouveau_subdev *); void gt215_ce_intr(struct nvkm_subdev *);
extern struct nouveau_oclass nva3_ce_oclass;
extern struct nouveau_oclass nvc0_ce0_oclass;
extern struct nouveau_oclass nvc0_ce1_oclass;
extern struct nouveau_oclass nve0_ce0_oclass;
extern struct nouveau_oclass nve0_ce1_oclass;
extern struct nouveau_oclass nve0_ce2_oclass;
extern struct nvkm_oclass gt215_ce_oclass;
extern struct nvkm_oclass gf100_ce0_oclass;
extern struct nvkm_oclass gf100_ce1_oclass;
extern struct nvkm_oclass gk104_ce0_oclass;
extern struct nvkm_oclass gk104_ce1_oclass;
extern struct nvkm_oclass gk104_ce2_oclass;
#endif #endif
drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild
View file @ bd6c5cab
nvkm-y += nvkm/engine/ce/nva3.o nvkm-y += nvkm/engine/ce/gt215.o
nvkm-y += nvkm/engine/ce/nvc0.o nvkm-y += nvkm/engine/ce/gf100.o
nvkm-y += nvkm/engine/ce/nve0.o nvkm-y += nvkm/engine/ce/gk104.o
drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/com.fuc
View file @ bd6c5cab
/* fuc microcode for copy engine on nva3- chipsets /* fuc microcode for copy engine on gt215- chipsets
* *
* Copyright 2011 Red Hat Inc. * Copyright 2011 Red Hat Inc.
* *
...@@ -23,21 +23,14 @@ ...@@ -23,21 +23,14 @@
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
/* To build for nva3:nvc0 #ifdef GT215
* m4 -DNVA3 nva3_copy.fuc | envyas -a -w -m fuc -V nva3 -o nva3_copy.fuc.h .section #gt215_pce_data
*
* To build for nvc0-
* m4 -DNVC0 nva3_copy.fuc | envyas -a -w -m fuc -V nva3 -o nvc0_copy.fuc.h
*/
#ifdef NVA3
.section #nva3_pce_data
#else #else
.section #nvc0_pce_data .section #gf100_pce_data
#endif #endif
ctx_object: .b32 0 ctx_object: .b32 0
#ifdef NVA3 #ifdef GT215
ctx_dma: ctx_dma:
ctx_dma_query: .b32 0 ctx_dma_query: .b32 0
ctx_dma_src: .b32 0 ctx_dma_src: .b32 0
...@@ -86,7 +79,7 @@ dispatch_table: ...@@ -86,7 +79,7 @@ dispatch_table:
// mthd 0x0140, PM_TRIGGER // mthd 0x0140, PM_TRIGGER
.b16 0x050 1 .b16 0x050 1
.b32 0x00010000 + #cmd_pm_trigger ~0xffffffff .b32 0x00010000 + #cmd_pm_trigger ~0xffffffff
#ifdef NVA3 #ifdef GT215
// mthd 0x0180-0x018c, DMA_ // mthd 0x0180-0x018c, DMA_
.b16 0x060 #ctx_dma_count .b16 0x060 #ctx_dma_count
dispatch_dma: dispatch_dma:
...@@ -134,10 +127,10 @@ dispatch_dma: ...@@ -134,10 +127,10 @@ dispatch_dma:
.b32 #ctx_query_counter ~0xffffffff .b32 #ctx_query_counter ~0xffffffff
.b16 0x800 0 .b16 0x800 0
#ifdef NVA3 #ifdef GT215
.section #nva3_pce_code .section #gt215_pce_code
#else #else
.section #nvc0_pce_code .section #gf100_pce_code
#endif #endif
main: main:
...@@ -190,7 +183,7 @@ ih: ...@@ -190,7 +183,7 @@ ih:
swctx: swctx:
mov $r4 0x7700 mov $r4 0x7700
mov $xtargets $r4 mov $xtargets $r4
#ifdef NVA3 #ifdef GT215
// target 7 hardcoded to ctx dma object // target 7 hardcoded to ctx dma object
mov $xdbase $r0 mov $xdbase $r0
#else #else
...@@ -271,7 +264,7 @@ chsw: ...@@ -271,7 +264,7 @@ chsw:
bra e #chsw_finish_load bra e #chsw_finish_load
bset $flags $p1 bset $flags $p1
call #swctx call #swctx
#ifdef NVA3 #ifdef GT215
// load dma objects back into TARGET regs // load dma objects back into TARGET regs
mov $r5 #ctx_dma mov $r5 #ctx_dma
mov $r6 #ctx_dma_count mov $r6 #ctx_dma_count
...@@ -396,7 +389,7 @@ cmd_pm_trigger: ...@@ -396,7 +389,7 @@ cmd_pm_trigger:
iowr I[$r2] $r3 iowr I[$r2] $r3
ret ret
#ifdef NVA3 #ifdef GT215
// SET_DMA_* method handler // SET_DMA_* method handler
// //
// Inputs: // Inputs:
...@@ -547,7 +540,7 @@ cmd_exec_set_surface_tiled: ...@@ -547,7 +540,7 @@ cmd_exec_set_surface_tiled:
ld b32 $r7 D[$r5 + #ctx_src_tile_mode] ld b32 $r7 D[$r5 + #ctx_src_tile_mode]
extr $r9 $r7 8:11 extr $r9 $r7 8:11
extr $r8 $r7 4:7 extr $r8 $r7 4:7
#ifdef NVA3 #ifdef GT215
add b32 $r8 2 add b32 $r8 2
#else #else
add b32 $r8 3 add b32 $r8 3
......
drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/nvc0.fuc3.h → drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gf100.fuc3.h
View file @ bd6c5cab
uint32_t nvc0_pce_data[] = { uint32_t gf100_pce_data[] = {
/* 0x0000: ctx_object */ /* 0x0000: ctx_object */
0x00000000, 0x00000000,
/* 0x0004: ctx_query_address_high */ /* 0x0004: ctx_query_address_high */
...@@ -171,7 +171,7 @@ uint32_t nvc0_pce_data[] = { ...@@ -171,7 +171,7 @@ uint32_t nvc0_pce_data[] = {
0x00000800, 0x00000800,
}; };
uint32_t nvc0_pce_code[] = { uint32_t gf100_pce_code[] = {
/* 0x0000: main */ /* 0x0000: main */
0x04fe04bd, 0x04fe04bd,
0x3517f000, 0x3517f000,
......
drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/nva3.fuc3.h → drivers/gpu/drm/nouveau/nvkm/engine/ce/fuc/gt215.fuc3.h
View file @ bd6c5cab
uint32_t nva3_pce_data[] = { uint32_t gt215_pce_data[] = {
/* 0x0000: ctx_object */ /* 0x0000: ctx_object */
0x00000000, 0x00000000,
/* 0x0004: ctx_dma */ /* 0x0004: ctx_dma */
...@@ -183,7 +183,7 @@ uint32_t nva3_pce_data[] = { ...@@ -183,7 +183,7 @@ uint32_t nva3_pce_data[] = {
0x00000800, 0x00000800,
}; };
uint32_t nva3_pce_code[] = { uint32_t gt215_pce_code[] = {
/* 0x0000: main */ /* 0x0000: main */
0x04fe04bd, 0x04fe04bd,
0x3517f000, 0x3517f000,
......
drivers/gpu/drm/nouveau/nvkm/engine/ce/nvc0.c → drivers/gpu/drm/nouveau/nvkm/engine/ce/gf100.c
View file @ bd6c5cab
...@@ -21,33 +21,27 @@ ...@@ -21,33 +21,27 @@
* *
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include <engine/falcon.h>
#include <engine/fifo.h>
#include <engine/ce.h> #include <engine/ce.h>
#include <engine/falcon.h>
#include "fuc/gf100.fuc3.h"
#include <core/enum.h> struct gf100_ce_priv {
#include <core/enum.h> struct nvkm_falcon base;
#include "fuc/nvc0.fuc3.h"
struct nvc0_ce_priv {
struct nouveau_falcon base;
}; };
/******************************************************************************* /*******************************************************************************
* Copy object classes * Copy object classes
******************************************************************************/ ******************************************************************************/
static struct nouveau_oclass static struct nvkm_oclass
nvc0_ce0_sclass[] = { gf100_ce0_sclass[] = {
{ 0x90b5, &nouveau_object_ofuncs }, { 0x90b5, &nvkm_object_ofuncs },
{}, {},
}; };
static struct nouveau_oclass static struct nvkm_oclass
nvc0_ce1_sclass[] = { gf100_ce1_sclass[] = {
{ 0x90b8, &nouveau_object_ofuncs }, { 0x90b8, &nvkm_object_ofuncs },
{}, {},
}; };
...@@ -55,26 +49,26 @@ nvc0_ce1_sclass[] = { ...@@ -55,26 +49,26 @@ nvc0_ce1_sclass[] = {
* PCE context * PCE context
******************************************************************************/ ******************************************************************************/
static struct nouveau_ofuncs static struct nvkm_ofuncs
nvc0_ce_context_ofuncs = { gf100_ce_context_ofuncs = {
.ctor = _nouveau_falcon_context_ctor, .ctor = _nvkm_falcon_context_ctor,
.dtor = _nouveau_falcon_context_dtor, .dtor = _nvkm_falcon_context_dtor,
.init = _nouveau_falcon_context_init, .init = _nvkm_falcon_context_init,
.fini = _nouveau_falcon_context_fini, .fini = _nvkm_falcon_context_fini,
.rd32 = _nouveau_falcon_context_rd32, .rd32 = _nvkm_falcon_context_rd32,
.wr32 = _nouveau_falcon_context_wr32, .wr32 = _nvkm_falcon_context_wr32,
}; };
static struct nouveau_oclass static struct nvkm_oclass
nvc0_ce0_cclass = { gf100_ce0_cclass = {
.handle = NV_ENGCTX(CE0, 0xc0), .handle = NV_ENGCTX(CE0, 0xc0),
.ofuncs = &nvc0_ce_context_ofuncs, .ofuncs = &gf100_ce_context_ofuncs,
}; };
static struct nouveau_oclass static struct nvkm_oclass
nvc0_ce1_cclass = { gf100_ce1_cclass = {
.handle = NV_ENGCTX(CE1, 0xc0), .handle = NV_ENGCTX(CE1, 0xc0),
.ofuncs = &nvc0_ce_context_ofuncs, .ofuncs = &gf100_ce_context_ofuncs,
}; };
/******************************************************************************* /*******************************************************************************
...@@ -82,12 +76,12 @@ nvc0_ce1_cclass = { ...@@ -82,12 +76,12 @@ nvc0_ce1_cclass = {
******************************************************************************/ ******************************************************************************/
static int static int
nvc0_ce_init(struct nouveau_object *object) gf100_ce_init(struct nvkm_object *object)
{ {
struct nvc0_ce_priv *priv = (void *)object; struct gf100_ce_priv *priv = (void *)object;
int ret; int ret;
ret = nouveau_falcon_init(&priv->base); ret = nvkm_falcon_init(&priv->base);
if (ret) if (ret)
return ret; return ret;
...@@ -96,77 +90,77 @@ nvc0_ce_init(struct nouveau_object *object) ...@@ -96,77 +90,77 @@ nvc0_ce_init(struct nouveau_object *object)
} }
static int static int
nvc0_ce0_ctor(struct nouveau_object *parent, struct nouveau_object *engine, gf100_ce0_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 nvc0_ce_priv *priv; struct gf100_ce_priv *priv;
int ret; int ret;
ret = nouveau_falcon_create(parent, engine, oclass, 0x104000, true, ret = nvkm_falcon_create(parent, engine, oclass, 0x104000, true,
"PCE0", "ce0", &priv); "PCE0", "ce0", &priv);
*pobject = nv_object(priv); *pobject = nv_object(priv);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00000040; nv_subdev(priv)->unit = 0x00000040;
nv_subdev(priv)->intr = nva3_ce_intr; nv_subdev(priv)->intr = gt215_ce_intr;
nv_engine(priv)->cclass = &nvc0_ce0_cclass; nv_engine(priv)->cclass = &gf100_ce0_cclass;
nv_engine(priv)->sclass = nvc0_ce0_sclass; nv_engine(priv)->sclass = gf100_ce0_sclass;
nv_falcon(priv)->code.data = nvc0_pce_code; nv_falcon(priv)->code.data = gf100_pce_code;
nv_falcon(priv)->code.size = sizeof(nvc0_pce_code); nv_falcon(priv)->code.size = sizeof(gf100_pce_code);
nv_falcon(priv)->data.data = nvc0_pce_data; nv_falcon(priv)->data.data = gf100_pce_data;
nv_falcon(priv)->data.size = sizeof(nvc0_pce_data); nv_falcon(priv)->data.size = sizeof(gf100_pce_data);
return 0; return 0;
} }
static int static int
nvc0_ce1_ctor(struct nouveau_object *parent, struct nouveau_object *engine, gf100_ce1_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 nvc0_ce_priv *priv; struct gf100_ce_priv *priv;
int ret; int ret;
ret = nouveau_falcon_create(parent, engine, oclass, 0x105000, true, ret = nvkm_falcon_create(parent, engine, oclass, 0x105000, true,
"PCE1", "ce1", &priv); "PCE1", "ce1", &priv);
*pobject = nv_object(priv); *pobject = nv_object(priv);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00000080; nv_subdev(priv)->unit = 0x00000080;
nv_subdev(priv)->intr = nva3_ce_intr; nv_subdev(priv)->intr = gt215_ce_intr;
nv_engine(priv)->cclass = &nvc0_ce1_cclass; nv_engine(priv)->cclass = &gf100_ce1_cclass;
nv_engine(priv)->sclass = nvc0_ce1_sclass; nv_engine(priv)->sclass = gf100_ce1_sclass;
nv_falcon(priv)->code.data = nvc0_pce_code; nv_falcon(priv)->code.data = gf100_pce_code;
nv_falcon(priv)->code.size = sizeof(nvc0_pce_code); nv_falcon(priv)->code.size = sizeof(gf100_pce_code);
nv_falcon(priv)->data.data = nvc0_pce_data; nv_falcon(priv)->data.data = gf100_pce_data;
nv_falcon(priv)->data.size = sizeof(nvc0_pce_data); nv_falcon(priv)->data.size = sizeof(gf100_pce_data);
return 0; return 0;
} }
struct nouveau_oclass struct nvkm_oclass
nvc0_ce0_oclass = { gf100_ce0_oclass = {
.handle = NV_ENGINE(CE0, 0xc0), .handle = NV_ENGINE(CE0, 0xc0),
.ofuncs = &(struct nouveau_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nvc0_ce0_ctor, .ctor = gf100_ce0_ctor,
.dtor = _nouveau_falcon_dtor, .dtor = _nvkm_falcon_dtor,
.init = nvc0_ce_init, .init = gf100_ce_init,
.fini = _nouveau_falcon_fini, .fini = _nvkm_falcon_fini,
.rd32 = _nouveau_falcon_rd32, .rd32 = _nvkm_falcon_rd32,
.wr32 = _nouveau_falcon_wr32, .wr32 = _nvkm_falcon_wr32,
}, },
}; };
struct nouveau_oclass struct nvkm_oclass
nvc0_ce1_oclass = { gf100_ce1_oclass = {
.handle = NV_ENGINE(CE1, 0xc0), .handle = NV_ENGINE(CE1, 0xc0),
.ofuncs = &(struct nouveau_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nvc0_ce1_ctor, .ctor = gf100_ce1_ctor,
.dtor = _nouveau_falcon_dtor, .dtor = _nvkm_falcon_dtor,
.init = nvc0_ce_init, .init = gf100_ce_init,
.fini = _nouveau_falcon_fini, .fini = _nvkm_falcon_fini,
.rd32 = _nouveau_falcon_rd32, .rd32 = _nvkm_falcon_rd32,
.wr32 = _nouveau_falcon_wr32, .wr32 = _nvkm_falcon_wr32,
}, },
}; };
drivers/gpu/drm/nouveau/nvkm/engine/ce/nve0.c → drivers/gpu/drm/nouveau/nvkm/engine/ce/gk104.c
View file @ bd6c5cab
...@@ -21,24 +21,21 @@ ...@@ -21,24 +21,21 @@
* *
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include <engine/ce.h>
#include <core/os.h>
#include <core/enum.h>
#include <core/engctx.h> #include <core/engctx.h>
#include <engine/ce.h> struct gk104_ce_priv {
struct nvkm_engine base;
struct nve0_ce_priv {
struct nouveau_engine base;
}; };
/******************************************************************************* /*******************************************************************************
* Copy object classes * Copy object classes
******************************************************************************/ ******************************************************************************/
static struct nouveau_oclass static struct nvkm_oclass
nve0_ce_sclass[] = { gk104_ce_sclass[] = {
{ 0xa0b5, &nouveau_object_ofuncs }, { 0xa0b5, &nvkm_object_ofuncs },
{}, {},
}; };
...@@ -46,20 +43,20 @@ nve0_ce_sclass[] = { ...@@ -46,20 +43,20 @@ nve0_ce_sclass[] = {
* PCE context * PCE context
******************************************************************************/ ******************************************************************************/
static struct nouveau_ofuncs static struct nvkm_ofuncs
nve0_ce_context_ofuncs = { gk104_ce_context_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,
}; };
static struct nouveau_oclass static struct nvkm_oclass
nve0_ce_cclass = { gk104_ce_cclass = {
.handle = NV_ENGCTX(CE0, 0xc0), .handle = NV_ENGCTX(CE0, 0xc0),
.ofuncs = &nve0_ce_context_ofuncs, .ofuncs = &gk104_ce_context_ofuncs,
}; };
/******************************************************************************* /*******************************************************************************
...@@ -67,10 +64,10 @@ nve0_ce_cclass = { ...@@ -67,10 +64,10 @@ nve0_ce_cclass = {
******************************************************************************/ ******************************************************************************/
static void static void
nve0_ce_intr(struct nouveau_subdev *subdev) gk104_ce_intr(struct nvkm_subdev *subdev)
{ {
const int ce = nv_subidx(subdev) - NVDEV_ENGINE_CE0; const int ce = nv_subidx(subdev) - NVDEV_ENGINE_CE0;
struct nve0_ce_priv *priv = (void *)subdev; struct gk104_ce_priv *priv = (void *)subdev;
u32 stat = nv_rd32(priv, 0x104908 + (ce * 0x1000)); u32 stat = nv_rd32(priv, 0x104908 + (ce * 0x1000));
if (stat) { if (stat) {
...@@ -80,97 +77,97 @@ nve0_ce_intr(struct nouveau_subdev *subdev) ...@@ -80,97 +77,97 @@ nve0_ce_intr(struct nouveau_subdev *subdev)
} }
static int static int
nve0_ce0_ctor(struct nouveau_object *parent, struct nouveau_object *engine, gk104_ce0_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 nve0_ce_priv *priv; struct gk104_ce_priv *priv;
int ret; int ret;
ret = nouveau_engine_create(parent, engine, oclass, true, ret = nvkm_engine_create(parent, engine, oclass, true,
"PCE0", "ce0", &priv); "PCE0", "ce0", &priv);
*pobject = nv_object(priv); *pobject = nv_object(priv);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00000040; nv_subdev(priv)->unit = 0x00000040;
nv_subdev(priv)->intr = nve0_ce_intr; nv_subdev(priv)->intr = gk104_ce_intr;
nv_engine(priv)->cclass = &nve0_ce_cclass; nv_engine(priv)->cclass = &gk104_ce_cclass;
nv_engine(priv)->sclass = nve0_ce_sclass; nv_engine(priv)->sclass = gk104_ce_sclass;
return 0; return 0;
} }
static int static int
nve0_ce1_ctor(struct nouveau_object *parent, struct nouveau_object *engine, gk104_ce1_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 nve0_ce_priv *priv; struct gk104_ce_priv *priv;
int ret; int ret;
ret = nouveau_engine_create(parent, engine, oclass, true, ret = nvkm_engine_create(parent, engine, oclass, true,
"PCE1", "ce1", &priv); "PCE1", "ce1", &priv);
*pobject = nv_object(priv); *pobject = nv_object(priv);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00000080; nv_subdev(priv)->unit = 0x00000080;
nv_subdev(priv)->intr = nve0_ce_intr; nv_subdev(priv)->intr = gk104_ce_intr;
nv_engine(priv)->cclass = &nve0_ce_cclass; nv_engine(priv)->cclass = &gk104_ce_cclass;
nv_engine(priv)->sclass = nve0_ce_sclass; nv_engine(priv)->sclass = gk104_ce_sclass;
return 0; return 0;
} }
static int static int
nve0_ce2_ctor(struct nouveau_object *parent, struct nouveau_object *engine, gk104_ce2_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 nve0_ce_priv *priv; struct gk104_ce_priv *priv;
int ret; int ret;
ret = nouveau_engine_create(parent, engine, oclass, true, ret = nvkm_engine_create(parent, engine, oclass, true,
"PCE2", "ce2", &priv); "PCE2", "ce2", &priv);
*pobject = nv_object(priv); *pobject = nv_object(priv);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00200000; nv_subdev(priv)->unit = 0x00200000;
nv_subdev(priv)->intr = nve0_ce_intr; nv_subdev(priv)->intr = gk104_ce_intr;
nv_engine(priv)->cclass = &nve0_ce_cclass; nv_engine(priv)->cclass = &gk104_ce_cclass;
nv_engine(priv)->sclass = nve0_ce_sclass; nv_engine(priv)->sclass = gk104_ce_sclass;
return 0; return 0;
} }
struct nouveau_oclass struct nvkm_oclass
nve0_ce0_oclass = { gk104_ce0_oclass = {
.handle = NV_ENGINE(CE0, 0xe0), .handle = NV_ENGINE(CE0, 0xe0),
.ofuncs = &(struct nouveau_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nve0_ce0_ctor, .ctor = gk104_ce0_ctor,
.dtor = _nouveau_engine_dtor, .dtor = _nvkm_engine_dtor,
.init = _nouveau_engine_init, .init = _nvkm_engine_init,
.fini = _nouveau_engine_fini, .fini = _nvkm_engine_fini,
}, },
}; };
struct nouveau_oclass struct nvkm_oclass
nve0_ce1_oclass = { gk104_ce1_oclass = {
.handle = NV_ENGINE(CE1, 0xe0), .handle = NV_ENGINE(CE1, 0xe0),
.ofuncs = &(struct nouveau_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nve0_ce1_ctor, .ctor = gk104_ce1_ctor,
.dtor = _nouveau_engine_dtor, .dtor = _nvkm_engine_dtor,
.init = _nouveau_engine_init, .init = _nvkm_engine_init,
.fini = _nouveau_engine_fini, .fini = _nvkm_engine_fini,
}, },
}; };
struct nouveau_oclass struct nvkm_oclass
nve0_ce2_oclass = { gk104_ce2_oclass = {
.handle = NV_ENGINE(CE2, 0xe0), .handle = NV_ENGINE(CE2, 0xe0),
.ofuncs = &(struct nouveau_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nve0_ce2_ctor, .ctor = gk104_ce2_ctor,
.dtor = _nouveau_engine_dtor, .dtor = _nvkm_engine_dtor,
.init = _nouveau_engine_init, .init = _nvkm_engine_init,
.fini = _nouveau_engine_fini, .fini = _nvkm_engine_fini,
}, },
}; };
drivers/gpu/drm/nouveau/nvkm/engine/ce/nva3.c → drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c
View file @ bd6c5cab
...@@ -21,32 +21,26 @@ ...@@ -21,32 +21,26 @@
* *
* Authors: Ben Skeggs * Authors: Ben Skeggs
*/ */
#include <engine/ce.h>
#include <engine/falcon.h> #include <engine/falcon.h>
#include <engine/fifo.h> #include <engine/fifo.h>
#include <engine/ce.h> #include "fuc/gt215.fuc3.h"
#include <subdev/fb.h>
#include <subdev/mmu.h>
#include <core/client.h> #include <core/client.h>
#include <core/device.h> #include <core/device.h>
#include <core/enum.h> #include <core/enum.h>
struct gt215_ce_priv {
#include "fuc/nva3.fuc3.h" struct nvkm_falcon base;
struct nva3_ce_priv {
struct nouveau_falcon base;
}; };
/******************************************************************************* /*******************************************************************************
* Copy object classes * Copy object classes
******************************************************************************/ ******************************************************************************/
static struct nouveau_oclass static struct nvkm_oclass
nva3_ce_sclass[] = { gt215_ce_sclass[] = {
{ 0x85b5, &nouveau_object_ofuncs }, { 0x85b5, &nvkm_object_ofuncs },
{} {}
}; };
...@@ -54,16 +48,16 @@ nva3_ce_sclass[] = { ...@@ -54,16 +48,16 @@ nva3_ce_sclass[] = {
* PCE context * PCE context
******************************************************************************/ ******************************************************************************/
static struct nouveau_oclass static struct nvkm_oclass
nva3_ce_cclass = { gt215_ce_cclass = {
.handle = NV_ENGCTX(CE0, 0xa3), .handle = NV_ENGCTX(CE0, 0xa3),
.ofuncs = &(struct nouveau_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = _nouveau_falcon_context_ctor, .ctor = _nvkm_falcon_context_ctor,
.dtor = _nouveau_falcon_context_dtor, .dtor = _nvkm_falcon_context_dtor,
.init = _nouveau_falcon_context_init, .init = _nvkm_falcon_context_init,
.fini = _nouveau_falcon_context_fini, .fini = _nvkm_falcon_context_fini,
.rd32 = _nouveau_falcon_context_rd32, .rd32 = _nvkm_falcon_context_rd32,
.wr32 = _nouveau_falcon_context_wr32, .wr32 = _nvkm_falcon_context_wr32,
}, },
}; };
...@@ -72,7 +66,8 @@ nva3_ce_cclass = { ...@@ -72,7 +66,8 @@ nva3_ce_cclass = {
* PCE engine/subdev functions * PCE engine/subdev functions
******************************************************************************/ ******************************************************************************/
static const struct nouveau_enum nva3_ce_isr_error_name[] = { static const struct nvkm_enum
gt215_ce_isr_error_name[] = {
{ 0x0001, "ILLEGAL_MTHD" }, { 0x0001, "ILLEGAL_MTHD" },
{ 0x0002, "INVALID_ENUM" }, { 0x0002, "INVALID_ENUM" },
{ 0x0003, "INVALID_BITFIELD" }, { 0x0003, "INVALID_BITFIELD" },
...@@ -80,12 +75,12 @@ static const struct nouveau_enum nva3_ce_isr_error_name[] = { ...@@ -80,12 +75,12 @@ static const struct nouveau_enum nva3_ce_isr_error_name[] = {
}; };
void void
nva3_ce_intr(struct nouveau_subdev *subdev) gt215_ce_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_falcon *falcon = (void *)subdev; struct nvkm_falcon *falcon = (void *)subdev;
struct nouveau_object *engctx; struct nvkm_object *engctx;
u32 dispatch = nv_ro32(falcon, 0x01c); u32 dispatch = nv_ro32(falcon, 0x01c);
u32 stat = nv_ro32(falcon, 0x008) & dispatch & ~(dispatch >> 16); u32 stat = nv_ro32(falcon, 0x008) & dispatch & ~(dispatch >> 16);
u64 inst = nv_ro32(falcon, 0x050) & 0x3fffffff; u64 inst = nv_ro32(falcon, 0x050) & 0x3fffffff;
...@@ -96,14 +91,14 @@ nva3_ce_intr(struct nouveau_subdev *subdev) ...@@ -96,14 +91,14 @@ nva3_ce_intr(struct nouveau_subdev *subdev)
u32 data = nv_ro32(falcon, 0x044); u32 data = nv_ro32(falcon, 0x044);
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 & 0x00000040) { if (stat & 0x00000040) {
nv_error(falcon, "DISPATCH_ERROR ["); nv_error(falcon, "DISPATCH_ERROR [");
nouveau_enum_print(nva3_ce_isr_error_name, ssta); nvkm_enum_print(gt215_ce_isr_error_name, ssta);
pr_cont("] ch %d [0x%010llx %s] subc %d mthd 0x%04x data 0x%08x\n", pr_cont("] ch %d [0x%010llx %s] subc %d mthd 0x%04x data 0x%08x\n",
chid, inst << 12, nouveau_client_name(engctx), subc, chid, inst << 12, nvkm_client_name(engctx), subc,
mthd, data); mthd, data);
nv_wo32(falcon, 0x004, 0x00000040); nv_wo32(falcon, 0x004, 0x00000040);
stat &= ~0x00000040; stat &= ~0x00000040;
...@@ -114,44 +109,44 @@ nva3_ce_intr(struct nouveau_subdev *subdev) ...@@ -114,44 +109,44 @@ nva3_ce_intr(struct nouveau_subdev *subdev)
nv_wo32(falcon, 0x004, stat); nv_wo32(falcon, 0x004, stat);
} }
nouveau_engctx_put(engctx); nvkm_engctx_put(engctx);
} }
static int static int
nva3_ce_ctor(struct nouveau_object *parent, struct nouveau_object *engine, gt215_ce_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)
{ {
bool enable = (nv_device(parent)->chipset != 0xaf); bool enable = (nv_device(parent)->chipset != 0xaf);
struct nva3_ce_priv *priv; struct gt215_ce_priv *priv;
int ret; int ret;
ret = nouveau_falcon_create(parent, engine, oclass, 0x104000, enable, ret = nvkm_falcon_create(parent, engine, oclass, 0x104000, enable,
"PCE0", "ce0", &priv); "PCE0", "ce0", &priv);
*pobject = nv_object(priv); *pobject = nv_object(priv);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00802000; nv_subdev(priv)->unit = 0x00802000;
nv_subdev(priv)->intr = nva3_ce_intr; nv_subdev(priv)->intr = gt215_ce_intr;
nv_engine(priv)->cclass = &nva3_ce_cclass; nv_engine(priv)->cclass = &gt215_ce_cclass;
nv_engine(priv)->sclass = nva3_ce_sclass; nv_engine(priv)->sclass = gt215_ce_sclass;
nv_falcon(priv)->code.data = nva3_pce_code; nv_falcon(priv)->code.data = gt215_pce_code;
nv_falcon(priv)->code.size = sizeof(nva3_pce_code); nv_falcon(priv)->code.size = sizeof(gt215_pce_code);
nv_falcon(priv)->data.data = nva3_pce_data; nv_falcon(priv)->data.data = gt215_pce_data;
nv_falcon(priv)->data.size = sizeof(nva3_pce_data); nv_falcon(priv)->data.size = sizeof(gt215_pce_data);
return 0; return 0;
} }
struct nouveau_oclass struct nvkm_oclass
nva3_ce_oclass = { gt215_ce_oclass = {
.handle = NV_ENGINE(CE0, 0xa3), .handle = NV_ENGINE(CE0, 0xa3),
.ofuncs = &(struct nouveau_ofuncs) { .ofuncs = &(struct nvkm_ofuncs) {
.ctor = nva3_ce_ctor, .ctor = gt215_ce_ctor,
.dtor = _nouveau_falcon_dtor, .dtor = _nvkm_falcon_dtor,
.init = _nouveau_falcon_init, .init = _nvkm_falcon_init,
.fini = _nouveau_falcon_fini, .fini = _nvkm_falcon_fini,
.rd32 = _nouveau_falcon_rd32, .rd32 = _nvkm_falcon_rd32,
.wr32 = _nouveau_falcon_wr32, .wr32 = _nvkm_falcon_wr32,
}, },
}; };
drivers/gpu/drm/nouveau/nvkm/engine/device/gm100.c
View file @ bd6c5cab
...@@ -88,11 +88,11 @@ gm100_identify(struct nouveau_device *device) ...@@ -88,11 +88,11 @@ gm100_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass; device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass;
device->oclass[NVDEV_ENGINE_GR ] = gm107_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = gm107_gr_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = gm107_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = gm107_disp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nve0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gk104_ce0_oclass;
#if 0 #if 0
device->oclass[NVDEV_ENGINE_CE1 ] = &nve0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gk104_ce1_oclass;
#endif #endif
device->oclass[NVDEV_ENGINE_CE2 ] = &nve0_ce2_oclass; device->oclass[NVDEV_ENGINE_CE2 ] = &gk104_ce2_oclass;
#if 0 #if 0
device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass;
......
drivers/gpu/drm/nouveau/nvkm/engine/device/nv50.c
View file @ bd6c5cab
...@@ -375,7 +375,7 @@ nv50_identify(struct nouveau_device *device) ...@@ -375,7 +375,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nv98_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nv98_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nv98_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nv98_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nva3_ce_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gt215_ce_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = nva3_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nva3_pm_oclass;
break; break;
...@@ -405,7 +405,7 @@ nv50_identify(struct nouveau_device *device) ...@@ -405,7 +405,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nv98_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nv98_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nv98_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nv98_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nva3_ce_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gt215_ce_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = nva3_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nva3_pm_oclass;
break; break;
...@@ -435,7 +435,7 @@ nv50_identify(struct nouveau_device *device) ...@@ -435,7 +435,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nv98_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nv98_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nv98_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nv98_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nva3_ce_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gt215_ce_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = nva3_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nva3_pm_oclass;
break; break;
...@@ -465,7 +465,7 @@ nv50_identify(struct nouveau_device *device) ...@@ -465,7 +465,7 @@ nv50_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nv98_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nv98_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nv98_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nv98_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nv98_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nva3_ce_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gt215_ce_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = nva3_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = nva3_pm_oclass;
break; break;
......
drivers/gpu/drm/nouveau/nvkm/engine/device/nvc0.c
View file @ bd6c5cab
...@@ -87,8 +87,8 @@ nvc0_identify(struct nouveau_device *device) ...@@ -87,8 +87,8 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nvc0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gf100_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nvc0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gf100_ce1_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass;
break; break;
...@@ -120,8 +120,8 @@ nvc0_identify(struct nouveau_device *device) ...@@ -120,8 +120,8 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nvc0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gf100_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nvc0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gf100_ce1_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass;
break; break;
...@@ -153,7 +153,7 @@ nvc0_identify(struct nouveau_device *device) ...@@ -153,7 +153,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nvc0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gf100_ce0_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass;
break; break;
...@@ -185,8 +185,8 @@ nvc0_identify(struct nouveau_device *device) ...@@ -185,8 +185,8 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nvc0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gf100_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nvc0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gf100_ce1_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass;
break; break;
...@@ -218,7 +218,7 @@ nvc0_identify(struct nouveau_device *device) ...@@ -218,7 +218,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nvc0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gf100_ce0_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass;
break; break;
...@@ -250,7 +250,7 @@ nvc0_identify(struct nouveau_device *device) ...@@ -250,7 +250,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nvc0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gf100_ce0_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass;
break; break;
...@@ -282,8 +282,8 @@ nvc0_identify(struct nouveau_device *device) ...@@ -282,8 +282,8 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nvc0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gf100_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nvc0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gf100_ce1_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nva3_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass;
break; break;
...@@ -315,7 +315,7 @@ nvc0_identify(struct nouveau_device *device) ...@@ -315,7 +315,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nvc0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gf100_ce0_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nvd0_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nvd0_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass;
break; break;
...@@ -345,7 +345,7 @@ nvc0_identify(struct nouveau_device *device) ...@@ -345,7 +345,7 @@ nvc0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nvc0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nvc0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nvc0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gf100_ce0_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nvd0_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nvd0_disp_oclass;
device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = &nvc0_pm_oclass;
break; break;
......
drivers/gpu/drm/nouveau/nvkm/engine/device/nve0.c
View file @ bd6c5cab
...@@ -85,9 +85,9 @@ nve0_identify(struct nouveau_device *device) ...@@ -85,9 +85,9 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass; device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass;
device->oclass[NVDEV_ENGINE_GR ] = nve4_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = nve4_gr_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nve0_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nve0_disp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nve0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gk104_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nve0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gk104_ce1_oclass;
device->oclass[NVDEV_ENGINE_CE2 ] = &nve0_ce2_oclass; device->oclass[NVDEV_ENGINE_CE2 ] = &gk104_ce2_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
...@@ -119,9 +119,9 @@ nve0_identify(struct nouveau_device *device) ...@@ -119,9 +119,9 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass; device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass;
device->oclass[NVDEV_ENGINE_GR ] = nve4_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = nve4_gr_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nve0_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nve0_disp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nve0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gk104_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nve0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gk104_ce1_oclass;
device->oclass[NVDEV_ENGINE_CE2 ] = &nve0_ce2_oclass; device->oclass[NVDEV_ENGINE_CE2 ] = &gk104_ce2_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
...@@ -153,9 +153,9 @@ nve0_identify(struct nouveau_device *device) ...@@ -153,9 +153,9 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass; device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass;
device->oclass[NVDEV_ENGINE_GR ] = nve4_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = nve4_gr_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nve0_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nve0_disp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nve0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gk104_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nve0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gk104_ce1_oclass;
device->oclass[NVDEV_ENGINE_CE2 ] = &nve0_ce2_oclass; device->oclass[NVDEV_ENGINE_CE2 ] = &gk104_ce2_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
...@@ -178,7 +178,7 @@ nve0_identify(struct nouveau_device *device) ...@@ -178,7 +178,7 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_FIFO ] = gk20a_fifo_oclass; device->oclass[NVDEV_ENGINE_FIFO ] = gk20a_fifo_oclass;
device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass; device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass;
device->oclass[NVDEV_ENGINE_GR ] = gk20a_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = gk20a_gr_oclass;
device->oclass[NVDEV_ENGINE_CE2 ] = &nve0_ce2_oclass; device->oclass[NVDEV_ENGINE_CE2 ] = &gk104_ce2_oclass;
device->oclass[NVDEV_ENGINE_PM ] = &nve0_pm_oclass; device->oclass[NVDEV_ENGINE_PM ] = &nve0_pm_oclass;
device->oclass[NVDEV_SUBDEV_VOLT ] = &gk20a_volt_oclass; device->oclass[NVDEV_SUBDEV_VOLT ] = &gk20a_volt_oclass;
device->oclass[NVDEV_SUBDEV_PMU ] = gk20a_pmu_oclass; device->oclass[NVDEV_SUBDEV_PMU ] = gk20a_pmu_oclass;
...@@ -209,9 +209,9 @@ nve0_identify(struct nouveau_device *device) ...@@ -209,9 +209,9 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass; device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass;
device->oclass[NVDEV_ENGINE_GR ] = nvf0_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = nvf0_gr_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nvf0_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nvf0_disp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nve0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gk104_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nve0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gk104_ce1_oclass;
device->oclass[NVDEV_ENGINE_CE2 ] = &nve0_ce2_oclass; device->oclass[NVDEV_ENGINE_CE2 ] = &gk104_ce2_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
...@@ -243,9 +243,9 @@ nve0_identify(struct nouveau_device *device) ...@@ -243,9 +243,9 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass; device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass;
device->oclass[NVDEV_ENGINE_GR ] = gk110b_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = gk110b_gr_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nvf0_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nvf0_disp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nve0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gk104_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nve0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gk104_ce1_oclass;
device->oclass[NVDEV_ENGINE_CE2 ] = &nve0_ce2_oclass; device->oclass[NVDEV_ENGINE_CE2 ] = &gk104_ce2_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
...@@ -277,9 +277,9 @@ nve0_identify(struct nouveau_device *device) ...@@ -277,9 +277,9 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass; device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass;
device->oclass[NVDEV_ENGINE_GR ] = nv108_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = nv108_gr_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nvf0_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nvf0_disp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nve0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gk104_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nve0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gk104_ce1_oclass;
device->oclass[NVDEV_ENGINE_CE2 ] = &nve0_ce2_oclass; device->oclass[NVDEV_ENGINE_CE2 ] = &gk104_ce2_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass;
...@@ -310,9 +310,9 @@ nve0_identify(struct nouveau_device *device) ...@@ -310,9 +310,9 @@ nve0_identify(struct nouveau_device *device)
device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass; device->oclass[NVDEV_ENGINE_SW ] = nvc0_sw_oclass;
device->oclass[NVDEV_ENGINE_GR ] = nv108_gr_oclass; device->oclass[NVDEV_ENGINE_GR ] = nv108_gr_oclass;
device->oclass[NVDEV_ENGINE_DISP ] = nvf0_disp_oclass; device->oclass[NVDEV_ENGINE_DISP ] = nvf0_disp_oclass;
device->oclass[NVDEV_ENGINE_CE0 ] = &nve0_ce0_oclass; device->oclass[NVDEV_ENGINE_CE0 ] = &gk104_ce0_oclass;
device->oclass[NVDEV_ENGINE_CE1 ] = &nve0_ce1_oclass; device->oclass[NVDEV_ENGINE_CE1 ] = &gk104_ce1_oclass;
device->oclass[NVDEV_ENGINE_CE2 ] = &nve0_ce2_oclass; device->oclass[NVDEV_ENGINE_CE2 ] = &gk104_ce2_oclass;
device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass; device->oclass[NVDEV_ENGINE_MSVLD ] = &nve0_msvld_oclass;
device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass; device->oclass[NVDEV_ENGINE_MSPDEC ] = &nve0_mspdec_oclass;
device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_oclass; device->oclass[NVDEV_ENGINE_MSPPP ] = &nvc0_msppp_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