Skip to content

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

drm/nouveau/gr: cosmetic changes 

This is purely preparation for upcoming commits, there should be no
code changes here.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 6189f1b0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2092 additions and 2095 deletions
drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h
View file @ bfee3f3d
...@@ -24,7 +24,7 @@ struct nvkm_gr_chan { ...@@ -24,7 +24,7 @@ struct nvkm_gr_chan {
#include <core/engine.h> #include <core/engine.h>
struct nvkm_gr { struct nvkm_gr {
struct nvkm_engine base; struct nvkm_engine engine;
/* Returns chipset-specific counts of units packed into an u64. /* Returns chipset-specific counts of units packed into an u64.
*/ */
...@@ -40,11 +40,11 @@ nvkm_gr(void *obj) ...@@ -40,11 +40,11 @@ nvkm_gr(void *obj)
#define nvkm_gr_create(p,e,c,y,d) \ #define nvkm_gr_create(p,e,c,y,d) \
nvkm_engine_create((p), (e), (c), (y), "PGRAPH", "graphics", (d)) nvkm_engine_create((p), (e), (c), (y), "PGRAPH", "graphics", (d))
#define nvkm_gr_destroy(d) \ #define nvkm_gr_destroy(d) \
nvkm_engine_destroy(&(d)->base) nvkm_engine_destroy(&(d)->engine)
#define nvkm_gr_init(d) \ #define nvkm_gr_init(d) \
nvkm_engine_init(&(d)->base) nvkm_engine_init(&(d)->engine)
#define nvkm_gr_fini(d,s) \ #define nvkm_gr_fini(d,s) \
nvkm_engine_fini(&(d)->base, (s)) nvkm_engine_fini(&(d)->engine, (s))
#define _nvkm_gr_dtor _nvkm_engine_dtor #define _nvkm_gr_dtor _nvkm_engine_dtor
#define _nvkm_gr_init _nvkm_engine_init #define _nvkm_gr_init _nvkm_engine_init
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild
View file @ bfee3f3d
nvkm-y += nvkm/engine/gr/ctxnv40.o
nvkm-y += nvkm/engine/gr/ctxnv50.o
nvkm-y += nvkm/engine/gr/ctxgf100.o
nvkm-y += nvkm/engine/gr/ctxgf108.o
nvkm-y += nvkm/engine/gr/ctxgf104.o
nvkm-y += nvkm/engine/gr/ctxgf110.o
nvkm-y += nvkm/engine/gr/ctxgf117.o
nvkm-y += nvkm/engine/gr/ctxgf119.o
nvkm-y += nvkm/engine/gr/ctxgk104.o
nvkm-y += nvkm/engine/gr/ctxgk20a.o
nvkm-y += nvkm/engine/gr/ctxgk110.o
nvkm-y += nvkm/engine/gr/ctxgk110b.o
nvkm-y += nvkm/engine/gr/ctxgk208.o
nvkm-y += nvkm/engine/gr/ctxgm107.o
nvkm-y += nvkm/engine/gr/ctxgm204.o
nvkm-y += nvkm/engine/gr/ctxgm206.o
nvkm-y += nvkm/engine/gr/ctxgm20b.o
nvkm-y += nvkm/engine/gr/nv04.o nvkm-y += nvkm/engine/gr/nv04.o
nvkm-y += nvkm/engine/gr/nv10.o nvkm-y += nvkm/engine/gr/nv10.o
nvkm-y += nvkm/engine/gr/nv20.o nvkm-y += nvkm/engine/gr/nv20.o
...@@ -40,3 +23,21 @@ nvkm-y += nvkm/engine/gr/gm107.o ...@@ -40,3 +23,21 @@ nvkm-y += nvkm/engine/gr/gm107.o
nvkm-y += nvkm/engine/gr/gm204.o nvkm-y += nvkm/engine/gr/gm204.o
nvkm-y += nvkm/engine/gr/gm206.o nvkm-y += nvkm/engine/gr/gm206.o
nvkm-y += nvkm/engine/gr/gm20b.o nvkm-y += nvkm/engine/gr/gm20b.o
nvkm-y += nvkm/engine/gr/ctxnv40.o
nvkm-y += nvkm/engine/gr/ctxnv50.o
nvkm-y += nvkm/engine/gr/ctxgf100.o
nvkm-y += nvkm/engine/gr/ctxgf108.o
nvkm-y += nvkm/engine/gr/ctxgf104.o
nvkm-y += nvkm/engine/gr/ctxgf110.o
nvkm-y += nvkm/engine/gr/ctxgf117.o
nvkm-y += nvkm/engine/gr/ctxgf119.o
nvkm-y += nvkm/engine/gr/ctxgk104.o
nvkm-y += nvkm/engine/gr/ctxgk20a.o
nvkm-y += nvkm/engine/gr/ctxgk110.o
nvkm-y += nvkm/engine/gr/ctxgk110b.o
nvkm-y += nvkm/engine/gr/ctxgk208.o
nvkm-y += nvkm/engine/gr/ctxgm107.o
nvkm-y += nvkm/engine/gr/ctxgm204.o
nvkm-y += nvkm/engine/gr/ctxgm206.o
nvkm-y += nvkm/engine/gr/ctxgm20b.o
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
View file @ bfee3f3d
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "gf100.h" #include "gf100.h"
struct gf100_grctx { struct gf100_grctx {
struct gf100_gr_priv *priv; struct gf100_gr *gr;
struct gf100_gr_data *data; struct gf100_gr_data *data;
struct gf100_gr_mmio *mmio; struct gf100_gr_mmio *mmio;
int buffer_nr; int buffer_nr;
...@@ -22,9 +22,9 @@ void gf100_grctx_mmio_item(struct gf100_grctx *, u32 addr, u32 data, int s, int) ...@@ -22,9 +22,9 @@ void gf100_grctx_mmio_item(struct gf100_grctx *, u32 addr, u32 data, int s, int)
struct gf100_grctx_oclass { struct gf100_grctx_oclass {
struct nvkm_oclass base; struct nvkm_oclass base;
/* main context generation function */ /* main context generation function */
void (*main)(struct gf100_gr_priv *, struct gf100_grctx *); void (*main)(struct gf100_gr *, struct gf100_grctx *);
/* context-specific modify-on-first-load list generation function */ /* context-specific modify-on-first-load list generation function */
void (*unkn)(struct gf100_gr_priv *); void (*unkn)(struct gf100_gr *);
/* mmio context data */ /* mmio context data */
const struct gf100_gr_pack *hub; const struct gf100_gr_pack *hub;
const struct gf100_gr_pack *gpc; const struct gf100_gr_pack *gpc;
...@@ -51,27 +51,27 @@ struct gf100_grctx_oclass { ...@@ -51,27 +51,27 @@ struct gf100_grctx_oclass {
}; };
static inline const struct gf100_grctx_oclass * static inline const struct gf100_grctx_oclass *
gf100_grctx_impl(struct gf100_gr_priv *priv) gf100_grctx_impl(struct gf100_gr *gr)
{ {
return (void *)nv_engine(priv)->cclass; return (void *)nv_engine(gr)->cclass;
} }
extern struct nvkm_oclass *gf100_grctx_oclass; extern struct nvkm_oclass *gf100_grctx_oclass;
int gf100_grctx_generate(struct gf100_gr_priv *); int gf100_grctx_generate(struct gf100_gr *);
void gf100_grctx_generate_main(struct gf100_gr_priv *, struct gf100_grctx *); void gf100_grctx_generate_main(struct gf100_gr *, struct gf100_grctx *);
void gf100_grctx_generate_bundle(struct gf100_grctx *); void gf100_grctx_generate_bundle(struct gf100_grctx *);
void gf100_grctx_generate_pagepool(struct gf100_grctx *); void gf100_grctx_generate_pagepool(struct gf100_grctx *);
void gf100_grctx_generate_attrib(struct gf100_grctx *); void gf100_grctx_generate_attrib(struct gf100_grctx *);
void gf100_grctx_generate_unkn(struct gf100_gr_priv *); void gf100_grctx_generate_unkn(struct gf100_gr *);
void gf100_grctx_generate_tpcid(struct gf100_gr_priv *); void gf100_grctx_generate_tpcid(struct gf100_gr *);
void gf100_grctx_generate_r406028(struct gf100_gr_priv *); void gf100_grctx_generate_r406028(struct gf100_gr *);
void gf100_grctx_generate_r4060a8(struct gf100_gr_priv *); void gf100_grctx_generate_r4060a8(struct gf100_gr *);
void gf100_grctx_generate_r418bb8(struct gf100_gr_priv *); void gf100_grctx_generate_r418bb8(struct gf100_gr *);
void gf100_grctx_generate_r406800(struct gf100_gr_priv *); void gf100_grctx_generate_r406800(struct gf100_gr *);
extern struct nvkm_oclass *gf108_grctx_oclass; extern struct nvkm_oclass *gf108_grctx_oclass;
void gf108_grctx_generate_attrib(struct gf100_grctx *); void gf108_grctx_generate_attrib(struct gf100_grctx *);
void gf108_grctx_generate_unkn(struct gf100_gr_priv *); void gf108_grctx_generate_unkn(struct gf100_gr *);
extern struct nvkm_oclass *gf104_grctx_oclass; extern struct nvkm_oclass *gf104_grctx_oclass;
extern struct nvkm_oclass *gf110_grctx_oclass; extern struct nvkm_oclass *gf110_grctx_oclass;
...@@ -83,12 +83,12 @@ extern struct nvkm_oclass *gf119_grctx_oclass; ...@@ -83,12 +83,12 @@ extern struct nvkm_oclass *gf119_grctx_oclass;
extern struct nvkm_oclass *gk104_grctx_oclass; extern struct nvkm_oclass *gk104_grctx_oclass;
extern struct nvkm_oclass *gk20a_grctx_oclass; extern struct nvkm_oclass *gk20a_grctx_oclass;
void gk104_grctx_generate_main(struct gf100_gr_priv *, struct gf100_grctx *); void gk104_grctx_generate_main(struct gf100_gr *, struct gf100_grctx *);
void gk104_grctx_generate_bundle(struct gf100_grctx *); void gk104_grctx_generate_bundle(struct gf100_grctx *);
void gk104_grctx_generate_pagepool(struct gf100_grctx *); void gk104_grctx_generate_pagepool(struct gf100_grctx *);
void gk104_grctx_generate_unkn(struct gf100_gr_priv *); void gk104_grctx_generate_unkn(struct gf100_gr *);
void gk104_grctx_generate_r418bb8(struct gf100_gr_priv *); void gk104_grctx_generate_r418bb8(struct gf100_gr *);
void gk104_grctx_generate_rop_active_fbps(struct gf100_gr_priv *); void gk104_grctx_generate_rop_active_fbps(struct gf100_gr *);
void gm107_grctx_generate_bundle(struct gf100_grctx *); void gm107_grctx_generate_bundle(struct gf100_grctx *);
...@@ -105,9 +105,9 @@ void gm107_grctx_generate_pagepool(struct gf100_grctx *); ...@@ -105,9 +105,9 @@ void gm107_grctx_generate_pagepool(struct gf100_grctx *);
void gm107_grctx_generate_attrib(struct gf100_grctx *); void gm107_grctx_generate_attrib(struct gf100_grctx *);
extern struct nvkm_oclass *gm204_grctx_oclass; extern struct nvkm_oclass *gm204_grctx_oclass;
void gm204_grctx_generate_main(struct gf100_gr_priv *, struct gf100_grctx *); void gm204_grctx_generate_main(struct gf100_gr *, struct gf100_grctx *);
void gm204_grctx_generate_tpcid(struct gf100_gr_priv *); void gm204_grctx_generate_tpcid(struct gf100_gr *);
void gm204_grctx_generate_405b60(struct gf100_gr_priv *); void gm204_grctx_generate_405b60(struct gf100_gr *);
extern struct nvkm_oclass *gm206_grctx_oclass; extern struct nvkm_oclass *gm206_grctx_oclass;
extern struct nvkm_oclass *gm20b_grctx_oclass; extern struct nvkm_oclass *gm20b_grctx_oclass;
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c
View file @ bfee3f3d
...@@ -730,18 +730,18 @@ gf108_grctx_pack_tpc[] = { ...@@ -730,18 +730,18 @@ gf108_grctx_pack_tpc[] = {
void void
gf108_grctx_generate_attrib(struct gf100_grctx *info) gf108_grctx_generate_attrib(struct gf100_grctx *info)
{ {
struct gf100_gr_priv *priv = info->priv; struct gf100_gr *gr = info->gr;
const struct gf100_grctx_oclass *impl = gf100_grctx_impl(priv); const struct gf100_grctx_oclass *impl = gf100_grctx_impl(gr);
const u32 alpha = impl->alpha_nr; const u32 alpha = impl->alpha_nr;
const u32 beta = impl->attrib_nr; const u32 beta = impl->attrib_nr;
const u32 size = 0x20 * (impl->attrib_nr_max + impl->alpha_nr_max); const u32 size = 0x20 * (impl->attrib_nr_max + impl->alpha_nr_max);
const u32 access = NV_MEM_ACCESS_RW; const u32 access = NV_MEM_ACCESS_RW;
const int s = 12; const int s = 12;
const int b = mmio_vram(info, size * priv->tpc_total, (1 << s), access); const int b = mmio_vram(info, size * gr->tpc_total, (1 << s), access);
const int timeslice_mode = 1; const int timeslice_mode = 1;
const int max_batches = 0xffff; const int max_batches = 0xffff;
u32 bo = 0; u32 bo = 0;
u32 ao = bo + impl->attrib_nr_max * priv->tpc_total; u32 ao = bo + impl->attrib_nr_max * gr->tpc_total;
int gpc, tpc; int gpc, tpc;
mmio_refn(info, 0x418810, 0x80000000, s, b); mmio_refn(info, 0x418810, 0x80000000, s, b);
...@@ -749,8 +749,8 @@ gf108_grctx_generate_attrib(struct gf100_grctx *info) ...@@ -749,8 +749,8 @@ gf108_grctx_generate_attrib(struct gf100_grctx *info)
mmio_wr32(info, 0x405830, (beta << 16) | alpha); mmio_wr32(info, 0x405830, (beta << 16) | alpha);
mmio_wr32(info, 0x4064c4, ((alpha / 4) << 16) | max_batches); mmio_wr32(info, 0x4064c4, ((alpha / 4) << 16) | max_batches);
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
for (tpc = 0; tpc < priv->tpc_nr[gpc]; tpc++) { for (tpc = 0; tpc < gr->tpc_nr[gpc]; tpc++) {
const u32 a = alpha; const u32 a = alpha;
const u32 b = beta; const u32 b = beta;
const u32 t = timeslice_mode; const u32 t = timeslice_mode;
...@@ -765,14 +765,14 @@ gf108_grctx_generate_attrib(struct gf100_grctx *info) ...@@ -765,14 +765,14 @@ gf108_grctx_generate_attrib(struct gf100_grctx *info)
} }
void void
gf108_grctx_generate_unkn(struct gf100_gr_priv *priv) gf108_grctx_generate_unkn(struct gf100_gr *gr)
{ {
nv_mask(priv, 0x418c6c, 0x00000001, 0x00000001); nv_mask(gr, 0x418c6c, 0x00000001, 0x00000001);
nv_mask(priv, 0x41980c, 0x00000010, 0x00000010); nv_mask(gr, 0x41980c, 0x00000010, 0x00000010);
nv_mask(priv, 0x419814, 0x00000004, 0x00000004); nv_mask(gr, 0x419814, 0x00000004, 0x00000004);
nv_mask(priv, 0x4064c0, 0x80000000, 0x80000000); nv_mask(gr, 0x4064c0, 0x80000000, 0x80000000);
nv_mask(priv, 0x405800, 0x08000000, 0x08000000); nv_mask(gr, 0x405800, 0x08000000, 0x08000000);
nv_mask(priv, 0x419c00, 0x00000008, 0x00000008); nv_mask(gr, 0x419c00, 0x00000008, 0x00000008);
} }
struct nvkm_oclass * struct nvkm_oclass *
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c
View file @ bfee3f3d
...@@ -182,18 +182,18 @@ gf117_grctx_pack_ppc[] = { ...@@ -182,18 +182,18 @@ gf117_grctx_pack_ppc[] = {
void void
gf117_grctx_generate_attrib(struct gf100_grctx *info) gf117_grctx_generate_attrib(struct gf100_grctx *info)
{ {
struct gf100_gr_priv *priv = info->priv; struct gf100_gr *gr = info->gr;
const struct gf100_grctx_oclass *impl = gf100_grctx_impl(priv); const struct gf100_grctx_oclass *impl = gf100_grctx_impl(gr);
const u32 alpha = impl->alpha_nr; const u32 alpha = impl->alpha_nr;
const u32 beta = impl->attrib_nr; const u32 beta = impl->attrib_nr;
const u32 size = 0x20 * (impl->attrib_nr_max + impl->alpha_nr_max); const u32 size = 0x20 * (impl->attrib_nr_max + impl->alpha_nr_max);
const u32 access = NV_MEM_ACCESS_RW; const u32 access = NV_MEM_ACCESS_RW;
const int s = 12; const int s = 12;
const int b = mmio_vram(info, size * priv->tpc_total, (1 << s), access); const int b = mmio_vram(info, size * gr->tpc_total, (1 << s), access);
const int timeslice_mode = 1; const int timeslice_mode = 1;
const int max_batches = 0xffff; const int max_batches = 0xffff;
u32 bo = 0; u32 bo = 0;
u32 ao = bo + impl->attrib_nr_max * priv->tpc_total; u32 ao = bo + impl->attrib_nr_max * gr->tpc_total;
int gpc, ppc; int gpc, ppc;
mmio_refn(info, 0x418810, 0x80000000, s, b); mmio_refn(info, 0x418810, 0x80000000, s, b);
...@@ -201,55 +201,55 @@ gf117_grctx_generate_attrib(struct gf100_grctx *info) ...@@ -201,55 +201,55 @@ gf117_grctx_generate_attrib(struct gf100_grctx *info)
mmio_wr32(info, 0x405830, (beta << 16) | alpha); mmio_wr32(info, 0x405830, (beta << 16) | alpha);
mmio_wr32(info, 0x4064c4, ((alpha / 4) << 16) | max_batches); mmio_wr32(info, 0x4064c4, ((alpha / 4) << 16) | max_batches);
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
for (ppc = 0; ppc < priv->ppc_nr[gpc]; ppc++) { for (ppc = 0; ppc < gr->ppc_nr[gpc]; ppc++) {
const u32 a = alpha * priv->ppc_tpc_nr[gpc][ppc]; const u32 a = alpha * gr->ppc_tpc_nr[gpc][ppc];
const u32 b = beta * priv->ppc_tpc_nr[gpc][ppc]; const u32 b = beta * gr->ppc_tpc_nr[gpc][ppc];
const u32 t = timeslice_mode; const u32 t = timeslice_mode;
const u32 o = PPC_UNIT(gpc, ppc, 0); const u32 o = PPC_UNIT(gpc, ppc, 0);
mmio_skip(info, o + 0xc0, (t << 28) | (b << 16) | ++bo); mmio_skip(info, o + 0xc0, (t << 28) | (b << 16) | ++bo);
mmio_wr32(info, o + 0xc0, (t << 28) | (b << 16) | --bo); mmio_wr32(info, o + 0xc0, (t << 28) | (b << 16) | --bo);
bo += impl->attrib_nr_max * priv->ppc_tpc_nr[gpc][ppc]; bo += impl->attrib_nr_max * gr->ppc_tpc_nr[gpc][ppc];
mmio_wr32(info, o + 0xe4, (a << 16) | ao); mmio_wr32(info, o + 0xe4, (a << 16) | ao);
ao += impl->alpha_nr_max * priv->ppc_tpc_nr[gpc][ppc]; ao += impl->alpha_nr_max * gr->ppc_tpc_nr[gpc][ppc];
} }
} }
} }
void void
gf117_grctx_generate_main(struct gf100_gr_priv *priv, struct gf100_grctx *info) gf117_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{ {
struct gf100_grctx_oclass *oclass = (void *)nv_engine(priv)->cclass; struct gf100_grctx_oclass *oclass = (void *)nv_engine(gr)->cclass;
int i; int i;
nvkm_mc(priv)->unk260(nvkm_mc(priv), 0); nvkm_mc(gr)->unk260(nvkm_mc(gr), 0);
gf100_gr_mmio(priv, oclass->hub); gf100_gr_mmio(gr, oclass->hub);
gf100_gr_mmio(priv, oclass->gpc); gf100_gr_mmio(gr, oclass->gpc);
gf100_gr_mmio(priv, oclass->zcull); gf100_gr_mmio(gr, oclass->zcull);
gf100_gr_mmio(priv, oclass->tpc); gf100_gr_mmio(gr, oclass->tpc);
gf100_gr_mmio(priv, oclass->ppc); gf100_gr_mmio(gr, oclass->ppc);
nv_wr32(priv, 0x404154, 0x00000000); nv_wr32(gr, 0x404154, 0x00000000);
oclass->bundle(info); oclass->bundle(info);
oclass->pagepool(info); oclass->pagepool(info);
oclass->attrib(info); oclass->attrib(info);
oclass->unkn(priv); oclass->unkn(gr);
gf100_grctx_generate_tpcid(priv); gf100_grctx_generate_tpcid(gr);
gf100_grctx_generate_r406028(priv); gf100_grctx_generate_r406028(gr);
gf100_grctx_generate_r4060a8(priv); gf100_grctx_generate_r4060a8(gr);
gk104_grctx_generate_r418bb8(priv); gk104_grctx_generate_r418bb8(gr);
gf100_grctx_generate_r406800(priv); gf100_grctx_generate_r406800(gr);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
nv_wr32(priv, 0x4064d0 + (i * 0x04), 0x00000000); nv_wr32(gr, 0x4064d0 + (i * 0x04), 0x00000000);
gf100_gr_icmd(priv, oclass->icmd); gf100_gr_icmd(gr, oclass->icmd);
nv_wr32(priv, 0x404154, 0x00000400); nv_wr32(gr, 0x404154, 0x00000400);
gf100_gr_mthd(priv, oclass->mthd); gf100_gr_mthd(gr, oclass->mthd);
nvkm_mc(priv)->unk260(nvkm_mc(priv), 1); nvkm_mc(gr)->unk260(nvkm_mc(gr), 1);
} }
struct nvkm_oclass * struct nvkm_oclass *
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c
View file @ bfee3f3d
...@@ -843,7 +843,7 @@ gk104_grctx_pack_ppc[] = { ...@@ -843,7 +843,7 @@ gk104_grctx_pack_ppc[] = {
void void
gk104_grctx_generate_bundle(struct gf100_grctx *info) gk104_grctx_generate_bundle(struct gf100_grctx *info)
{ {
const struct gf100_grctx_oclass *impl = gf100_grctx_impl(info->priv); const struct gf100_grctx_oclass *impl = gf100_grctx_impl(info->gr);
const u32 state_limit = min(impl->bundle_min_gpm_fifo_depth, const u32 state_limit = min(impl->bundle_min_gpm_fifo_depth,
impl->bundle_size / 0x20); impl->bundle_size / 0x20);
const u32 token_limit = impl->bundle_token_limit; const u32 token_limit = impl->bundle_token_limit;
...@@ -860,7 +860,7 @@ gk104_grctx_generate_bundle(struct gf100_grctx *info) ...@@ -860,7 +860,7 @@ gk104_grctx_generate_bundle(struct gf100_grctx *info)
void void
gk104_grctx_generate_pagepool(struct gf100_grctx *info) gk104_grctx_generate_pagepool(struct gf100_grctx *info)
{ {
const struct gf100_grctx_oclass *impl = gf100_grctx_impl(info->priv); const struct gf100_grctx_oclass *impl = gf100_grctx_impl(info->gr);
const u32 access = NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS; const u32 access = NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS;
const int s = 8; const int s = 8;
const int b = mmio_vram(info, impl->pagepool_size, (1 << s), access); const int b = mmio_vram(info, impl->pagepool_size, (1 << s), access);
...@@ -872,18 +872,18 @@ gk104_grctx_generate_pagepool(struct gf100_grctx *info) ...@@ -872,18 +872,18 @@ gk104_grctx_generate_pagepool(struct gf100_grctx *info)
} }
void void
gk104_grctx_generate_unkn(struct gf100_gr_priv *priv) gk104_grctx_generate_unkn(struct gf100_gr *gr)
{ {
nv_mask(priv, 0x418c6c, 0x00000001, 0x00000001); nv_mask(gr, 0x418c6c, 0x00000001, 0x00000001);
nv_mask(priv, 0x41980c, 0x00000010, 0x00000010); nv_mask(gr, 0x41980c, 0x00000010, 0x00000010);
nv_mask(priv, 0x41be08, 0x00000004, 0x00000004); nv_mask(gr, 0x41be08, 0x00000004, 0x00000004);
nv_mask(priv, 0x4064c0, 0x80000000, 0x80000000); nv_mask(gr, 0x4064c0, 0x80000000, 0x80000000);
nv_mask(priv, 0x405800, 0x08000000, 0x08000000); nv_mask(gr, 0x405800, 0x08000000, 0x08000000);
nv_mask(priv, 0x419c00, 0x00000008, 0x00000008); nv_mask(gr, 0x419c00, 0x00000008, 0x00000008);
} }
void void
gk104_grctx_generate_r418bb8(struct gf100_gr_priv *priv) gk104_grctx_generate_r418bb8(struct gf100_gr *gr)
{ {
u32 data[6] = {}, data2[2] = {}; u32 data[6] = {}, data2[2] = {};
u8 tpcnr[GPC_MAX]; u8 tpcnr[GPC_MAX];
...@@ -891,12 +891,12 @@ gk104_grctx_generate_r418bb8(struct gf100_gr_priv *priv) ...@@ -891,12 +891,12 @@ gk104_grctx_generate_r418bb8(struct gf100_gr_priv *priv)
int gpc, tpc, i; int gpc, tpc, i;
/* calculate first set of magics */ /* calculate first set of magics */
memcpy(tpcnr, priv->tpc_nr, sizeof(priv->tpc_nr)); memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
gpc = -1; gpc = -1;
for (tpc = 0; tpc < priv->tpc_total; tpc++) { for (tpc = 0; tpc < gr->tpc_total; tpc++) {
do { do {
gpc = (gpc + 1) % priv->gpc_nr; gpc = (gpc + 1) % gr->gpc_nr;
} while (!tpcnr[gpc]); } while (!tpcnr[gpc]);
tpcnr[gpc]--; tpcnr[gpc]--;
...@@ -908,7 +908,7 @@ gk104_grctx_generate_r418bb8(struct gf100_gr_priv *priv) ...@@ -908,7 +908,7 @@ gk104_grctx_generate_r418bb8(struct gf100_gr_priv *priv)
/* and the second... */ /* and the second... */
shift = 0; shift = 0;
ntpcv = priv->tpc_total; ntpcv = gr->tpc_total;
while (!(ntpcv & (1 << 4))) { while (!(ntpcv & (1 << 4))) {
ntpcv <<= 1; ntpcv <<= 1;
shift++; shift++;
...@@ -921,73 +921,73 @@ gk104_grctx_generate_r418bb8(struct gf100_gr_priv *priv) ...@@ -921,73 +921,73 @@ gk104_grctx_generate_r418bb8(struct gf100_gr_priv *priv)
data2[1] |= ((1 << (i + 5)) % ntpcv) << ((i - 1) * 5); data2[1] |= ((1 << (i + 5)) % ntpcv) << ((i - 1) * 5);
/* GPC_BROADCAST */ /* GPC_BROADCAST */
nv_wr32(priv, 0x418bb8, (priv->tpc_total << 8) | nv_wr32(gr, 0x418bb8, (gr->tpc_total << 8) |
priv->magic_not_rop_nr); gr->magic_not_rop_nr);
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
nv_wr32(priv, 0x418b08 + (i * 4), data[i]); nv_wr32(gr, 0x418b08 + (i * 4), data[i]);
/* GPC_BROADCAST.TP_BROADCAST */ /* GPC_BROADCAST.TP_BROADCAST */
nv_wr32(priv, 0x41bfd0, (priv->tpc_total << 8) | nv_wr32(gr, 0x41bfd0, (gr->tpc_total << 8) |
priv->magic_not_rop_nr | data2[0]); gr->magic_not_rop_nr | data2[0]);
nv_wr32(priv, 0x41bfe4, data2[1]); nv_wr32(gr, 0x41bfe4, data2[1]);
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
nv_wr32(priv, 0x41bf00 + (i * 4), data[i]); nv_wr32(gr, 0x41bf00 + (i * 4), data[i]);
/* UNK78xx */ /* UNK78xx */
nv_wr32(priv, 0x4078bc, (priv->tpc_total << 8) | nv_wr32(gr, 0x4078bc, (gr->tpc_total << 8) |
priv->magic_not_rop_nr); gr->magic_not_rop_nr);
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
nv_wr32(priv, 0x40780c + (i * 4), data[i]); nv_wr32(gr, 0x40780c + (i * 4), data[i]);
} }
void void
gk104_grctx_generate_rop_active_fbps(struct gf100_gr_priv *priv) gk104_grctx_generate_rop_active_fbps(struct gf100_gr *gr)
{ {
const u32 fbp_count = nv_rd32(priv, 0x120074); const u32 fbp_count = nv_rd32(gr, 0x120074);
nv_mask(priv, 0x408850, 0x0000000f, fbp_count); /* zrop */ nv_mask(gr, 0x408850, 0x0000000f, fbp_count); /* zrop */
nv_mask(priv, 0x408958, 0x0000000f, fbp_count); /* crop */ nv_mask(gr, 0x408958, 0x0000000f, fbp_count); /* crop */
} }
void void
gk104_grctx_generate_main(struct gf100_gr_priv *priv, struct gf100_grctx *info) gk104_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{ {
struct gf100_grctx_oclass *oclass = (void *)nv_engine(priv)->cclass; struct gf100_grctx_oclass *oclass = (void *)nv_engine(gr)->cclass;
int i; int i;
nvkm_mc(priv)->unk260(nvkm_mc(priv), 0); nvkm_mc(gr)->unk260(nvkm_mc(gr), 0);
gf100_gr_mmio(priv, oclass->hub); gf100_gr_mmio(gr, oclass->hub);
gf100_gr_mmio(priv, oclass->gpc); gf100_gr_mmio(gr, oclass->gpc);
gf100_gr_mmio(priv, oclass->zcull); gf100_gr_mmio(gr, oclass->zcull);
gf100_gr_mmio(priv, oclass->tpc); gf100_gr_mmio(gr, oclass->tpc);
gf100_gr_mmio(priv, oclass->ppc); gf100_gr_mmio(gr, oclass->ppc);
nv_wr32(priv, 0x404154, 0x00000000); nv_wr32(gr, 0x404154, 0x00000000);
oclass->bundle(info); oclass->bundle(info);
oclass->pagepool(info); oclass->pagepool(info);
oclass->attrib(info); oclass->attrib(info);
oclass->unkn(priv); oclass->unkn(gr);
gf100_grctx_generate_tpcid(priv); gf100_grctx_generate_tpcid(gr);
gf100_grctx_generate_r406028(priv); gf100_grctx_generate_r406028(gr);
gk104_grctx_generate_r418bb8(priv); gk104_grctx_generate_r418bb8(gr);
gf100_grctx_generate_r406800(priv); gf100_grctx_generate_r406800(gr);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
nv_wr32(priv, 0x4064d0 + (i * 0x04), 0x00000000); nv_wr32(gr, 0x4064d0 + (i * 0x04), 0x00000000);
nv_wr32(priv, 0x405b00, (priv->tpc_total << 8) | priv->gpc_nr); nv_wr32(gr, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);
gk104_grctx_generate_rop_active_fbps(priv); gk104_grctx_generate_rop_active_fbps(gr);
nv_mask(priv, 0x419f78, 0x00000001, 0x00000000); nv_mask(gr, 0x419f78, 0x00000001, 0x00000000);
gf100_gr_icmd(priv, oclass->icmd); gf100_gr_icmd(gr, oclass->icmd);
nv_wr32(priv, 0x404154, 0x00000400); nv_wr32(gr, 0x404154, 0x00000400);
gf100_gr_mthd(priv, oclass->mthd); gf100_gr_mthd(gr, oclass->mthd);
nvkm_mc(priv)->unk260(nvkm_mc(priv), 1); nvkm_mc(gr)->unk260(nvkm_mc(gr), 1);
nv_mask(priv, 0x418800, 0x00200000, 0x00200000); nv_mask(gr, 0x418800, 0x00200000, 0x00200000);
nv_mask(priv, 0x41be10, 0x00800000, 0x00800000); nv_mask(gr, 0x41be10, 0x00800000, 0x00800000);
} }
struct nvkm_oclass * struct nvkm_oclass *
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c
View file @ bfee3f3d
...@@ -26,46 +26,46 @@ ...@@ -26,46 +26,46 @@
#include <subdev/mc.h> #include <subdev/mc.h>
static void static void
gk20a_grctx_generate_main(struct gf100_gr_priv *priv, struct gf100_grctx *info) gk20a_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{ {
struct gf100_grctx_oclass *oclass = (void *)nv_engine(priv)->cclass; struct gf100_grctx_oclass *oclass = (void *)nv_engine(gr)->cclass;
int idle_timeout_save; int idle_timeout_save;
int i; int i;
gf100_gr_mmio(priv, priv->fuc_sw_ctx); gf100_gr_mmio(gr, gr->fuc_sw_ctx);
gf100_gr_wait_idle(priv); gf100_gr_wait_idle(gr);
idle_timeout_save = nv_rd32(priv, 0x404154); idle_timeout_save = nv_rd32(gr, 0x404154);
nv_wr32(priv, 0x404154, 0x00000000); nv_wr32(gr, 0x404154, 0x00000000);
oclass->attrib(info); oclass->attrib(info);
oclass->unkn(priv); oclass->unkn(gr);
gf100_grctx_generate_tpcid(priv); gf100_grctx_generate_tpcid(gr);
gf100_grctx_generate_r406028(priv); gf100_grctx_generate_r406028(gr);
gk104_grctx_generate_r418bb8(priv); gk104_grctx_generate_r418bb8(gr);
gf100_grctx_generate_r406800(priv); gf100_grctx_generate_r406800(gr);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
nv_wr32(priv, 0x4064d0 + (i * 0x04), 0x00000000); nv_wr32(gr, 0x4064d0 + (i * 0x04), 0x00000000);
nv_wr32(priv, 0x405b00, (priv->tpc_total << 8) | priv->gpc_nr); nv_wr32(gr, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);
gk104_grctx_generate_rop_active_fbps(priv); gk104_grctx_generate_rop_active_fbps(gr);
nv_mask(priv, 0x5044b0, 0x8000000, 0x8000000); nv_mask(gr, 0x5044b0, 0x8000000, 0x8000000);
gf100_gr_wait_idle(priv); gf100_gr_wait_idle(gr);
nv_wr32(priv, 0x404154, idle_timeout_save); nv_wr32(gr, 0x404154, idle_timeout_save);
gf100_gr_wait_idle(priv); gf100_gr_wait_idle(gr);
gf100_gr_mthd(priv, priv->fuc_method); gf100_gr_mthd(gr, gr->fuc_method);
gf100_gr_wait_idle(priv); gf100_gr_wait_idle(gr);
gf100_gr_icmd(priv, priv->fuc_bundle); gf100_gr_icmd(gr, gr->fuc_bundle);
oclass->pagepool(info); oclass->pagepool(info);
oclass->bundle(info); oclass->bundle(info);
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c
View file @ bfee3f3d
...@@ -863,7 +863,7 @@ gm107_grctx_pack_ppc[] = { ...@@ -863,7 +863,7 @@ gm107_grctx_pack_ppc[] = {
void void
gm107_grctx_generate_bundle(struct gf100_grctx *info) gm107_grctx_generate_bundle(struct gf100_grctx *info)
{ {
const struct gf100_grctx_oclass *impl = gf100_grctx_impl(info->priv); const struct gf100_grctx_oclass *impl = gf100_grctx_impl(info->gr);
const u32 state_limit = min(impl->bundle_min_gpm_fifo_depth, const u32 state_limit = min(impl->bundle_min_gpm_fifo_depth,
impl->bundle_size / 0x20); impl->bundle_size / 0x20);
const u32 token_limit = impl->bundle_token_limit; const u32 token_limit = impl->bundle_token_limit;
...@@ -880,7 +880,7 @@ gm107_grctx_generate_bundle(struct gf100_grctx *info) ...@@ -880,7 +880,7 @@ gm107_grctx_generate_bundle(struct gf100_grctx *info)
void void
gm107_grctx_generate_pagepool(struct gf100_grctx *info) gm107_grctx_generate_pagepool(struct gf100_grctx *info)
{ {
const struct gf100_grctx_oclass *impl = gf100_grctx_impl(info->priv); const struct gf100_grctx_oclass *impl = gf100_grctx_impl(info->gr);
const u32 access = NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS; const u32 access = NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS;
const int s = 8; const int s = 8;
const int b = mmio_vram(info, impl->pagepool_size, (1 << s), access); const int b = mmio_vram(info, impl->pagepool_size, (1 << s), access);
...@@ -895,17 +895,17 @@ gm107_grctx_generate_pagepool(struct gf100_grctx *info) ...@@ -895,17 +895,17 @@ gm107_grctx_generate_pagepool(struct gf100_grctx *info)
void void
gm107_grctx_generate_attrib(struct gf100_grctx *info) gm107_grctx_generate_attrib(struct gf100_grctx *info)
{ {
struct gf100_gr_priv *priv = info->priv; struct gf100_gr *gr = info->gr;
const struct gf100_grctx_oclass *impl = (void *)gf100_grctx_impl(priv); const struct gf100_grctx_oclass *impl = (void *)gf100_grctx_impl(gr);
const u32 alpha = impl->alpha_nr; const u32 alpha = impl->alpha_nr;
const u32 attrib = impl->attrib_nr; const u32 attrib = impl->attrib_nr;
const u32 size = 0x20 * (impl->attrib_nr_max + impl->alpha_nr_max); const u32 size = 0x20 * (impl->attrib_nr_max + impl->alpha_nr_max);
const u32 access = NV_MEM_ACCESS_RW; const u32 access = NV_MEM_ACCESS_RW;
const int s = 12; const int s = 12;
const int b = mmio_vram(info, size * priv->tpc_total, (1 << s), access); const int b = mmio_vram(info, size * gr->tpc_total, (1 << s), access);
const int max_batches = 0xffff; const int max_batches = 0xffff;
u32 bo = 0; u32 bo = 0;
u32 ao = bo + impl->attrib_nr_max * priv->tpc_total; u32 ao = bo + impl->attrib_nr_max * gr->tpc_total;
int gpc, ppc, n = 0; int gpc, ppc, n = 0;
mmio_refn(info, 0x418810, 0x80000000, s, b); mmio_refn(info, 0x418810, 0x80000000, s, b);
...@@ -914,84 +914,84 @@ gm107_grctx_generate_attrib(struct gf100_grctx *info) ...@@ -914,84 +914,84 @@ gm107_grctx_generate_attrib(struct gf100_grctx *info)
mmio_wr32(info, 0x405830, (attrib << 16) | alpha); mmio_wr32(info, 0x405830, (attrib << 16) | alpha);
mmio_wr32(info, 0x4064c4, ((alpha / 4) << 16) | max_batches); mmio_wr32(info, 0x4064c4, ((alpha / 4) << 16) | max_batches);
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
for (ppc = 0; ppc < priv->ppc_nr[gpc]; ppc++, n++) { for (ppc = 0; ppc < gr->ppc_nr[gpc]; ppc++, n++) {
const u32 as = alpha * priv->ppc_tpc_nr[gpc][ppc]; const u32 as = alpha * gr->ppc_tpc_nr[gpc][ppc];
const u32 bs = attrib * priv->ppc_tpc_nr[gpc][ppc]; const u32 bs = attrib * gr->ppc_tpc_nr[gpc][ppc];
const u32 u = 0x418ea0 + (n * 0x04); const u32 u = 0x418ea0 + (n * 0x04);
const u32 o = PPC_UNIT(gpc, ppc, 0); const u32 o = PPC_UNIT(gpc, ppc, 0);
mmio_wr32(info, o + 0xc0, bs); mmio_wr32(info, o + 0xc0, bs);
mmio_wr32(info, o + 0xf4, bo); mmio_wr32(info, o + 0xf4, bo);
bo += impl->attrib_nr_max * priv->ppc_tpc_nr[gpc][ppc]; bo += impl->attrib_nr_max * gr->ppc_tpc_nr[gpc][ppc];
mmio_wr32(info, o + 0xe4, as); mmio_wr32(info, o + 0xe4, as);
mmio_wr32(info, o + 0xf8, ao); mmio_wr32(info, o + 0xf8, ao);
ao += impl->alpha_nr_max * priv->ppc_tpc_nr[gpc][ppc]; ao += impl->alpha_nr_max * gr->ppc_tpc_nr[gpc][ppc];
mmio_wr32(info, u, ((bs / 3 /*XXX*/) << 16) | bs); mmio_wr32(info, u, ((bs / 3 /*XXX*/) << 16) | bs);
} }
} }
} }
void void
gm107_grctx_generate_tpcid(struct gf100_gr_priv *priv) gm107_grctx_generate_tpcid(struct gf100_gr *gr)
{ {
int gpc, tpc, id; int gpc, tpc, id;
for (tpc = 0, id = 0; tpc < 4; tpc++) { for (tpc = 0, id = 0; tpc < 4; tpc++) {
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
if (tpc < priv->tpc_nr[gpc]) { if (tpc < gr->tpc_nr[gpc]) {
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x698), id); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x698), id);
nv_wr32(priv, GPC_UNIT(gpc, 0x0c10 + tpc * 4), id); nv_wr32(gr, GPC_UNIT(gpc, 0x0c10 + tpc * 4), id);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x088), id); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x088), id);
id++; id++;
} }
nv_wr32(priv, GPC_UNIT(gpc, 0x0c08), priv->tpc_nr[gpc]); nv_wr32(gr, GPC_UNIT(gpc, 0x0c08), gr->tpc_nr[gpc]);
nv_wr32(priv, GPC_UNIT(gpc, 0x0c8c), priv->tpc_nr[gpc]); nv_wr32(gr, GPC_UNIT(gpc, 0x0c8c), gr->tpc_nr[gpc]);
} }
} }
} }
static void static void
gm107_grctx_generate_main(struct gf100_gr_priv *priv, struct gf100_grctx *info) gm107_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{ {
struct gf100_grctx_oclass *oclass = (void *)nv_engine(priv)->cclass; struct gf100_grctx_oclass *oclass = (void *)nv_engine(gr)->cclass;
int i; int i;
gf100_gr_mmio(priv, oclass->hub); gf100_gr_mmio(gr, oclass->hub);
gf100_gr_mmio(priv, oclass->gpc); gf100_gr_mmio(gr, oclass->gpc);
gf100_gr_mmio(priv, oclass->zcull); gf100_gr_mmio(gr, oclass->zcull);
gf100_gr_mmio(priv, oclass->tpc); gf100_gr_mmio(gr, oclass->tpc);
gf100_gr_mmio(priv, oclass->ppc); gf100_gr_mmio(gr, oclass->ppc);
nv_wr32(priv, 0x404154, 0x00000000); nv_wr32(gr, 0x404154, 0x00000000);
oclass->bundle(info); oclass->bundle(info);
oclass->pagepool(info); oclass->pagepool(info);
oclass->attrib(info); oclass->attrib(info);
oclass->unkn(priv); oclass->unkn(gr);
gm107_grctx_generate_tpcid(priv); gm107_grctx_generate_tpcid(gr);
gf100_grctx_generate_r406028(priv); gf100_grctx_generate_r406028(gr);
gk104_grctx_generate_r418bb8(priv); gk104_grctx_generate_r418bb8(gr);
gf100_grctx_generate_r406800(priv); gf100_grctx_generate_r406800(gr);
nv_wr32(priv, 0x4064d0, 0x00000001); nv_wr32(gr, 0x4064d0, 0x00000001);
for (i = 1; i < 8; i++) for (i = 1; i < 8; i++)
nv_wr32(priv, 0x4064d0 + (i * 0x04), 0x00000000); nv_wr32(gr, 0x4064d0 + (i * 0x04), 0x00000000);
nv_wr32(priv, 0x406500, 0x00000001); nv_wr32(gr, 0x406500, 0x00000001);
nv_wr32(priv, 0x405b00, (priv->tpc_total << 8) | priv->gpc_nr); nv_wr32(gr, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);
gk104_grctx_generate_rop_active_fbps(priv); gk104_grctx_generate_rop_active_fbps(gr);
gf100_gr_icmd(priv, oclass->icmd); gf100_gr_icmd(gr, oclass->icmd);
nv_wr32(priv, 0x404154, 0x00000400); nv_wr32(gr, 0x404154, 0x00000400);
gf100_gr_mthd(priv, oclass->mthd); gf100_gr_mthd(gr, oclass->mthd);
nv_mask(priv, 0x419e00, 0x00808080, 0x00808080); nv_mask(gr, 0x419e00, 0x00808080, 0x00808080);
nv_mask(priv, 0x419ccc, 0x80000000, 0x80000000); nv_mask(gr, 0x419ccc, 0x80000000, 0x80000000);
nv_mask(priv, 0x419f80, 0x80000000, 0x80000000); nv_mask(gr, 0x419f80, 0x80000000, 0x80000000);
nv_mask(priv, 0x419f88, 0x80000000, 0x80000000); nv_mask(gr, 0x419f88, 0x80000000, 0x80000000);
} }
struct nvkm_oclass * struct nvkm_oclass *
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm204.c
View file @ bfee3f3d
...@@ -919,16 +919,16 @@ gm204_grctx_pack_ppc[] = { ...@@ -919,16 +919,16 @@ gm204_grctx_pack_ppc[] = {
******************************************************************************/ ******************************************************************************/
void void
gm204_grctx_generate_tpcid(struct gf100_gr_priv *priv) gm204_grctx_generate_tpcid(struct gf100_gr *gr)
{ {
int gpc, tpc, id; int gpc, tpc, id;
for (tpc = 0, id = 0; tpc < 4; tpc++) { for (tpc = 0, id = 0; tpc < 4; tpc++) {
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
if (tpc < priv->tpc_nr[gpc]) { if (tpc < gr->tpc_nr[gpc]) {
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x698), id); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x698), id);
nv_wr32(priv, GPC_UNIT(gpc, 0x0c10 + tpc * 4), id); nv_wr32(gr, GPC_UNIT(gpc, 0x0c10 + tpc * 4), id);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x088), id); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x088), id);
id++; id++;
} }
} }
...@@ -936,88 +936,88 @@ gm204_grctx_generate_tpcid(struct gf100_gr_priv *priv) ...@@ -936,88 +936,88 @@ gm204_grctx_generate_tpcid(struct gf100_gr_priv *priv)
} }
static void static void
gm204_grctx_generate_rop_active_fbps(struct gf100_gr_priv *priv) gm204_grctx_generate_rop_active_fbps(struct gf100_gr *gr)
{ {
const u32 fbp_count = nv_rd32(priv, 0x12006c); const u32 fbp_count = nv_rd32(gr, 0x12006c);
nv_mask(priv, 0x408850, 0x0000000f, fbp_count); /* zrop */ nv_mask(gr, 0x408850, 0x0000000f, fbp_count); /* zrop */
nv_mask(priv, 0x408958, 0x0000000f, fbp_count); /* crop */ nv_mask(gr, 0x408958, 0x0000000f, fbp_count); /* crop */
} }
void void
gm204_grctx_generate_405b60(struct gf100_gr_priv *priv) gm204_grctx_generate_405b60(struct gf100_gr *gr)
{ {
const u32 dist_nr = DIV_ROUND_UP(priv->tpc_total, 4); const u32 dist_nr = DIV_ROUND_UP(gr->tpc_total, 4);
u32 dist[TPC_MAX] = {}; u32 dist[TPC_MAX / 4] = {};
u32 gpcs[GPC_MAX] = {}; u32 gpcs[GPC_MAX] = {};
u8 tpcnr[GPC_MAX]; u8 tpcnr[GPC_MAX];
int tpc, gpc, i; int tpc, gpc, i;
memcpy(tpcnr, priv->tpc_nr, sizeof(priv->tpc_nr)); memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
/* won't result in the same distribution as the binary driver where /* won't result in the same distribution as the binary driver where
* some of the gpcs have more tpcs than others, but this shall do * some of the gpcs have more tpcs than others, but this shall do
* for the moment. the code for earlier gpus has this issue too. * for the moment. the code for earlier gpus has this issue too.
*/ */
for (gpc = -1, i = 0; i < priv->tpc_total; i++) { for (gpc = -1, i = 0; i < gr->tpc_total; i++) {
do { do {
gpc = (gpc + 1) % priv->gpc_nr; gpc = (gpc + 1) % gr->gpc_nr;
} while(!tpcnr[gpc]); } while(!tpcnr[gpc]);
tpc = priv->tpc_nr[gpc] - tpcnr[gpc]--; tpc = gr->tpc_nr[gpc] - tpcnr[gpc]--;
dist[i / 4] |= ((gpc << 4) | tpc) << ((i % 4) * 8); dist[i / 4] |= ((gpc << 4) | tpc) << ((i % 4) * 8);
gpcs[gpc] |= i << (tpc * 8); gpcs[gpc] |= i << (tpc * 8);
} }
for (i = 0; i < dist_nr; i++) for (i = 0; i < dist_nr; i++)
nv_wr32(priv, 0x405b60 + (i * 4), dist[i]); nv_wr32(gr, 0x405b60 + (i * 4), dist[i]);
for (i = 0; i < priv->gpc_nr; i++) for (i = 0; i < gr->gpc_nr; i++)
nv_wr32(priv, 0x405ba0 + (i * 4), gpcs[i]); nv_wr32(gr, 0x405ba0 + (i * 4), gpcs[i]);
} }
void void
gm204_grctx_generate_main(struct gf100_gr_priv *priv, struct gf100_grctx *info) gm204_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{ {
struct gf100_grctx_oclass *oclass = (void *)nv_engine(priv)->cclass; struct gf100_grctx_oclass *oclass = (void *)nv_engine(gr)->cclass;
u32 tmp; u32 tmp;
int i; int i;
gf100_gr_mmio(priv, oclass->hub); gf100_gr_mmio(gr, oclass->hub);
gf100_gr_mmio(priv, oclass->gpc); gf100_gr_mmio(gr, oclass->gpc);
gf100_gr_mmio(priv, oclass->zcull); gf100_gr_mmio(gr, oclass->zcull);
gf100_gr_mmio(priv, oclass->tpc); gf100_gr_mmio(gr, oclass->tpc);
gf100_gr_mmio(priv, oclass->ppc); gf100_gr_mmio(gr, oclass->ppc);
nv_wr32(priv, 0x404154, 0x00000000); nv_wr32(gr, 0x404154, 0x00000000);
oclass->bundle(info); oclass->bundle(info);
oclass->pagepool(info); oclass->pagepool(info);
oclass->attrib(info); oclass->attrib(info);
oclass->unkn(priv); oclass->unkn(gr);
gm204_grctx_generate_tpcid(priv); gm204_grctx_generate_tpcid(gr);
gf100_grctx_generate_r406028(priv); gf100_grctx_generate_r406028(gr);
gk104_grctx_generate_r418bb8(priv); gk104_grctx_generate_r418bb8(gr);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
nv_wr32(priv, 0x4064d0 + (i * 0x04), 0x00000000); nv_wr32(gr, 0x4064d0 + (i * 0x04), 0x00000000);
nv_wr32(priv, 0x406500, 0x00000000); nv_wr32(gr, 0x406500, 0x00000000);
nv_wr32(priv, 0x405b00, (priv->tpc_total << 8) | priv->gpc_nr); nv_wr32(gr, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);
gm204_grctx_generate_rop_active_fbps(priv); gm204_grctx_generate_rop_active_fbps(gr);
for (tmp = 0, i = 0; i < priv->gpc_nr; i++) for (tmp = 0, i = 0; i < gr->gpc_nr; i++)
tmp |= ((1 << priv->tpc_nr[i]) - 1) << (i * 4); tmp |= ((1 << gr->tpc_nr[i]) - 1) << (i * 4);
nv_wr32(priv, 0x4041c4, tmp); nv_wr32(gr, 0x4041c4, tmp);
gm204_grctx_generate_405b60(priv); gm204_grctx_generate_405b60(gr);
gf100_gr_icmd(priv, oclass->icmd); gf100_gr_icmd(gr, oclass->icmd);
nv_wr32(priv, 0x404154, 0x00000800); nv_wr32(gr, 0x404154, 0x00000800);
gf100_gr_mthd(priv, oclass->mthd); gf100_gr_mthd(gr, oclass->mthd);
nv_mask(priv, 0x418e94, 0xffffffff, 0xc4230000); nv_mask(gr, 0x418e94, 0xffffffff, 0xc4230000);
nv_mask(priv, 0x418e4c, 0xffffffff, 0x70000000); nv_mask(gr, 0x418e4c, 0xffffffff, 0x70000000);
} }
struct nvkm_oclass * struct nvkm_oclass *
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c
View file @ bfee3f3d
...@@ -22,63 +22,63 @@ ...@@ -22,63 +22,63 @@
#include "ctxgf100.h" #include "ctxgf100.h"
static void static void
gm20b_grctx_generate_r406028(struct gf100_gr_priv *priv) gm20b_grctx_generate_r406028(struct gf100_gr *gr)
{ {
u32 tpc_per_gpc = 0; u32 tpc_per_gpc = 0;
int i; int i;
for (i = 0; i < priv->gpc_nr; i++) for (i = 0; i < gr->gpc_nr; i++)
tpc_per_gpc |= priv->tpc_nr[i] << (4 * i); tpc_per_gpc |= gr->tpc_nr[i] << (4 * i);
nv_wr32(priv, 0x406028, tpc_per_gpc); nv_wr32(gr, 0x406028, tpc_per_gpc);
nv_wr32(priv, 0x405870, tpc_per_gpc); nv_wr32(gr, 0x405870, tpc_per_gpc);
} }
static void static void
gm20b_grctx_generate_main(struct gf100_gr_priv *priv, struct gf100_grctx *info) gm20b_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
{ {
struct gf100_grctx_oclass *oclass = (void *)nv_engine(priv)->cclass; struct gf100_grctx_oclass *oclass = (void *)nv_engine(gr)->cclass;
int idle_timeout_save; int idle_timeout_save;
int i, tmp; int i, tmp;
gf100_gr_mmio(priv, priv->fuc_sw_ctx); gf100_gr_mmio(gr, gr->fuc_sw_ctx);
gf100_gr_wait_idle(priv); gf100_gr_wait_idle(gr);
idle_timeout_save = nv_rd32(priv, 0x404154); idle_timeout_save = nv_rd32(gr, 0x404154);
nv_wr32(priv, 0x404154, 0x00000000); nv_wr32(gr, 0x404154, 0x00000000);
oclass->attrib(info); oclass->attrib(info);
oclass->unkn(priv); oclass->unkn(gr);
gm204_grctx_generate_tpcid(priv); gm204_grctx_generate_tpcid(gr);
gm20b_grctx_generate_r406028(priv); gm20b_grctx_generate_r406028(gr);
gk104_grctx_generate_r418bb8(priv); gk104_grctx_generate_r418bb8(gr);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
nv_wr32(priv, 0x4064d0 + (i * 0x04), 0x00000000); nv_wr32(gr, 0x4064d0 + (i * 0x04), 0x00000000);
nv_wr32(priv, 0x405b00, (priv->tpc_total << 8) | priv->gpc_nr); nv_wr32(gr, 0x405b00, (gr->tpc_total << 8) | gr->gpc_nr);
gk104_grctx_generate_rop_active_fbps(priv); gk104_grctx_generate_rop_active_fbps(gr);
nv_wr32(priv, 0x408908, nv_rd32(priv, 0x410108) | 0x80000000); nv_wr32(gr, 0x408908, nv_rd32(gr, 0x410108) | 0x80000000);
for (tmp = 0, i = 0; i < priv->gpc_nr; i++) for (tmp = 0, i = 0; i < gr->gpc_nr; i++)
tmp |= ((1 << priv->tpc_nr[i]) - 1) << (i * 4); tmp |= ((1 << gr->tpc_nr[i]) - 1) << (i * 4);
nv_wr32(priv, 0x4041c4, tmp); nv_wr32(gr, 0x4041c4, tmp);
gm204_grctx_generate_405b60(priv); gm204_grctx_generate_405b60(gr);
gf100_gr_wait_idle(priv); gf100_gr_wait_idle(gr);
nv_wr32(priv, 0x404154, idle_timeout_save); nv_wr32(gr, 0x404154, idle_timeout_save);
gf100_gr_wait_idle(priv); gf100_gr_wait_idle(gr);
gf100_gr_mthd(priv, priv->fuc_method); gf100_gr_mthd(gr, gr->fuc_method);
gf100_gr_wait_idle(priv); gf100_gr_wait_idle(gr);
gf100_gr_icmd(priv, priv->fuc_bundle); gf100_gr_icmd(gr, gr->fuc_bundle);
oclass->pagepool(info); oclass->pagepool(info);
oclass->bundle(info); oclass->bundle(info);
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
View file @ bfee3f3d
...@@ -67,7 +67,7 @@ struct gf100_gr_zbc_depth { ...@@ -67,7 +67,7 @@ struct gf100_gr_zbc_depth {
u32 l2; u32 l2;
}; };
struct gf100_gr_priv { struct gf100_gr {
struct nvkm_gr base; struct nvkm_gr base;
struct gf100_gr_fuc fuc409c; struct gf100_gr_fuc fuc409c;
...@@ -123,10 +123,10 @@ int gf100_gr_context_ctor(struct nvkm_object *, struct nvkm_object *, ...@@ -123,10 +123,10 @@ int gf100_gr_context_ctor(struct nvkm_object *, struct nvkm_object *,
struct nvkm_object **); struct nvkm_object **);
void gf100_gr_context_dtor(struct nvkm_object *); void gf100_gr_context_dtor(struct nvkm_object *);
void gf100_gr_ctxctl_debug(struct gf100_gr_priv *); void gf100_gr_ctxctl_debug(struct gf100_gr *);
void gf100_gr_dtor_fw(struct gf100_gr_fuc *); void gf100_gr_dtor_fw(struct gf100_gr_fuc *);
int gf100_gr_ctor_fw(struct gf100_gr_priv *, const char *, int gf100_gr_ctor_fw(struct gf100_gr *, const char *,
struct gf100_gr_fuc *); struct gf100_gr_fuc *);
u64 gf100_gr_units(struct nvkm_gr *); u64 gf100_gr_units(struct nvkm_gr *);
int gf100_gr_ctor(struct nvkm_object *, struct nvkm_object *, int gf100_gr_ctor(struct nvkm_object *, struct nvkm_object *,
...@@ -134,7 +134,7 @@ int gf100_gr_ctor(struct nvkm_object *, struct nvkm_object *, ...@@ -134,7 +134,7 @@ int gf100_gr_ctor(struct nvkm_object *, struct nvkm_object *,
struct nvkm_object **); struct nvkm_object **);
void gf100_gr_dtor(struct nvkm_object *); void gf100_gr_dtor(struct nvkm_object *);
int gf100_gr_init(struct nvkm_object *); int gf100_gr_init(struct nvkm_object *);
void gf100_gr_zbc_init(struct gf100_gr_priv *); void gf100_gr_zbc_init(struct gf100_gr *);
int gk104_gr_ctor(struct nvkm_object *, struct nvkm_object *, int gk104_gr_ctor(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, void *data, u32 size, struct nvkm_oclass *, void *data, u32 size,
...@@ -199,11 +199,11 @@ struct gf100_gr_oclass { ...@@ -199,11 +199,11 @@ struct gf100_gr_oclass {
int ppc_nr; int ppc_nr;
}; };
int gf100_gr_wait_idle(struct gf100_gr_priv *); int gf100_gr_wait_idle(struct gf100_gr *);
void gf100_gr_mmio(struct gf100_gr_priv *, const struct gf100_gr_pack *); void gf100_gr_mmio(struct gf100_gr *, const struct gf100_gr_pack *);
void gf100_gr_icmd(struct gf100_gr_priv *, const struct gf100_gr_pack *); void gf100_gr_icmd(struct gf100_gr *, const struct gf100_gr_pack *);
void gf100_gr_mthd(struct gf100_gr_priv *, const struct gf100_gr_pack *); void gf100_gr_mthd(struct gf100_gr *, const struct gf100_gr_pack *);
int gf100_gr_init_ctxctl(struct gf100_gr_priv *); int gf100_gr_init_ctxctl(struct gf100_gr *);
/* register init value lists */ /* register init value lists */
...@@ -279,7 +279,7 @@ extern const struct gf100_gr_init gm107_gr_init_tex_0[]; ...@@ -279,7 +279,7 @@ extern const struct gf100_gr_init gm107_gr_init_tex_0[];
extern const struct gf100_gr_init gm107_gr_init_l1c_0[]; extern const struct gf100_gr_init gm107_gr_init_l1c_0[];
extern const struct gf100_gr_init gm107_gr_init_wwdx_0[]; extern const struct gf100_gr_init gm107_gr_init_wwdx_0[];
extern const struct gf100_gr_init gm107_gr_init_cbm_0[]; extern const struct gf100_gr_init gm107_gr_init_cbm_0[];
void gm107_gr_init_bios(struct gf100_gr_priv *); void gm107_gr_init_bios(struct gf100_gr *);
extern const struct gf100_gr_pack gm204_gr_pack_mmio[]; extern const struct gf100_gr_pack gm204_gr_pack_mmio[];
#endif #endif
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c
View file @ bfee3f3d
...@@ -196,9 +196,9 @@ int ...@@ -196,9 +196,9 @@ int
gk104_gr_init(struct nvkm_object *object) gk104_gr_init(struct nvkm_object *object)
{ {
struct gf100_gr_oclass *oclass = (void *)object->oclass; struct gf100_gr_oclass *oclass = (void *)object->oclass;
struct gf100_gr_priv *priv = (void *)object; struct gf100_gr *gr = (void *)object;
struct nvkm_pmu *pmu = nvkm_pmu(priv); struct nvkm_pmu *pmu = nvkm_pmu(gr);
const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, priv->tpc_total); const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, gr->tpc_total);
u32 data[TPC_MAX / 8] = {}; u32 data[TPC_MAX / 8] = {};
u8 tpcnr[GPC_MAX]; u8 tpcnr[GPC_MAX];
int gpc, tpc, rop; int gpc, tpc, rop;
...@@ -207,107 +207,107 @@ gk104_gr_init(struct nvkm_object *object) ...@@ -207,107 +207,107 @@ gk104_gr_init(struct nvkm_object *object)
if (pmu) if (pmu)
pmu->pgob(pmu, false); pmu->pgob(pmu, false);
ret = nvkm_gr_init(&priv->base); ret = nvkm_gr_init(&gr->base);
if (ret) if (ret)
return ret; return ret;
nv_wr32(priv, GPC_BCAST(0x0880), 0x00000000); nv_wr32(gr, GPC_BCAST(0x0880), 0x00000000);
nv_wr32(priv, GPC_BCAST(0x08a4), 0x00000000); nv_wr32(gr, GPC_BCAST(0x08a4), 0x00000000);
nv_wr32(priv, GPC_BCAST(0x0888), 0x00000000); nv_wr32(gr, GPC_BCAST(0x0888), 0x00000000);
nv_wr32(priv, GPC_BCAST(0x088c), 0x00000000); nv_wr32(gr, GPC_BCAST(0x088c), 0x00000000);
nv_wr32(priv, GPC_BCAST(0x0890), 0x00000000); nv_wr32(gr, GPC_BCAST(0x0890), 0x00000000);
nv_wr32(priv, GPC_BCAST(0x0894), 0x00000000); nv_wr32(gr, GPC_BCAST(0x0894), 0x00000000);
nv_wr32(priv, GPC_BCAST(0x08b4), priv->unk4188b4->addr >> 8); nv_wr32(gr, GPC_BCAST(0x08b4), gr->unk4188b4->addr >> 8);
nv_wr32(priv, GPC_BCAST(0x08b8), priv->unk4188b8->addr >> 8); nv_wr32(gr, GPC_BCAST(0x08b8), gr->unk4188b8->addr >> 8);
gf100_gr_mmio(priv, oclass->mmio); gf100_gr_mmio(gr, oclass->mmio);
nv_wr32(priv, GPC_UNIT(0, 0x3018), 0x00000001); nv_wr32(gr, GPC_UNIT(0, 0x3018), 0x00000001);
memset(data, 0x00, sizeof(data)); memset(data, 0x00, sizeof(data));
memcpy(tpcnr, priv->tpc_nr, sizeof(priv->tpc_nr)); memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
for (i = 0, gpc = -1; i < priv->tpc_total; i++) { for (i = 0, gpc = -1; i < gr->tpc_total; i++) {
do { do {
gpc = (gpc + 1) % priv->gpc_nr; gpc = (gpc + 1) % gr->gpc_nr;
} while (!tpcnr[gpc]); } while (!tpcnr[gpc]);
tpc = priv->tpc_nr[gpc] - tpcnr[gpc]--; tpc = gr->tpc_nr[gpc] - tpcnr[gpc]--;
data[i / 8] |= tpc << ((i % 8) * 4); data[i / 8] |= tpc << ((i % 8) * 4);
} }
nv_wr32(priv, GPC_BCAST(0x0980), data[0]); nv_wr32(gr, GPC_BCAST(0x0980), data[0]);
nv_wr32(priv, GPC_BCAST(0x0984), data[1]); nv_wr32(gr, GPC_BCAST(0x0984), data[1]);
nv_wr32(priv, GPC_BCAST(0x0988), data[2]); nv_wr32(gr, GPC_BCAST(0x0988), data[2]);
nv_wr32(priv, GPC_BCAST(0x098c), data[3]); nv_wr32(gr, GPC_BCAST(0x098c), data[3]);
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
nv_wr32(priv, GPC_UNIT(gpc, 0x0914), nv_wr32(gr, GPC_UNIT(gpc, 0x0914),
priv->magic_not_rop_nr << 8 | priv->tpc_nr[gpc]); gr->magic_not_rop_nr << 8 | gr->tpc_nr[gpc]);
nv_wr32(priv, GPC_UNIT(gpc, 0x0910), 0x00040000 | nv_wr32(gr, GPC_UNIT(gpc, 0x0910), 0x00040000 |
priv->tpc_total); gr->tpc_total);
nv_wr32(priv, GPC_UNIT(gpc, 0x0918), magicgpc918); nv_wr32(gr, GPC_UNIT(gpc, 0x0918), magicgpc918);
} }
nv_wr32(priv, GPC_BCAST(0x3fd4), magicgpc918); nv_wr32(gr, GPC_BCAST(0x3fd4), magicgpc918);
nv_wr32(priv, GPC_BCAST(0x08ac), nv_rd32(priv, 0x100800)); nv_wr32(gr, GPC_BCAST(0x08ac), nv_rd32(gr, 0x100800));
nv_wr32(priv, 0x400500, 0x00010001); nv_wr32(gr, 0x400500, 0x00010001);
nv_wr32(priv, 0x400100, 0xffffffff); nv_wr32(gr, 0x400100, 0xffffffff);
nv_wr32(priv, 0x40013c, 0xffffffff); nv_wr32(gr, 0x40013c, 0xffffffff);
nv_wr32(priv, 0x409ffc, 0x00000000); nv_wr32(gr, 0x409ffc, 0x00000000);
nv_wr32(priv, 0x409c14, 0x00003e3e); nv_wr32(gr, 0x409c14, 0x00003e3e);
nv_wr32(priv, 0x409c24, 0x000f0001); nv_wr32(gr, 0x409c24, 0x000f0001);
nv_wr32(priv, 0x404000, 0xc0000000); nv_wr32(gr, 0x404000, 0xc0000000);
nv_wr32(priv, 0x404600, 0xc0000000); nv_wr32(gr, 0x404600, 0xc0000000);
nv_wr32(priv, 0x408030, 0xc0000000); nv_wr32(gr, 0x408030, 0xc0000000);
nv_wr32(priv, 0x404490, 0xc0000000); nv_wr32(gr, 0x404490, 0xc0000000);
nv_wr32(priv, 0x406018, 0xc0000000); nv_wr32(gr, 0x406018, 0xc0000000);
nv_wr32(priv, 0x407020, 0x40000000); nv_wr32(gr, 0x407020, 0x40000000);
nv_wr32(priv, 0x405840, 0xc0000000); nv_wr32(gr, 0x405840, 0xc0000000);
nv_wr32(priv, 0x405844, 0x00ffffff); nv_wr32(gr, 0x405844, 0x00ffffff);
nv_mask(priv, 0x419cc0, 0x00000008, 0x00000008); nv_mask(gr, 0x419cc0, 0x00000008, 0x00000008);
nv_mask(priv, 0x419eb4, 0x00001000, 0x00001000); nv_mask(gr, 0x419eb4, 0x00001000, 0x00001000);
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
nv_wr32(priv, GPC_UNIT(gpc, 0x3038), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x3038), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x0420), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x0420), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x0900), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x0900), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x1028), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x1028), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x0824), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x0824), 0xc0000000);
for (tpc = 0; tpc < priv->tpc_nr[gpc]; tpc++) { for (tpc = 0; tpc < gr->tpc_nr[gpc]; tpc++) {
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x508), 0xffffffff); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x508), 0xffffffff);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x50c), 0xffffffff); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x50c), 0xffffffff);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x224), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x224), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x48c), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x48c), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x084), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x084), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x644), 0x001ffffe); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x644), 0x001ffffe);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x64c), 0x0000000f); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x64c), 0x0000000f);
} }
nv_wr32(priv, GPC_UNIT(gpc, 0x2c90), 0xffffffff); nv_wr32(gr, GPC_UNIT(gpc, 0x2c90), 0xffffffff);
nv_wr32(priv, GPC_UNIT(gpc, 0x2c94), 0xffffffff); nv_wr32(gr, GPC_UNIT(gpc, 0x2c94), 0xffffffff);
} }
for (rop = 0; rop < priv->rop_nr; rop++) { for (rop = 0; rop < gr->rop_nr; rop++) {
nv_wr32(priv, ROP_UNIT(rop, 0x144), 0xc0000000); nv_wr32(gr, ROP_UNIT(rop, 0x144), 0xc0000000);
nv_wr32(priv, ROP_UNIT(rop, 0x070), 0xc0000000); nv_wr32(gr, ROP_UNIT(rop, 0x070), 0xc0000000);
nv_wr32(priv, ROP_UNIT(rop, 0x204), 0xffffffff); nv_wr32(gr, ROP_UNIT(rop, 0x204), 0xffffffff);
nv_wr32(priv, ROP_UNIT(rop, 0x208), 0xffffffff); nv_wr32(gr, ROP_UNIT(rop, 0x208), 0xffffffff);
} }
nv_wr32(priv, 0x400108, 0xffffffff); nv_wr32(gr, 0x400108, 0xffffffff);
nv_wr32(priv, 0x400138, 0xffffffff); nv_wr32(gr, 0x400138, 0xffffffff);
nv_wr32(priv, 0x400118, 0xffffffff); nv_wr32(gr, 0x400118, 0xffffffff);
nv_wr32(priv, 0x400130, 0xffffffff); nv_wr32(gr, 0x400130, 0xffffffff);
nv_wr32(priv, 0x40011c, 0xffffffff); nv_wr32(gr, 0x40011c, 0xffffffff);
nv_wr32(priv, 0x400134, 0xffffffff); nv_wr32(gr, 0x400134, 0xffffffff);
nv_wr32(priv, 0x400054, 0x34ce3464); nv_wr32(gr, 0x400054, 0x34ce3464);
gf100_gr_zbc_init(priv); gf100_gr_zbc_init(gr);
return gf100_gr_init_ctxctl(priv); return gf100_gr_init_ctxctl(gr);
} }
int int
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c
View file @ bfee3f3d
...@@ -160,46 +160,46 @@ gk20a_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -160,46 +160,46 @@ gk20a_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
int err; int err;
struct gf100_gr_priv *priv; struct gf100_gr *gr;
struct gf100_gr_fuc fuc; struct gf100_gr_fuc fuc;
err = gf100_gr_ctor(parent, engine, oclass, data, size, pobject); err = gf100_gr_ctor(parent, engine, oclass, data, size, pobject);
if (err) if (err)
return err; return err;
priv = (void *)*pobject; gr = (void *)*pobject;
err = gf100_gr_ctor_fw(priv, "sw_nonctx", &fuc); err = gf100_gr_ctor_fw(gr, "sw_nonctx", &fuc);
if (err) if (err)
return err; return err;
priv->fuc_sw_nonctx = gk20a_gr_av_to_init(&fuc); gr->fuc_sw_nonctx = gk20a_gr_av_to_init(&fuc);
gf100_gr_dtor_fw(&fuc); gf100_gr_dtor_fw(&fuc);
if (IS_ERR(priv->fuc_sw_nonctx)) if (IS_ERR(gr->fuc_sw_nonctx))
return PTR_ERR(priv->fuc_sw_nonctx); return PTR_ERR(gr->fuc_sw_nonctx);
err = gf100_gr_ctor_fw(priv, "sw_ctx", &fuc); err = gf100_gr_ctor_fw(gr, "sw_ctx", &fuc);
if (err) if (err)
return err; return err;
priv->fuc_sw_ctx = gk20a_gr_aiv_to_init(&fuc); gr->fuc_sw_ctx = gk20a_gr_aiv_to_init(&fuc);
gf100_gr_dtor_fw(&fuc); gf100_gr_dtor_fw(&fuc);
if (IS_ERR(priv->fuc_sw_ctx)) if (IS_ERR(gr->fuc_sw_ctx))
return PTR_ERR(priv->fuc_sw_ctx); return PTR_ERR(gr->fuc_sw_ctx);
err = gf100_gr_ctor_fw(priv, "sw_bundle_init", &fuc); err = gf100_gr_ctor_fw(gr, "sw_bundle_init", &fuc);
if (err) if (err)
return err; return err;
priv->fuc_bundle = gk20a_gr_av_to_init(&fuc); gr->fuc_bundle = gk20a_gr_av_to_init(&fuc);
gf100_gr_dtor_fw(&fuc); gf100_gr_dtor_fw(&fuc);
if (IS_ERR(priv->fuc_bundle)) if (IS_ERR(gr->fuc_bundle))
return PTR_ERR(priv->fuc_bundle); return PTR_ERR(gr->fuc_bundle);
err = gf100_gr_ctor_fw(priv, "sw_method_init", &fuc); err = gf100_gr_ctor_fw(gr, "sw_method_init", &fuc);
if (err) if (err)
return err; return err;
priv->fuc_method = gk20a_gr_av_to_method(&fuc); gr->fuc_method = gk20a_gr_av_to_method(&fuc);
gf100_gr_dtor_fw(&fuc); gf100_gr_dtor_fw(&fuc);
if (IS_ERR(priv->fuc_method)) if (IS_ERR(gr->fuc_method))
return PTR_ERR(priv->fuc_method); return PTR_ERR(gr->fuc_method);
return 0; return 0;
} }
...@@ -207,26 +207,26 @@ gk20a_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -207,26 +207,26 @@ gk20a_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
void void
gk20a_gr_dtor(struct nvkm_object *object) gk20a_gr_dtor(struct nvkm_object *object)
{ {
struct gf100_gr_priv *priv = (void *)object; struct gf100_gr *gr = (void *)object;
gk20a_gr_init_dtor(priv->fuc_method); gk20a_gr_init_dtor(gr->fuc_method);
gk20a_gr_init_dtor(priv->fuc_bundle); gk20a_gr_init_dtor(gr->fuc_bundle);
gk20a_gr_init_dtor(priv->fuc_sw_ctx); gk20a_gr_init_dtor(gr->fuc_sw_ctx);
gk20a_gr_init_dtor(priv->fuc_sw_nonctx); gk20a_gr_init_dtor(gr->fuc_sw_nonctx);
gf100_gr_dtor(object); gf100_gr_dtor(object);
} }
static int static int
gk20a_gr_wait_mem_scrubbing(struct gf100_gr_priv *priv) gk20a_gr_wait_mem_scrubbing(struct gf100_gr *gr)
{ {
if (!nv_wait(priv, 0x40910c, 0x6, 0x0)) { if (!nv_wait(gr, 0x40910c, 0x6, 0x0)) {
nv_error(priv, "FECS mem scrubbing timeout\n"); nv_error(gr, "FECS mem scrubbing timeout\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
if (!nv_wait(priv, 0x41a10c, 0x6, 0x0)) { if (!nv_wait(gr, 0x41a10c, 0x6, 0x0)) {
nv_error(priv, "GPCCS mem scrubbing timeout\n"); nv_error(gr, "GPCCS mem scrubbing timeout\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -234,109 +234,109 @@ gk20a_gr_wait_mem_scrubbing(struct gf100_gr_priv *priv) ...@@ -234,109 +234,109 @@ gk20a_gr_wait_mem_scrubbing(struct gf100_gr_priv *priv)
} }
static void static void
gk20a_gr_set_hww_esr_report_mask(struct gf100_gr_priv *priv) gk20a_gr_set_hww_esr_report_mask(struct gf100_gr *gr)
{ {
nv_wr32(priv, 0x419e44, 0x1ffffe); nv_wr32(gr, 0x419e44, 0x1ffffe);
nv_wr32(priv, 0x419e4c, 0x7f); nv_wr32(gr, 0x419e4c, 0x7f);
} }
int int
gk20a_gr_init(struct nvkm_object *object) gk20a_gr_init(struct nvkm_object *object)
{ {
struct gk20a_gr_oclass *oclass = (void *)object->oclass; struct gk20a_gr_oclass *oclass = (void *)object->oclass;
struct gf100_gr_priv *priv = (void *)object; struct gf100_gr *gr = (void *)object;
const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, priv->tpc_total); const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, gr->tpc_total);
u32 data[TPC_MAX / 8] = {}; u32 data[TPC_MAX / 8] = {};
u8 tpcnr[GPC_MAX]; u8 tpcnr[GPC_MAX];
int gpc, tpc; int gpc, tpc;
int ret, i; int ret, i;
ret = nvkm_gr_init(&priv->base); ret = nvkm_gr_init(&gr->base);
if (ret) if (ret)
return ret; return ret;
/* Clear SCC RAM */ /* Clear SCC RAM */
nv_wr32(priv, 0x40802c, 0x1); nv_wr32(gr, 0x40802c, 0x1);
gf100_gr_mmio(priv, priv->fuc_sw_nonctx); gf100_gr_mmio(gr, gr->fuc_sw_nonctx);
ret = gk20a_gr_wait_mem_scrubbing(priv); ret = gk20a_gr_wait_mem_scrubbing(gr);
if (ret) if (ret)
return ret; return ret;
ret = gf100_gr_wait_idle(priv); ret = gf100_gr_wait_idle(gr);
if (ret) if (ret)
return ret; return ret;
/* MMU debug buffer */ /* MMU debug buffer */
nv_wr32(priv, 0x100cc8, priv->unk4188b4->addr >> 8); nv_wr32(gr, 0x100cc8, gr->unk4188b4->addr >> 8);
nv_wr32(priv, 0x100ccc, priv->unk4188b8->addr >> 8); nv_wr32(gr, 0x100ccc, gr->unk4188b8->addr >> 8);
if (oclass->init_gpc_mmu) if (oclass->init_gpc_mmu)
oclass->init_gpc_mmu(priv); oclass->init_gpc_mmu(gr);
/* Set the PE as stream master */ /* Set the PE as stream master */
nv_mask(priv, 0x503018, 0x1, 0x1); nv_mask(gr, 0x503018, 0x1, 0x1);
/* Zcull init */ /* Zcull init */
memset(data, 0x00, sizeof(data)); memset(data, 0x00, sizeof(data));
memcpy(tpcnr, priv->tpc_nr, sizeof(priv->tpc_nr)); memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
for (i = 0, gpc = -1; i < priv->tpc_total; i++) { for (i = 0, gpc = -1; i < gr->tpc_total; i++) {
do { do {
gpc = (gpc + 1) % priv->gpc_nr; gpc = (gpc + 1) % gr->gpc_nr;
} while (!tpcnr[gpc]); } while (!tpcnr[gpc]);
tpc = priv->tpc_nr[gpc] - tpcnr[gpc]--; tpc = gr->tpc_nr[gpc] - tpcnr[gpc]--;
data[i / 8] |= tpc << ((i % 8) * 4); data[i / 8] |= tpc << ((i % 8) * 4);
} }
nv_wr32(priv, GPC_BCAST(0x0980), data[0]); nv_wr32(gr, GPC_BCAST(0x0980), data[0]);
nv_wr32(priv, GPC_BCAST(0x0984), data[1]); nv_wr32(gr, GPC_BCAST(0x0984), data[1]);
nv_wr32(priv, GPC_BCAST(0x0988), data[2]); nv_wr32(gr, GPC_BCAST(0x0988), data[2]);
nv_wr32(priv, GPC_BCAST(0x098c), data[3]); nv_wr32(gr, GPC_BCAST(0x098c), data[3]);
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
nv_wr32(priv, GPC_UNIT(gpc, 0x0914), nv_wr32(gr, GPC_UNIT(gpc, 0x0914),
priv->magic_not_rop_nr << 8 | priv->tpc_nr[gpc]); gr->magic_not_rop_nr << 8 | gr->tpc_nr[gpc]);
nv_wr32(priv, GPC_UNIT(gpc, 0x0910), 0x00040000 | nv_wr32(gr, GPC_UNIT(gpc, 0x0910), 0x00040000 |
priv->tpc_total); gr->tpc_total);
nv_wr32(priv, GPC_UNIT(gpc, 0x0918), magicgpc918); nv_wr32(gr, GPC_UNIT(gpc, 0x0918), magicgpc918);
} }
nv_wr32(priv, GPC_BCAST(0x3fd4), magicgpc918); nv_wr32(gr, GPC_BCAST(0x3fd4), magicgpc918);
/* Enable FIFO access */ /* Enable FIFO access */
nv_wr32(priv, 0x400500, 0x00010001); nv_wr32(gr, 0x400500, 0x00010001);
/* Enable interrupts */ /* Enable interrupts */
nv_wr32(priv, 0x400100, 0xffffffff); nv_wr32(gr, 0x400100, 0xffffffff);
nv_wr32(priv, 0x40013c, 0xffffffff); nv_wr32(gr, 0x40013c, 0xffffffff);
/* Enable FECS error interrupts */ /* Enable FECS error interrupts */
nv_wr32(priv, 0x409c24, 0x000f0000); nv_wr32(gr, 0x409c24, 0x000f0000);
/* Enable hardware warning exceptions */ /* Enable hardware warning exceptions */
nv_wr32(priv, 0x404000, 0xc0000000); nv_wr32(gr, 0x404000, 0xc0000000);
nv_wr32(priv, 0x404600, 0xc0000000); nv_wr32(gr, 0x404600, 0xc0000000);
if (oclass->set_hww_esr_report_mask) if (oclass->set_hww_esr_report_mask)
oclass->set_hww_esr_report_mask(priv); oclass->set_hww_esr_report_mask(gr);
/* Enable TPC exceptions per GPC */ /* Enable TPC exceptions per GPC */
nv_wr32(priv, 0x419d0c, 0x2); nv_wr32(gr, 0x419d0c, 0x2);
nv_wr32(priv, 0x41ac94, (((1 << priv->tpc_total) - 1) & 0xff) << 16); nv_wr32(gr, 0x41ac94, (((1 << gr->tpc_total) - 1) & 0xff) << 16);
/* Reset and enable all exceptions */ /* Reset and enable all exceptions */
nv_wr32(priv, 0x400108, 0xffffffff); nv_wr32(gr, 0x400108, 0xffffffff);
nv_wr32(priv, 0x400138, 0xffffffff); nv_wr32(gr, 0x400138, 0xffffffff);
nv_wr32(priv, 0x400118, 0xffffffff); nv_wr32(gr, 0x400118, 0xffffffff);
nv_wr32(priv, 0x400130, 0xffffffff); nv_wr32(gr, 0x400130, 0xffffffff);
nv_wr32(priv, 0x40011c, 0xffffffff); nv_wr32(gr, 0x40011c, 0xffffffff);
nv_wr32(priv, 0x400134, 0xffffffff); nv_wr32(gr, 0x400134, 0xffffffff);
gf100_gr_zbc_init(priv); gf100_gr_zbc_init(gr);
return gf100_gr_init_ctxctl(priv); return gf100_gr_init_ctxctl(gr);
} }
struct nvkm_oclass * struct nvkm_oclass *
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.h
View file @ bfee3f3d
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
struct gk20a_gr_oclass { struct gk20a_gr_oclass {
struct gf100_gr_oclass gf100; struct gf100_gr_oclass gf100;
void (*init_gpc_mmu)(struct gf100_gr_priv *); void (*init_gpc_mmu)(struct gf100_gr *);
void (*set_hww_esr_report_mask)(struct gf100_gr_priv *); void (*set_hww_esr_report_mask)(struct gf100_gr *);
}; };
#endif #endif
drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c
View file @ bfee3f3d
...@@ -292,7 +292,7 @@ gm107_gr_pack_mmio[] = { ...@@ -292,7 +292,7 @@ gm107_gr_pack_mmio[] = {
******************************************************************************/ ******************************************************************************/
void void
gm107_gr_init_bios(struct gf100_gr_priv *priv) gm107_gr_init_bios(struct gf100_gr *gr)
{ {
static const struct { static const struct {
u32 ctrl; u32 ctrl;
...@@ -304,7 +304,7 @@ gm107_gr_init_bios(struct gf100_gr_priv *priv) ...@@ -304,7 +304,7 @@ gm107_gr_init_bios(struct gf100_gr_priv *priv)
{ 0x419af0, 0x419af4 }, { 0x419af0, 0x419af4 },
{ 0x419af8, 0x419afc }, { 0x419af8, 0x419afc },
}; };
struct nvkm_bios *bios = nvkm_bios(priv); struct nvkm_bios *bios = nvkm_bios(gr);
struct nvbios_P0260E infoE; struct nvbios_P0260E infoE;
struct nvbios_P0260X infoX; struct nvbios_P0260X infoX;
int E = -1, X; int E = -1, X;
...@@ -312,9 +312,9 @@ gm107_gr_init_bios(struct gf100_gr_priv *priv) ...@@ -312,9 +312,9 @@ gm107_gr_init_bios(struct gf100_gr_priv *priv)
while (nvbios_P0260Ep(bios, ++E, &ver, &hdr, &infoE)) { while (nvbios_P0260Ep(bios, ++E, &ver, &hdr, &infoE)) {
if (X = -1, E < ARRAY_SIZE(regs)) { if (X = -1, E < ARRAY_SIZE(regs)) {
nv_wr32(priv, regs[E].ctrl, infoE.data); nv_wr32(gr, regs[E].ctrl, infoE.data);
while (nvbios_P0260Xp(bios, ++X, &ver, &hdr, &infoX)) while (nvbios_P0260Xp(bios, ++X, &ver, &hdr, &infoX))
nv_wr32(priv, regs[E].data, infoX.data); nv_wr32(gr, regs[E].data, infoX.data);
} }
} }
} }
...@@ -323,113 +323,113 @@ int ...@@ -323,113 +323,113 @@ int
gm107_gr_init(struct nvkm_object *object) gm107_gr_init(struct nvkm_object *object)
{ {
struct gf100_gr_oclass *oclass = (void *)object->oclass; struct gf100_gr_oclass *oclass = (void *)object->oclass;
struct gf100_gr_priv *priv = (void *)object; struct gf100_gr *gr = (void *)object;
const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, priv->tpc_total); const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, gr->tpc_total);
u32 data[TPC_MAX / 8] = {}; u32 data[TPC_MAX / 8] = {};
u8 tpcnr[GPC_MAX]; u8 tpcnr[GPC_MAX];
int gpc, tpc, ppc, rop; int gpc, tpc, ppc, rop;
int ret, i; int ret, i;
ret = nvkm_gr_init(&priv->base); ret = nvkm_gr_init(&gr->base);
if (ret) if (ret)
return ret; return ret;
nv_wr32(priv, GPC_BCAST(0x0880), 0x00000000); nv_wr32(gr, GPC_BCAST(0x0880), 0x00000000);
nv_wr32(priv, GPC_BCAST(0x0890), 0x00000000); nv_wr32(gr, GPC_BCAST(0x0890), 0x00000000);
nv_wr32(priv, GPC_BCAST(0x0894), 0x00000000); nv_wr32(gr, GPC_BCAST(0x0894), 0x00000000);
nv_wr32(priv, GPC_BCAST(0x08b4), priv->unk4188b4->addr >> 8); nv_wr32(gr, GPC_BCAST(0x08b4), gr->unk4188b4->addr >> 8);
nv_wr32(priv, GPC_BCAST(0x08b8), priv->unk4188b8->addr >> 8); nv_wr32(gr, GPC_BCAST(0x08b8), gr->unk4188b8->addr >> 8);
gf100_gr_mmio(priv, oclass->mmio); gf100_gr_mmio(gr, oclass->mmio);
gm107_gr_init_bios(priv); gm107_gr_init_bios(gr);
nv_wr32(priv, GPC_UNIT(0, 0x3018), 0x00000001); nv_wr32(gr, GPC_UNIT(0, 0x3018), 0x00000001);
memset(data, 0x00, sizeof(data)); memset(data, 0x00, sizeof(data));
memcpy(tpcnr, priv->tpc_nr, sizeof(priv->tpc_nr)); memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
for (i = 0, gpc = -1; i < priv->tpc_total; i++) { for (i = 0, gpc = -1; i < gr->tpc_total; i++) {
do { do {
gpc = (gpc + 1) % priv->gpc_nr; gpc = (gpc + 1) % gr->gpc_nr;
} while (!tpcnr[gpc]); } while (!tpcnr[gpc]);
tpc = priv->tpc_nr[gpc] - tpcnr[gpc]--; tpc = gr->tpc_nr[gpc] - tpcnr[gpc]--;
data[i / 8] |= tpc << ((i % 8) * 4); data[i / 8] |= tpc << ((i % 8) * 4);
} }
nv_wr32(priv, GPC_BCAST(0x0980), data[0]); nv_wr32(gr, GPC_BCAST(0x0980), data[0]);
nv_wr32(priv, GPC_BCAST(0x0984), data[1]); nv_wr32(gr, GPC_BCAST(0x0984), data[1]);
nv_wr32(priv, GPC_BCAST(0x0988), data[2]); nv_wr32(gr, GPC_BCAST(0x0988), data[2]);
nv_wr32(priv, GPC_BCAST(0x098c), data[3]); nv_wr32(gr, GPC_BCAST(0x098c), data[3]);
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
nv_wr32(priv, GPC_UNIT(gpc, 0x0914), nv_wr32(gr, GPC_UNIT(gpc, 0x0914),
priv->magic_not_rop_nr << 8 | priv->tpc_nr[gpc]); gr->magic_not_rop_nr << 8 | gr->tpc_nr[gpc]);
nv_wr32(priv, GPC_UNIT(gpc, 0x0910), 0x00040000 | nv_wr32(gr, GPC_UNIT(gpc, 0x0910), 0x00040000 |
priv->tpc_total); gr->tpc_total);
nv_wr32(priv, GPC_UNIT(gpc, 0x0918), magicgpc918); nv_wr32(gr, GPC_UNIT(gpc, 0x0918), magicgpc918);
} }
nv_wr32(priv, GPC_BCAST(0x3fd4), magicgpc918); nv_wr32(gr, GPC_BCAST(0x3fd4), magicgpc918);
nv_wr32(priv, GPC_BCAST(0x08ac), nv_rd32(priv, 0x100800)); nv_wr32(gr, GPC_BCAST(0x08ac), nv_rd32(gr, 0x100800));
nv_wr32(priv, 0x400500, 0x00010001); nv_wr32(gr, 0x400500, 0x00010001);
nv_wr32(priv, 0x400100, 0xffffffff); nv_wr32(gr, 0x400100, 0xffffffff);
nv_wr32(priv, 0x40013c, 0xffffffff); nv_wr32(gr, 0x40013c, 0xffffffff);
nv_wr32(priv, 0x400124, 0x00000002); nv_wr32(gr, 0x400124, 0x00000002);
nv_wr32(priv, 0x409c24, 0x000e0000); nv_wr32(gr, 0x409c24, 0x000e0000);
nv_wr32(priv, 0x404000, 0xc0000000); nv_wr32(gr, 0x404000, 0xc0000000);
nv_wr32(priv, 0x404600, 0xc0000000); nv_wr32(gr, 0x404600, 0xc0000000);
nv_wr32(priv, 0x408030, 0xc0000000); nv_wr32(gr, 0x408030, 0xc0000000);
nv_wr32(priv, 0x404490, 0xc0000000); nv_wr32(gr, 0x404490, 0xc0000000);
nv_wr32(priv, 0x406018, 0xc0000000); nv_wr32(gr, 0x406018, 0xc0000000);
nv_wr32(priv, 0x407020, 0x40000000); nv_wr32(gr, 0x407020, 0x40000000);
nv_wr32(priv, 0x405840, 0xc0000000); nv_wr32(gr, 0x405840, 0xc0000000);
nv_wr32(priv, 0x405844, 0x00ffffff); nv_wr32(gr, 0x405844, 0x00ffffff);
nv_mask(priv, 0x419cc0, 0x00000008, 0x00000008); nv_mask(gr, 0x419cc0, 0x00000008, 0x00000008);
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
for (ppc = 0; ppc < 2 /* priv->ppc_nr[gpc] */; ppc++) for (ppc = 0; ppc < 2 /* gr->ppc_nr[gpc] */; ppc++)
nv_wr32(priv, PPC_UNIT(gpc, ppc, 0x038), 0xc0000000); nv_wr32(gr, PPC_UNIT(gpc, ppc, 0x038), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x0420), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x0420), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x0900), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x0900), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x1028), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x1028), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x0824), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x0824), 0xc0000000);
for (tpc = 0; tpc < priv->tpc_nr[gpc]; tpc++) { for (tpc = 0; tpc < gr->tpc_nr[gpc]; tpc++) {
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x508), 0xffffffff); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x508), 0xffffffff);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x50c), 0xffffffff); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x50c), 0xffffffff);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x224), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x224), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x48c), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x48c), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x084), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x084), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x430), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x430), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x644), 0x00dffffe); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x644), 0x00dffffe);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x64c), 0x00000005); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x64c), 0x00000005);
} }
nv_wr32(priv, GPC_UNIT(gpc, 0x2c90), 0xffffffff); nv_wr32(gr, GPC_UNIT(gpc, 0x2c90), 0xffffffff);
nv_wr32(priv, GPC_UNIT(gpc, 0x2c94), 0xffffffff); nv_wr32(gr, GPC_UNIT(gpc, 0x2c94), 0xffffffff);
} }
for (rop = 0; rop < priv->rop_nr; rop++) { for (rop = 0; rop < gr->rop_nr; rop++) {
nv_wr32(priv, ROP_UNIT(rop, 0x144), 0x40000000); nv_wr32(gr, ROP_UNIT(rop, 0x144), 0x40000000);
nv_wr32(priv, ROP_UNIT(rop, 0x070), 0x40000000); nv_wr32(gr, ROP_UNIT(rop, 0x070), 0x40000000);
nv_wr32(priv, ROP_UNIT(rop, 0x204), 0xffffffff); nv_wr32(gr, ROP_UNIT(rop, 0x204), 0xffffffff);
nv_wr32(priv, ROP_UNIT(rop, 0x208), 0xffffffff); nv_wr32(gr, ROP_UNIT(rop, 0x208), 0xffffffff);
} }
nv_wr32(priv, 0x400108, 0xffffffff); nv_wr32(gr, 0x400108, 0xffffffff);
nv_wr32(priv, 0x400138, 0xffffffff); nv_wr32(gr, 0x400138, 0xffffffff);
nv_wr32(priv, 0x400118, 0xffffffff); nv_wr32(gr, 0x400118, 0xffffffff);
nv_wr32(priv, 0x400130, 0xffffffff); nv_wr32(gr, 0x400130, 0xffffffff);
nv_wr32(priv, 0x40011c, 0xffffffff); nv_wr32(gr, 0x40011c, 0xffffffff);
nv_wr32(priv, 0x400134, 0xffffffff); nv_wr32(gr, 0x400134, 0xffffffff);
nv_wr32(priv, 0x400054, 0x2c350f63); nv_wr32(gr, 0x400054, 0x2c350f63);
gf100_gr_zbc_init(priv); gf100_gr_zbc_init(gr);
return gf100_gr_init_ctxctl(priv); return gf100_gr_init_ctxctl(gr);
} }
#include "fuc/hubgm107.fuc5.h" #include "fuc/hubgm107.fuc5.h"
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/gm204.c
View file @ bfee3f3d
...@@ -243,7 +243,7 @@ gm204_gr_data[] = { ...@@ -243,7 +243,7 @@ gm204_gr_data[] = {
******************************************************************************/ ******************************************************************************/
static int static int
gm204_gr_init_ctxctl(struct gf100_gr_priv *priv) gm204_gr_init_ctxctl(struct gf100_gr *gr)
{ {
return 0; return 0;
} }
...@@ -252,122 +252,122 @@ int ...@@ -252,122 +252,122 @@ int
gm204_gr_init(struct nvkm_object *object) gm204_gr_init(struct nvkm_object *object)
{ {
struct gf100_gr_oclass *oclass = (void *)object->oclass; struct gf100_gr_oclass *oclass = (void *)object->oclass;
struct gf100_gr_priv *priv = (void *)object; struct gf100_gr *gr = (void *)object;
const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, priv->tpc_total); const u32 magicgpc918 = DIV_ROUND_UP(0x00800000, gr->tpc_total);
u32 data[TPC_MAX / 8] = {}; u32 data[TPC_MAX / 8] = {};
u8 tpcnr[GPC_MAX]; u8 tpcnr[GPC_MAX];
int gpc, tpc, ppc, rop; int gpc, tpc, ppc, rop;
int ret, i; int ret, i;
u32 tmp; u32 tmp;
ret = nvkm_gr_init(&priv->base); ret = nvkm_gr_init(&gr->base);
if (ret) if (ret)
return ret; return ret;
tmp = nv_rd32(priv, 0x100c80); /*XXX: mask? */ tmp = nv_rd32(gr, 0x100c80); /*XXX: mask? */
nv_wr32(priv, 0x418880, 0x00001000 | (tmp & 0x00000fff)); nv_wr32(gr, 0x418880, 0x00001000 | (tmp & 0x00000fff));
nv_wr32(priv, 0x418890, 0x00000000); nv_wr32(gr, 0x418890, 0x00000000);
nv_wr32(priv, 0x418894, 0x00000000); nv_wr32(gr, 0x418894, 0x00000000);
nv_wr32(priv, 0x4188b4, priv->unk4188b4->addr >> 8); nv_wr32(gr, 0x4188b4, gr->unk4188b4->addr >> 8);
nv_wr32(priv, 0x4188b8, priv->unk4188b8->addr >> 8); nv_wr32(gr, 0x4188b8, gr->unk4188b8->addr >> 8);
nv_mask(priv, 0x4188b0, 0x00040000, 0x00040000); nv_mask(gr, 0x4188b0, 0x00040000, 0x00040000);
/*XXX: belongs in fb */ /*XXX: belongs in fb */
nv_wr32(priv, 0x100cc8, priv->unk4188b4->addr >> 8); nv_wr32(gr, 0x100cc8, gr->unk4188b4->addr >> 8);
nv_wr32(priv, 0x100ccc, priv->unk4188b8->addr >> 8); nv_wr32(gr, 0x100ccc, gr->unk4188b8->addr >> 8);
nv_mask(priv, 0x100cc4, 0x00040000, 0x00040000); nv_mask(gr, 0x100cc4, 0x00040000, 0x00040000);
gf100_gr_mmio(priv, oclass->mmio); gf100_gr_mmio(gr, oclass->mmio);
gm107_gr_init_bios(priv); gm107_gr_init_bios(gr);
nv_wr32(priv, GPC_UNIT(0, 0x3018), 0x00000001); nv_wr32(gr, GPC_UNIT(0, 0x3018), 0x00000001);
memset(data, 0x00, sizeof(data)); memset(data, 0x00, sizeof(data));
memcpy(tpcnr, priv->tpc_nr, sizeof(priv->tpc_nr)); memcpy(tpcnr, gr->tpc_nr, sizeof(gr->tpc_nr));
for (i = 0, gpc = -1; i < priv->tpc_total; i++) { for (i = 0, gpc = -1; i < gr->tpc_total; i++) {
do { do {
gpc = (gpc + 1) % priv->gpc_nr; gpc = (gpc + 1) % gr->gpc_nr;
} while (!tpcnr[gpc]); } while (!tpcnr[gpc]);
tpc = priv->tpc_nr[gpc] - tpcnr[gpc]--; tpc = gr->tpc_nr[gpc] - tpcnr[gpc]--;
data[i / 8] |= tpc << ((i % 8) * 4); data[i / 8] |= tpc << ((i % 8) * 4);
} }
nv_wr32(priv, GPC_BCAST(0x0980), data[0]); nv_wr32(gr, GPC_BCAST(0x0980), data[0]);
nv_wr32(priv, GPC_BCAST(0x0984), data[1]); nv_wr32(gr, GPC_BCAST(0x0984), data[1]);
nv_wr32(priv, GPC_BCAST(0x0988), data[2]); nv_wr32(gr, GPC_BCAST(0x0988), data[2]);
nv_wr32(priv, GPC_BCAST(0x098c), data[3]); nv_wr32(gr, GPC_BCAST(0x098c), data[3]);
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
nv_wr32(priv, GPC_UNIT(gpc, 0x0914), nv_wr32(gr, GPC_UNIT(gpc, 0x0914),
priv->magic_not_rop_nr << 8 | priv->tpc_nr[gpc]); gr->magic_not_rop_nr << 8 | gr->tpc_nr[gpc]);
nv_wr32(priv, GPC_UNIT(gpc, 0x0910), 0x00040000 | nv_wr32(gr, GPC_UNIT(gpc, 0x0910), 0x00040000 |
priv->tpc_total); gr->tpc_total);
nv_wr32(priv, GPC_UNIT(gpc, 0x0918), magicgpc918); nv_wr32(gr, GPC_UNIT(gpc, 0x0918), magicgpc918);
} }
nv_wr32(priv, GPC_BCAST(0x3fd4), magicgpc918); nv_wr32(gr, GPC_BCAST(0x3fd4), magicgpc918);
nv_wr32(priv, GPC_BCAST(0x08ac), nv_rd32(priv, 0x100800)); nv_wr32(gr, GPC_BCAST(0x08ac), nv_rd32(gr, 0x100800));
nv_wr32(priv, GPC_BCAST(0x033c), nv_rd32(priv, 0x100804)); nv_wr32(gr, GPC_BCAST(0x033c), nv_rd32(gr, 0x100804));
nv_wr32(priv, 0x400500, 0x00010001); nv_wr32(gr, 0x400500, 0x00010001);
nv_wr32(priv, 0x400100, 0xffffffff); nv_wr32(gr, 0x400100, 0xffffffff);
nv_wr32(priv, 0x40013c, 0xffffffff); nv_wr32(gr, 0x40013c, 0xffffffff);
nv_wr32(priv, 0x400124, 0x00000002); nv_wr32(gr, 0x400124, 0x00000002);
nv_wr32(priv, 0x409c24, 0x000e0000); nv_wr32(gr, 0x409c24, 0x000e0000);
nv_wr32(priv, 0x405848, 0xc0000000); nv_wr32(gr, 0x405848, 0xc0000000);
nv_wr32(priv, 0x40584c, 0x00000001); nv_wr32(gr, 0x40584c, 0x00000001);
nv_wr32(priv, 0x404000, 0xc0000000); nv_wr32(gr, 0x404000, 0xc0000000);
nv_wr32(priv, 0x404600, 0xc0000000); nv_wr32(gr, 0x404600, 0xc0000000);
nv_wr32(priv, 0x408030, 0xc0000000); nv_wr32(gr, 0x408030, 0xc0000000);
nv_wr32(priv, 0x404490, 0xc0000000); nv_wr32(gr, 0x404490, 0xc0000000);
nv_wr32(priv, 0x406018, 0xc0000000); nv_wr32(gr, 0x406018, 0xc0000000);
nv_wr32(priv, 0x407020, 0x40000000); nv_wr32(gr, 0x407020, 0x40000000);
nv_wr32(priv, 0x405840, 0xc0000000); nv_wr32(gr, 0x405840, 0xc0000000);
nv_wr32(priv, 0x405844, 0x00ffffff); nv_wr32(gr, 0x405844, 0x00ffffff);
nv_mask(priv, 0x419cc0, 0x00000008, 0x00000008); nv_mask(gr, 0x419cc0, 0x00000008, 0x00000008);
for (gpc = 0; gpc < priv->gpc_nr; gpc++) { for (gpc = 0; gpc < gr->gpc_nr; gpc++) {
for (ppc = 0; ppc < priv->ppc_nr[gpc]; ppc++) for (ppc = 0; ppc < gr->ppc_nr[gpc]; ppc++)
nv_wr32(priv, PPC_UNIT(gpc, ppc, 0x038), 0xc0000000); nv_wr32(gr, PPC_UNIT(gpc, ppc, 0x038), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x0420), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x0420), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x0900), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x0900), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x1028), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x1028), 0xc0000000);
nv_wr32(priv, GPC_UNIT(gpc, 0x0824), 0xc0000000); nv_wr32(gr, GPC_UNIT(gpc, 0x0824), 0xc0000000);
for (tpc = 0; tpc < priv->tpc_nr[gpc]; tpc++) { for (tpc = 0; tpc < gr->tpc_nr[gpc]; tpc++) {
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x508), 0xffffffff); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x508), 0xffffffff);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x50c), 0xffffffff); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x50c), 0xffffffff);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x224), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x224), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x48c), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x48c), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x084), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x084), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x430), 0xc0000000); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x430), 0xc0000000);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x644), 0x00dffffe); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x644), 0x00dffffe);
nv_wr32(priv, TPC_UNIT(gpc, tpc, 0x64c), 0x00000005); nv_wr32(gr, TPC_UNIT(gpc, tpc, 0x64c), 0x00000005);
} }
nv_wr32(priv, GPC_UNIT(gpc, 0x2c90), 0xffffffff); nv_wr32(gr, GPC_UNIT(gpc, 0x2c90), 0xffffffff);
nv_wr32(priv, GPC_UNIT(gpc, 0x2c94), 0xffffffff); nv_wr32(gr, GPC_UNIT(gpc, 0x2c94), 0xffffffff);
} }
for (rop = 0; rop < priv->rop_nr; rop++) { for (rop = 0; rop < gr->rop_nr; rop++) {
nv_wr32(priv, ROP_UNIT(rop, 0x144), 0x40000000); nv_wr32(gr, ROP_UNIT(rop, 0x144), 0x40000000);
nv_wr32(priv, ROP_UNIT(rop, 0x070), 0x40000000); nv_wr32(gr, ROP_UNIT(rop, 0x070), 0x40000000);
nv_wr32(priv, ROP_UNIT(rop, 0x204), 0xffffffff); nv_wr32(gr, ROP_UNIT(rop, 0x204), 0xffffffff);
nv_wr32(priv, ROP_UNIT(rop, 0x208), 0xffffffff); nv_wr32(gr, ROP_UNIT(rop, 0x208), 0xffffffff);
} }
nv_wr32(priv, 0x400108, 0xffffffff); nv_wr32(gr, 0x400108, 0xffffffff);
nv_wr32(priv, 0x400138, 0xffffffff); nv_wr32(gr, 0x400138, 0xffffffff);
nv_wr32(priv, 0x400118, 0xffffffff); nv_wr32(gr, 0x400118, 0xffffffff);
nv_wr32(priv, 0x400130, 0xffffffff); nv_wr32(gr, 0x400130, 0xffffffff);
nv_wr32(priv, 0x40011c, 0xffffffff); nv_wr32(gr, 0x40011c, 0xffffffff);
nv_wr32(priv, 0x400134, 0xffffffff); nv_wr32(gr, 0x400134, 0xffffffff);
nv_wr32(priv, 0x400054, 0x2c350f63); nv_wr32(gr, 0x400054, 0x2c350f63);
gf100_gr_zbc_init(priv); gf100_gr_zbc_init(gr);
return gm204_gr_init_ctxctl(priv); return gm204_gr_init_ctxctl(gr);
} }
struct nvkm_oclass * struct nvkm_oclass *
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c
View file @ bfee3f3d
...@@ -35,34 +35,34 @@ gm20b_gr_sclass[] = { ...@@ -35,34 +35,34 @@ gm20b_gr_sclass[] = {
}; };
static void static void
gm20b_gr_init_gpc_mmu(struct gf100_gr_priv *priv) gm20b_gr_init_gpc_mmu(struct gf100_gr *gr)
{ {
u32 val; u32 val;
/* TODO this needs to be removed once secure boot works */ /* TODO this needs to be removed once secure boot works */
if (1) { if (1) {
nv_wr32(priv, 0x100ce4, 0xffffffff); nv_wr32(gr, 0x100ce4, 0xffffffff);
} }
/* TODO update once secure boot works */ /* TODO update once secure boot works */
val = nv_rd32(priv, 0x100c80); val = nv_rd32(gr, 0x100c80);
val &= 0xf000087f; val &= 0xf000087f;
nv_wr32(priv, 0x418880, val); nv_wr32(gr, 0x418880, val);
nv_wr32(priv, 0x418890, 0); nv_wr32(gr, 0x418890, 0);
nv_wr32(priv, 0x418894, 0); nv_wr32(gr, 0x418894, 0);
nv_wr32(priv, 0x4188b0, nv_rd32(priv, 0x100cc4)); nv_wr32(gr, 0x4188b0, nv_rd32(gr, 0x100cc4));
nv_wr32(priv, 0x4188b4, nv_rd32(priv, 0x100cc8)); nv_wr32(gr, 0x4188b4, nv_rd32(gr, 0x100cc8));
nv_wr32(priv, 0x4188b8, nv_rd32(priv, 0x100ccc)); nv_wr32(gr, 0x4188b8, nv_rd32(gr, 0x100ccc));
nv_wr32(priv, 0x4188ac, nv_rd32(priv, 0x100800)); nv_wr32(gr, 0x4188ac, nv_rd32(gr, 0x100800));
} }
static void static void
gm20b_gr_set_hww_esr_report_mask(struct gf100_gr_priv *priv) gm20b_gr_set_hww_esr_report_mask(struct gf100_gr *gr)
{ {
nv_wr32(priv, 0x419e44, 0xdffffe); nv_wr32(gr, 0x419e44, 0xdffffe);
nv_wr32(priv, 0x419e4c, 0x5); nv_wr32(gr, 0x419e4c, 0x5);
} }
struct nvkm_oclass * struct nvkm_oclass *
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h
View file @ bfee3f3d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define __NV20_GR_H__ #define __NV20_GR_H__
#include <engine/gr.h> #include <engine/gr.h>
struct nv20_gr_priv { struct nv20_gr {
struct nvkm_gr base; struct nvkm_gr base;
struct nvkm_gpuobj *ctxtab; struct nvkm_gpuobj *ctxtab;
}; };
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c
View file @ bfee3f3d
...@@ -125,24 +125,24 @@ nv25_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -125,24 +125,24 @@ nv25_gr_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,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct nv20_gr_priv *priv; struct nv20_gr *gr;
int ret; int ret;
ret = nvkm_gr_create(parent, engine, oclass, true, &priv); ret = nvkm_gr_create(parent, engine, oclass, true, &gr);
*pobject = nv_object(priv); *pobject = nv_object(gr);
if (ret) if (ret)
return ret; return ret;
ret = nvkm_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, ret = nvkm_gpuobj_new(nv_object(gr), NULL, 32 * 4, 16,
NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); NVOBJ_FLAG_ZERO_ALLOC, &gr->ctxtab);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00001000; nv_subdev(gr)->unit = 0x00001000;
nv_subdev(priv)->intr = nv20_gr_intr; nv_subdev(gr)->intr = nv20_gr_intr;
nv_engine(priv)->cclass = &nv25_gr_cclass; nv_engine(gr)->cclass = &nv25_gr_cclass;
nv_engine(priv)->sclass = nv25_gr_sclass; nv_engine(gr)->sclass = nv25_gr_sclass;
nv_engine(priv)->tile_prog = nv20_gr_tile_prog; nv_engine(gr)->tile_prog = nv20_gr_tile_prog;
return 0; return 0;
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c
View file @ bfee3f3d
...@@ -92,24 +92,24 @@ nv2a_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -92,24 +92,24 @@ nv2a_gr_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,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct nv20_gr_priv *priv; struct nv20_gr *gr;
int ret; int ret;
ret = nvkm_gr_create(parent, engine, oclass, true, &priv); ret = nvkm_gr_create(parent, engine, oclass, true, &gr);
*pobject = nv_object(priv); *pobject = nv_object(gr);
if (ret) if (ret)
return ret; return ret;
ret = nvkm_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, ret = nvkm_gpuobj_new(nv_object(gr), NULL, 32 * 4, 16,
NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); NVOBJ_FLAG_ZERO_ALLOC, &gr->ctxtab);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00001000; nv_subdev(gr)->unit = 0x00001000;
nv_subdev(priv)->intr = nv20_gr_intr; nv_subdev(gr)->intr = nv20_gr_intr;
nv_engine(priv)->cclass = &nv2a_gr_cclass; nv_engine(gr)->cclass = &nv2a_gr_cclass;
nv_engine(priv)->sclass = nv25_gr_sclass; nv_engine(gr)->sclass = nv25_gr_sclass;
nv_engine(priv)->tile_prog = nv20_gr_tile_prog; nv_engine(gr)->tile_prog = nv20_gr_tile_prog;
return 0; return 0;
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c
View file @ bfee3f3d
...@@ -127,24 +127,24 @@ nv30_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -127,24 +127,24 @@ nv30_gr_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,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct nv20_gr_priv *priv; struct nv20_gr *gr;
int ret; int ret;
ret = nvkm_gr_create(parent, engine, oclass, true, &priv); ret = nvkm_gr_create(parent, engine, oclass, true, &gr);
*pobject = nv_object(priv); *pobject = nv_object(gr);
if (ret) if (ret)
return ret; return ret;
ret = nvkm_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, ret = nvkm_gpuobj_new(nv_object(gr), NULL, 32 * 4, 16,
NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); NVOBJ_FLAG_ZERO_ALLOC, &gr->ctxtab);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00001000; nv_subdev(gr)->unit = 0x00001000;
nv_subdev(priv)->intr = nv20_gr_intr; nv_subdev(gr)->intr = nv20_gr_intr;
nv_engine(priv)->cclass = &nv30_gr_cclass; nv_engine(gr)->cclass = &nv30_gr_cclass;
nv_engine(priv)->sclass = nv30_gr_sclass; nv_engine(gr)->sclass = nv30_gr_sclass;
nv_engine(priv)->tile_prog = nv20_gr_tile_prog; nv_engine(gr)->tile_prog = nv20_gr_tile_prog;
return 0; return 0;
} }
...@@ -152,68 +152,68 @@ int ...@@ -152,68 +152,68 @@ int
nv30_gr_init(struct nvkm_object *object) nv30_gr_init(struct nvkm_object *object)
{ {
struct nvkm_engine *engine = nv_engine(object); struct nvkm_engine *engine = nv_engine(object);
struct nv20_gr_priv *priv = (void *)engine; struct nv20_gr *gr = (void *)engine;
struct nvkm_fb *fb = nvkm_fb(object); struct nvkm_fb *fb = nvkm_fb(object);
int ret, i; int ret, i;
ret = nvkm_gr_init(&priv->base); ret = nvkm_gr_init(&gr->base);
if (ret) if (ret)
return ret; return ret;
nv_wr32(priv, NV20_PGRAPH_CHANNEL_CTX_TABLE, priv->ctxtab->addr >> 4); nv_wr32(gr, NV20_PGRAPH_CHANNEL_CTX_TABLE, gr->ctxtab->addr >> 4);
nv_wr32(priv, NV03_PGRAPH_INTR , 0xFFFFFFFF); nv_wr32(gr, NV03_PGRAPH_INTR , 0xFFFFFFFF);
nv_wr32(priv, NV03_PGRAPH_INTR_EN, 0xFFFFFFFF); nv_wr32(gr, NV03_PGRAPH_INTR_EN, 0xFFFFFFFF);
nv_wr32(priv, NV04_PGRAPH_DEBUG_0, 0xFFFFFFFF); nv_wr32(gr, NV04_PGRAPH_DEBUG_0, 0xFFFFFFFF);
nv_wr32(priv, NV04_PGRAPH_DEBUG_0, 0x00000000); nv_wr32(gr, NV04_PGRAPH_DEBUG_0, 0x00000000);
nv_wr32(priv, NV04_PGRAPH_DEBUG_1, 0x401287c0); nv_wr32(gr, NV04_PGRAPH_DEBUG_1, 0x401287c0);
nv_wr32(priv, 0x400890, 0x01b463ff); nv_wr32(gr, 0x400890, 0x01b463ff);
nv_wr32(priv, NV04_PGRAPH_DEBUG_3, 0xf2de0475); nv_wr32(gr, NV04_PGRAPH_DEBUG_3, 0xf2de0475);
nv_wr32(priv, NV10_PGRAPH_DEBUG_4, 0x00008000); nv_wr32(gr, NV10_PGRAPH_DEBUG_4, 0x00008000);
nv_wr32(priv, NV04_PGRAPH_LIMIT_VIOL_PIX, 0xf04bdff6); nv_wr32(gr, NV04_PGRAPH_LIMIT_VIOL_PIX, 0xf04bdff6);
nv_wr32(priv, 0x400B80, 0x1003d888); nv_wr32(gr, 0x400B80, 0x1003d888);
nv_wr32(priv, 0x400B84, 0x0c000000); nv_wr32(gr, 0x400B84, 0x0c000000);
nv_wr32(priv, 0x400098, 0x00000000); nv_wr32(gr, 0x400098, 0x00000000);
nv_wr32(priv, 0x40009C, 0x0005ad00); nv_wr32(gr, 0x40009C, 0x0005ad00);
nv_wr32(priv, 0x400B88, 0x62ff00ff); /* suspiciously like PGRAPH_DEBUG_2 */ nv_wr32(gr, 0x400B88, 0x62ff00ff); /* suspiciously like PGRAPH_DEBUG_2 */
nv_wr32(priv, 0x4000a0, 0x00000000); nv_wr32(gr, 0x4000a0, 0x00000000);
nv_wr32(priv, 0x4000a4, 0x00000008); nv_wr32(gr, 0x4000a4, 0x00000008);
nv_wr32(priv, 0x4008a8, 0xb784a400); nv_wr32(gr, 0x4008a8, 0xb784a400);
nv_wr32(priv, 0x400ba0, 0x002f8685); nv_wr32(gr, 0x400ba0, 0x002f8685);
nv_wr32(priv, 0x400ba4, 0x00231f3f); nv_wr32(gr, 0x400ba4, 0x00231f3f);
nv_wr32(priv, 0x4008a4, 0x40000020); nv_wr32(gr, 0x4008a4, 0x40000020);
if (nv_device(priv)->chipset == 0x34) { if (nv_device(gr)->chipset == 0x34) {
nv_wr32(priv, NV10_PGRAPH_RDI_INDEX, 0x00EA0004); nv_wr32(gr, NV10_PGRAPH_RDI_INDEX, 0x00EA0004);
nv_wr32(priv, NV10_PGRAPH_RDI_DATA , 0x00200201); nv_wr32(gr, NV10_PGRAPH_RDI_DATA , 0x00200201);
nv_wr32(priv, NV10_PGRAPH_RDI_INDEX, 0x00EA0008); nv_wr32(gr, NV10_PGRAPH_RDI_INDEX, 0x00EA0008);
nv_wr32(priv, NV10_PGRAPH_RDI_DATA , 0x00000008); nv_wr32(gr, NV10_PGRAPH_RDI_DATA , 0x00000008);
nv_wr32(priv, NV10_PGRAPH_RDI_INDEX, 0x00EA0000); nv_wr32(gr, NV10_PGRAPH_RDI_INDEX, 0x00EA0000);
nv_wr32(priv, NV10_PGRAPH_RDI_DATA , 0x00000032); nv_wr32(gr, NV10_PGRAPH_RDI_DATA , 0x00000032);
nv_wr32(priv, NV10_PGRAPH_RDI_INDEX, 0x00E00004); nv_wr32(gr, NV10_PGRAPH_RDI_INDEX, 0x00E00004);
nv_wr32(priv, NV10_PGRAPH_RDI_DATA , 0x00000002); nv_wr32(gr, NV10_PGRAPH_RDI_DATA , 0x00000002);
} }
nv_wr32(priv, 0x4000c0, 0x00000016); nv_wr32(gr, 0x4000c0, 0x00000016);
/* Turn all the tiling regions off. */ /* Turn all the tiling regions off. */
for (i = 0; i < fb->tile.regions; i++) for (i = 0; i < fb->tile.regions; i++)
engine->tile_prog(engine, i); engine->tile_prog(engine, i);
nv_wr32(priv, NV10_PGRAPH_CTX_CONTROL, 0x10000100); nv_wr32(gr, NV10_PGRAPH_CTX_CONTROL, 0x10000100);
nv_wr32(priv, NV10_PGRAPH_STATE , 0xFFFFFFFF); nv_wr32(gr, NV10_PGRAPH_STATE , 0xFFFFFFFF);
nv_wr32(priv, 0x0040075c , 0x00000001); nv_wr32(gr, 0x0040075c , 0x00000001);
/* begin RAM config */ /* begin RAM config */
/* vramsz = pci_resource_len(priv->dev->pdev, 0) - 1; */ /* vramsz = pci_resource_len(gr->dev->pdev, 1) - 1; */
nv_wr32(priv, 0x4009A4, nv_rd32(priv, 0x100200)); nv_wr32(gr, 0x4009A4, nv_rd32(gr, 0x100200));
nv_wr32(priv, 0x4009A8, nv_rd32(priv, 0x100204)); nv_wr32(gr, 0x4009A8, nv_rd32(gr, 0x100204));
if (nv_device(priv)->chipset != 0x34) { if (nv_device(gr)->chipset != 0x34) {
nv_wr32(priv, 0x400750, 0x00EA0000); nv_wr32(gr, 0x400750, 0x00EA0000);
nv_wr32(priv, 0x400754, nv_rd32(priv, 0x100200)); nv_wr32(gr, 0x400754, nv_rd32(gr, 0x100200));
nv_wr32(priv, 0x400750, 0x00EA0004); nv_wr32(gr, 0x400750, 0x00EA0004);
nv_wr32(priv, 0x400754, nv_rd32(priv, 0x100204)); nv_wr32(gr, 0x400754, nv_rd32(gr, 0x100204));
} }
return 0; return 0;
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c
View file @ bfee3f3d
...@@ -126,24 +126,24 @@ nv34_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -126,24 +126,24 @@ nv34_gr_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,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct nv20_gr_priv *priv; struct nv20_gr *gr;
int ret; int ret;
ret = nvkm_gr_create(parent, engine, oclass, true, &priv); ret = nvkm_gr_create(parent, engine, oclass, true, &gr);
*pobject = nv_object(priv); *pobject = nv_object(gr);
if (ret) if (ret)
return ret; return ret;
ret = nvkm_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, ret = nvkm_gpuobj_new(nv_object(gr), NULL, 32 * 4, 16,
NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); NVOBJ_FLAG_ZERO_ALLOC, &gr->ctxtab);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00001000; nv_subdev(gr)->unit = 0x00001000;
nv_subdev(priv)->intr = nv20_gr_intr; nv_subdev(gr)->intr = nv20_gr_intr;
nv_engine(priv)->cclass = &nv34_gr_cclass; nv_engine(gr)->cclass = &nv34_gr_cclass;
nv_engine(priv)->sclass = nv34_gr_sclass; nv_engine(gr)->sclass = nv34_gr_sclass;
nv_engine(priv)->tile_prog = nv20_gr_tile_prog; nv_engine(gr)->tile_prog = nv20_gr_tile_prog;
return 0; return 0;
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c
View file @ bfee3f3d
...@@ -126,24 +126,24 @@ nv35_gr_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -126,24 +126,24 @@ nv35_gr_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,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct nv20_gr_priv *priv; struct nv20_gr *gr;
int ret; int ret;
ret = nvkm_gr_create(parent, engine, oclass, true, &priv); ret = nvkm_gr_create(parent, engine, oclass, true, &gr);
*pobject = nv_object(priv); *pobject = nv_object(gr);
if (ret) if (ret)
return ret; return ret;
ret = nvkm_gpuobj_new(nv_object(priv), NULL, 32 * 4, 16, ret = nvkm_gpuobj_new(nv_object(gr), NULL, 32 * 4, 16,
NVOBJ_FLAG_ZERO_ALLOC, &priv->ctxtab); NVOBJ_FLAG_ZERO_ALLOC, &gr->ctxtab);
if (ret) if (ret)
return ret; return ret;
nv_subdev(priv)->unit = 0x00001000; nv_subdev(gr)->unit = 0x00001000;
nv_subdev(priv)->intr = nv20_gr_intr; nv_subdev(gr)->intr = nv20_gr_intr;
nv_engine(priv)->cclass = &nv35_gr_cclass; nv_engine(gr)->cclass = &nv35_gr_cclass;
nv_engine(priv)->sclass = nv35_gr_sclass; nv_engine(gr)->sclass = nv35_gr_sclass;
nv_engine(priv)->tile_prog = nv20_gr_tile_prog; nv_engine(gr)->tile_prog = nv20_gr_tile_prog;
return 0; return 0;
} }
......
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