Skip to content

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

drm/nouveau/pm: 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 74137ffc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 144 deletions
drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h
View file @ 8c1aeaa1
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
struct nvkm_perfdom; struct nvkm_perfdom;
struct nvkm_perfctr; struct nvkm_perfctr;
struct nvkm_pm { struct nvkm_pm {
struct nvkm_engine base; struct nvkm_engine engine;
struct nvkm_perfctx *context; struct nvkm_perfctx *context;
void *profile_data; void *profile_data;
......
drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c
View file @ 8c1aeaa1
...@@ -125,10 +125,9 @@ gf100_pm_part[] = { ...@@ -125,10 +125,9 @@ gf100_pm_part[] = {
}; };
static void static void
gf100_perfctr_init(struct nvkm_pm *ppm, struct nvkm_perfdom *dom, gf100_perfctr_init(struct nvkm_pm *pm, struct nvkm_perfdom *dom,
struct nvkm_perfctr *ctr) struct nvkm_perfctr *ctr)
{ {
struct gf100_pm_priv *priv = (void *)ppm;
struct gf100_pm_cntr *cntr = (void *)ctr; struct gf100_pm_cntr *cntr = (void *)ctr;
u32 log = ctr->logic_op; u32 log = ctr->logic_op;
u32 src = 0x00000000; u32 src = 0x00000000;
...@@ -137,34 +136,32 @@ gf100_perfctr_init(struct nvkm_pm *ppm, struct nvkm_perfdom *dom, ...@@ -137,34 +136,32 @@ gf100_perfctr_init(struct nvkm_pm *ppm, struct nvkm_perfdom *dom,
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
src |= ctr->signal[i] << (i * 8); src |= ctr->signal[i] << (i * 8);
nv_wr32(priv, dom->addr + 0x09c, 0x00040002 | (dom->mode << 3)); nv_wr32(pm, dom->addr + 0x09c, 0x00040002 | (dom->mode << 3));
nv_wr32(priv, dom->addr + 0x100, 0x00000000); nv_wr32(pm, dom->addr + 0x100, 0x00000000);
nv_wr32(priv, dom->addr + 0x040 + (cntr->base.slot * 0x08), src); nv_wr32(pm, dom->addr + 0x040 + (cntr->base.slot * 0x08), src);
nv_wr32(priv, dom->addr + 0x044 + (cntr->base.slot * 0x08), log); nv_wr32(pm, dom->addr + 0x044 + (cntr->base.slot * 0x08), log);
} }
static void static void
gf100_perfctr_read(struct nvkm_pm *ppm, struct nvkm_perfdom *dom, gf100_perfctr_read(struct nvkm_pm *pm, struct nvkm_perfdom *dom,
struct nvkm_perfctr *ctr) struct nvkm_perfctr *ctr)
{ {
struct gf100_pm_priv *priv = (void *)ppm;
struct gf100_pm_cntr *cntr = (void *)ctr; struct gf100_pm_cntr *cntr = (void *)ctr;
switch (cntr->base.slot) { switch (cntr->base.slot) {
case 0: cntr->base.ctr = nv_rd32(priv, dom->addr + 0x08c); break; case 0: cntr->base.ctr = nv_rd32(pm, dom->addr + 0x08c); break;
case 1: cntr->base.ctr = nv_rd32(priv, dom->addr + 0x088); break; case 1: cntr->base.ctr = nv_rd32(pm, dom->addr + 0x088); break;
case 2: cntr->base.ctr = nv_rd32(priv, dom->addr + 0x080); break; case 2: cntr->base.ctr = nv_rd32(pm, dom->addr + 0x080); break;
case 3: cntr->base.ctr = nv_rd32(priv, dom->addr + 0x090); break; case 3: cntr->base.ctr = nv_rd32(pm, dom->addr + 0x090); break;
} }
dom->clk = nv_rd32(priv, dom->addr + 0x070); dom->clk = nv_rd32(pm, dom->addr + 0x070);
} }
static void static void
gf100_perfctr_next(struct nvkm_pm *ppm, struct nvkm_perfdom *dom) gf100_perfctr_next(struct nvkm_pm *pm, struct nvkm_perfdom *dom)
{ {
struct gf100_pm_priv *priv = (void *)ppm; nv_wr32(pm, dom->addr + 0x06c, dom->signal_nr - 0x40 + 0x27);
nv_wr32(priv, dom->addr + 0x06c, dom->signal_nr - 0x40 + 0x27); nv_wr32(pm, dom->addr + 0x0ec, 0x00000011);
nv_wr32(priv, dom->addr + 0x0ec, 0x00000011);
} }
const struct nvkm_funcdom const struct nvkm_funcdom
...@@ -177,10 +174,10 @@ gf100_perfctr_func = { ...@@ -177,10 +174,10 @@ gf100_perfctr_func = {
int int
gf100_pm_fini(struct nvkm_object *object, bool suspend) gf100_pm_fini(struct nvkm_object *object, bool suspend)
{ {
struct gf100_pm_priv *priv = (void *)object; struct nvkm_pm *pm = (void *)object;
nv_mask(priv, 0x000200, 0x10000000, 0x00000000); nv_mask(pm, 0x000200, 0x10000000, 0x00000000);
nv_mask(priv, 0x000200, 0x10000000, 0x10000000); nv_mask(pm, 0x000200, 0x10000000, 0x10000000);
return nvkm_pm_fini(&priv->base, suspend); return nvkm_pm_fini(pm, suspend);
} }
int int
...@@ -189,43 +186,43 @@ gf100_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -189,43 +186,43 @@ gf100_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct gf100_pm_oclass *mclass = (void *)oclass; struct gf100_pm_oclass *mclass = (void *)oclass;
struct gf100_pm_priv *priv; struct nvkm_pm *pm;
u32 mask; u32 mask;
int ret; int ret;
ret = nvkm_pm_create(parent, engine, oclass, &priv); ret = nvkm_pm_create(parent, engine, oclass, &pm);
*pobject = nv_object(priv); *pobject = nv_object(pm);
if (ret) if (ret)
return ret; return ret;
/* HUB */ /* HUB */
ret = nvkm_perfdom_new(&priv->base, "hub", 0, 0x1b0000, 0, 0x200, ret = nvkm_perfdom_new(pm, "hub", 0, 0x1b0000, 0, 0x200,
mclass->doms_hub); mclass->doms_hub);
if (ret) if (ret)
return ret; return ret;
/* GPC */ /* GPC */
mask = (1 << nv_rd32(priv, 0x022430)) - 1; mask = (1 << nv_rd32(pm, 0x022430)) - 1;
mask &= ~nv_rd32(priv, 0x022504); mask &= ~nv_rd32(pm, 0x022504);
mask &= ~nv_rd32(priv, 0x022584); mask &= ~nv_rd32(pm, 0x022584);
ret = nvkm_perfdom_new(&priv->base, "gpc", mask, 0x180000, ret = nvkm_perfdom_new(pm, "gpc", mask, 0x180000,
0x1000, 0x200, mclass->doms_gpc); 0x1000, 0x200, mclass->doms_gpc);
if (ret) if (ret)
return ret; return ret;
/* PART */ /* PART */
mask = (1 << nv_rd32(priv, 0x022438)) - 1; mask = (1 << nv_rd32(pm, 0x022438)) - 1;
mask &= ~nv_rd32(priv, 0x022548); mask &= ~nv_rd32(pm, 0x022548);
mask &= ~nv_rd32(priv, 0x0225c8); mask &= ~nv_rd32(pm, 0x0225c8);
ret = nvkm_perfdom_new(&priv->base, "part", mask, 0x1a0000, ret = nvkm_perfdom_new(pm, "part", mask, 0x1a0000,
0x1000, 0x200, mclass->doms_part); 0x1000, 0x200, mclass->doms_part);
if (ret) if (ret)
return ret; return ret;
nv_engine(priv)->cclass = &nvkm_pm_cclass; nv_engine(pm)->cclass = &nvkm_pm_cclass;
nv_engine(priv)->sclass = nvkm_pm_sclass; nv_engine(pm)->sclass = nvkm_pm_sclass;
return 0; return 0;
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h
View file @ 8c1aeaa1
...@@ -9,10 +9,6 @@ struct gf100_pm_oclass { ...@@ -9,10 +9,6 @@ struct gf100_pm_oclass {
const struct nvkm_specdom *doms_part; const struct nvkm_specdom *doms_part;
}; };
struct gf100_pm_priv {
struct nvkm_pm base;
};
int gf100_pm_ctor(struct nvkm_object *, struct nvkm_object *, int gf100_pm_ctor(struct nvkm_object *, struct nvkm_object *,
struct nvkm_oclass *, void *data, u32 size, struct nvkm_oclass *, void *data, u32 size,
struct nvkm_object **pobject); struct nvkm_object **pobject);
......
drivers/gpu/drm/nouveau/nvkm/engine/pm/gk110.c
View file @ 8c1aeaa1
...@@ -28,16 +28,16 @@ gk110_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -28,16 +28,16 @@ gk110_pm_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 gf100_pm_priv *priv; struct nvkm_pm *pm;
int ret; int ret;
ret = nvkm_pm_create(parent, engine, oclass, &priv); ret = nvkm_pm_create(parent, engine, oclass, &pm);
*pobject = nv_object(priv); *pobject = nv_object(pm);
if (ret) if (ret)
return ret; return ret;
nv_engine(priv)->cclass = &nvkm_pm_cclass; nv_engine(pm)->cclass = &nvkm_pm_cclass;
nv_engine(priv)->sclass = nvkm_pm_sclass; nv_engine(pm)->sclass = nvkm_pm_sclass;
return 0; return 0;
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c
View file @ 8c1aeaa1
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
#include "nv40.h" #include "nv40.h"
static void static void
nv40_perfctr_init(struct nvkm_pm *ppm, struct nvkm_perfdom *dom, nv40_perfctr_init(struct nvkm_pm *pm, struct nvkm_perfdom *dom,
struct nvkm_perfctr *ctr) struct nvkm_perfctr *ctr)
{ {
struct nv40_pm_priv *priv = (void *)ppm;
struct nv40_pm_cntr *cntr = (void *)ctr; struct nv40_pm_cntr *cntr = (void *)ctr;
u32 log = ctr->logic_op; u32 log = ctr->logic_op;
u32 src = 0x00000000; u32 src = 0x00000000;
...@@ -36,34 +35,32 @@ nv40_perfctr_init(struct nvkm_pm *ppm, struct nvkm_perfdom *dom, ...@@ -36,34 +35,32 @@ nv40_perfctr_init(struct nvkm_pm *ppm, struct nvkm_perfdom *dom,
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
src |= ctr->signal[i] << (i * 8); src |= ctr->signal[i] << (i * 8);
nv_wr32(priv, 0x00a7c0 + dom->addr, 0x00000001 | (dom->mode << 4)); nv_wr32(pm, 0x00a7c0 + dom->addr, 0x00000001 | (dom->mode << 4));
nv_wr32(priv, 0x00a400 + dom->addr + (cntr->base.slot * 0x40), src); nv_wr32(pm, 0x00a400 + dom->addr + (cntr->base.slot * 0x40), src);
nv_wr32(priv, 0x00a420 + dom->addr + (cntr->base.slot * 0x40), log); nv_wr32(pm, 0x00a420 + dom->addr + (cntr->base.slot * 0x40), log);
} }
static void static void
nv40_perfctr_read(struct nvkm_pm *ppm, struct nvkm_perfdom *dom, nv40_perfctr_read(struct nvkm_pm *pm, struct nvkm_perfdom *dom,
struct nvkm_perfctr *ctr) struct nvkm_perfctr *ctr)
{ {
struct nv40_pm_priv *priv = (void *)ppm;
struct nv40_pm_cntr *cntr = (void *)ctr; struct nv40_pm_cntr *cntr = (void *)ctr;
switch (cntr->base.slot) { switch (cntr->base.slot) {
case 0: cntr->base.ctr = nv_rd32(priv, 0x00a700 + dom->addr); break; case 0: cntr->base.ctr = nv_rd32(pm, 0x00a700 + dom->addr); break;
case 1: cntr->base.ctr = nv_rd32(priv, 0x00a6c0 + dom->addr); break; case 1: cntr->base.ctr = nv_rd32(pm, 0x00a6c0 + dom->addr); break;
case 2: cntr->base.ctr = nv_rd32(priv, 0x00a680 + dom->addr); break; case 2: cntr->base.ctr = nv_rd32(pm, 0x00a680 + dom->addr); break;
case 3: cntr->base.ctr = nv_rd32(priv, 0x00a740 + dom->addr); break; case 3: cntr->base.ctr = nv_rd32(pm, 0x00a740 + dom->addr); break;
} }
dom->clk = nv_rd32(priv, 0x00a600 + dom->addr); dom->clk = nv_rd32(pm, 0x00a600 + dom->addr);
} }
static void static void
nv40_perfctr_next(struct nvkm_pm *ppm, struct nvkm_perfdom *dom) nv40_perfctr_next(struct nvkm_pm *pm, struct nvkm_perfdom *dom)
{ {
struct nv40_pm_priv *priv = (void *)ppm; if (pm->sequence != pm->sequence) {
if (priv->sequence != ppm->sequence) { nv_wr32(pm, 0x400084, 0x00000020);
nv_wr32(priv, 0x400084, 0x00000020); pm->sequence = pm->sequence;
priv->sequence = ppm->sequence;
} }
} }
...@@ -100,20 +97,20 @@ nv40_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine, ...@@ -100,20 +97,20 @@ nv40_pm_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
struct nvkm_object **pobject) struct nvkm_object **pobject)
{ {
struct nv40_pm_oclass *mclass = (void *)oclass; struct nv40_pm_oclass *mclass = (void *)oclass;
struct nv40_pm_priv *priv; struct nv40_pm *pm;
int ret; int ret;
ret = nvkm_pm_create(parent, engine, oclass, &priv); ret = nvkm_pm_create(parent, engine, oclass, &pm);
*pobject = nv_object(priv); *pobject = nv_object(pm);
if (ret) if (ret)
return ret; return ret;
ret = nvkm_perfdom_new(&priv->base, "pc", 0, 0, 0, 4, mclass->doms); ret = nvkm_perfdom_new(&pm->base, "pc", 0, 0, 0, 4, mclass->doms);
if (ret) if (ret)
return ret; return ret;
nv_engine(priv)->cclass = &nvkm_pm_cclass; nv_engine(pm)->cclass = &nvkm_pm_cclass;
nv_engine(priv)->sclass = nvkm_pm_sclass; nv_engine(pm)->sclass = nvkm_pm_sclass;
return 0; return 0;
} }
......
drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h
View file @ 8c1aeaa1
...@@ -7,7 +7,7 @@ struct nv40_pm_oclass { ...@@ -7,7 +7,7 @@ struct nv40_pm_oclass {
const struct nvkm_specdom *doms; const struct nvkm_specdom *doms;
}; };
struct nv40_pm_priv { struct nv40_pm {
struct nvkm_pm base; struct nvkm_pm base;
u32 sequence; u32 sequence;
}; };
......
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