[Nouveau] [PATCH] clk: allow config option to enable reclocking
Ben Skeggs
skeggsb at gmail.com
Fri May 16 20:17:31 PDT 2014
On 17 May 2014 02:43, "Ilia Mirkin" <imirkin at alum.mit.edu> wrote:
>
> Adds a NvReclock boolean option to allow the user to enable (or disable)
> reclocking. All chipsets default to off, except NVAA/NVAC, which are
> reportedly complete.
Hey Ilia,
I think I've expressed my thoughts on this previously via IRC, but let me
stick them here too so there's a record of the current state...
For nvaa/nvac, yes, let's enable it by default. It should, apparently, be
good enough that it has a decent chance of working. It's not like we're
attempting anything automatic yet, so, this won't break anything for people
who aren't trying..
I'm on the fence about Kepler. It actually might work to some extent in a
decent number of cases already, there's potentially some severe issues even
with engine clocks on some boards that I'm aware of, so it's not just a
memory reclocking worry here.
That said, it has a good chance of working for some people. So. Thoughts?
I'm also talking making "NvMemExec" default on here too. Again, causing a
fuck-up will still require direct user action.
For the rest (Hm, except maybe nv40, a lot will probably be ok..) There's
*very* little chance memory reclocking will work, even on the systems where
it used to. The code is far less complete, as it was broken in general, and
I haven't yet had the time to *properly* reverse engineer the sequence
needed to stably reclock memory. Kepler is the only implementation where
that's even been started. Tl;dr - unless you're working on the code for
Tesla/Fermi, there's zero point even trying it. So, the block should stay.
Personally, as you know, I'm more comfortable leaving it developer-only
still (except nvaa/nvac) until it at least works on all our own boards
without any major known missing bits.. But yeah, for the ones mentioned
above, I guess it's a possibility if people *really* want...
I can only envision that if we allow this even just in the places it's
known to be partially broken, certain sensationalist, er, people, will feel
the need to test and complain about how broken it all really is... And then
retest on a regular basis, despite there having been *zero* work done
because no-one has the time, and then complain about the exact same thing
AGAIN! (WHOA.. I'm done ranting now :p)
Anyways, that's my thoughts on the matter :)
Comments, suggestions?
Thanks,
Ben.
>
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>
> Ben, I know you've been saying that reclocking is in a pretty bad state,
but I
> do think that there are going to be groups of people for whom the current
code
> can work at least a little bit. May as well let them try it. The memory
script
> execution is still behind the extra-special flag as well...
>
> Also this provides a way forward to enable reclocking on some chips and
leave
> it off for others, by default.
>
> nvkm/include/subdev/clock.h | 8 +++++---
> nvkm/subdev/clock/base.c | 8 ++++++--
> nvkm/subdev/clock/nv04.c | 3 ++-
> nvkm/subdev/clock/nv40.c | 3 ++-
> nvkm/subdev/clock/nv50.c | 2 +-
> nvkm/subdev/clock/nva3.c | 3 ++-
> nvkm/subdev/clock/nvaa.c | 3 ++-
> nvkm/subdev/clock/nvc0.c | 3 ++-
> nvkm/subdev/clock/nve0.c | 3 ++-
> 9 files changed, 24 insertions(+), 12 deletions(-)
>
> diff --git a/nvkm/include/subdev/clock.h b/nvkm/include/subdev/clock.h
> index 8f4ced7..c01e29c 100644
> --- a/nvkm/include/subdev/clock.h
> +++ b/nvkm/include/subdev/clock.h
> @@ -77,6 +77,8 @@ struct nouveau_clock {
> int tstate; /* thermal adjustment (max-) */
> int dstate; /* display adjustment (min+) */
>
> + bool allow_reclock;
> +
> int (*read)(struct nouveau_clock *, enum nv_clk_src);
> int (*calc)(struct nouveau_clock *, struct nouveau_cstate *);
> int (*prog)(struct nouveau_clock *);
> @@ -106,8 +108,8 @@ struct nouveau_clocks {
> int mdiv;
> };
>
> -#define nouveau_clock_create(p,e,o,i,d)
\
> - nouveau_clock_create_((p), (e), (o), (i), sizeof(**d), (void **)d)
> +#define nouveau_clock_create(p,e,o,i,r,d)
\
> + nouveau_clock_create_((p), (e), (o), (i), (r), sizeof(**d), (void
**)d)
> #define nouveau_clock_destroy(p) ({
\
> struct nouveau_clock *clk = (p);
\
> _nouveau_clock_dtor(nv_object(clk));
\
> @@ -121,7 +123,7 @@ struct nouveau_clocks {
>
> int nouveau_clock_create_(struct nouveau_object *, struct
nouveau_object *,
> struct nouveau_oclass *,
> - struct nouveau_clocks *, int, void **);
> + struct nouveau_clocks *, bool, int, void **);
> void _nouveau_clock_dtor(struct nouveau_object *);
> int _nouveau_clock_init(struct nouveau_object *);
> #define _nouveau_clock_fini _nouveau_subdev_fini
> diff --git a/nvkm/subdev/clock/base.c b/nvkm/subdev/clock/base.c
> index dd62bae..80ad9d3 100644
> --- a/nvkm/subdev/clock/base.c
> +++ b/nvkm/subdev/clock/base.c
> @@ -346,8 +346,8 @@ nouveau_clock_ustate_update(struct nouveau_clock
*clk, int req)
> struct nouveau_pstate *pstate;
> int i = 0;
>
> - /* YKW repellant */
> - return -ENOSYS;
> + if (!clk->allow_reclock)
> + return -ENOSYS;
>
> if (req != -1 && req != -2) {
> list_for_each_entry(pstate, &clk->states, head) {
> @@ -456,6 +456,7 @@ nouveau_clock_create_(struct nouveau_object *parent,
> struct nouveau_object *engine,
> struct nouveau_oclass *oclass,
> struct nouveau_clocks *clocks,
> + bool allow_reclock,
> int length, void **object)
> {
> struct nouveau_device *device = nv_device(parent);
> @@ -478,6 +479,9 @@ nouveau_clock_create_(struct nouveau_object *parent,
> ret = nouveau_pstate_new(clk, idx++);
> } while (ret == 0);
>
> + clk->allow_reclock =
> + nouveau_boolopt(device->cfgopt, "NvReclock",
allow_reclock);
> +
> mode = nouveau_stropt(device->cfgopt, "NvClkMode", &arglen);
> if (mode) {
> if (!strncasecmpz(mode, "disabled", arglen)) {
> diff --git a/nvkm/subdev/clock/nv04.c b/nvkm/subdev/clock/nv04.c
> index b74db6c..eb2d442 100644
> --- a/nvkm/subdev/clock/nv04.c
> +++ b/nvkm/subdev/clock/nv04.c
> @@ -82,7 +82,8 @@ nv04_clock_ctor(struct nouveau_object *parent, struct
nouveau_object *engine,
> struct nv04_clock_priv *priv;
> int ret;
>
> - ret = nouveau_clock_create(parent, engine, oclass, nv04_domain,
&priv);
> + ret = nouveau_clock_create(parent, engine, oclass, nv04_domain,
false,
> + &priv);
> *pobject = nv_object(priv);
> if (ret)
> return ret;
> diff --git a/nvkm/subdev/clock/nv40.c b/nvkm/subdev/clock/nv40.c
> index db7346f..651e299 100644
> --- a/nvkm/subdev/clock/nv40.c
> +++ b/nvkm/subdev/clock/nv40.c
> @@ -213,7 +213,8 @@ nv40_clock_ctor(struct nouveau_object *parent, struct
nouveau_object *engine,
> struct nv40_clock_priv *priv;
> int ret;
>
> - ret = nouveau_clock_create(parent, engine, oclass, nv40_domain,
&priv);
> + ret = nouveau_clock_create(parent, engine, oclass, nv40_domain,
false,
> + &priv);
> *pobject = nv_object(priv);
> if (ret)
> return ret;
> diff --git a/nvkm/subdev/clock/nv50.c b/nvkm/subdev/clock/nv50.c
> index 250a6d9..8c13277 100644
> --- a/nvkm/subdev/clock/nv50.c
> +++ b/nvkm/subdev/clock/nv50.c
> @@ -507,7 +507,7 @@ nv50_clock_ctor(struct nouveau_object *parent, struct
nouveau_object *engine,
> int ret;
>
> ret = nouveau_clock_create(parent, engine, oclass,
pclass->domains,
> - &priv);
> + false, &priv);
> *pobject = nv_object(priv);
> if (ret)
> return ret;
> diff --git a/nvkm/subdev/clock/nva3.c b/nvkm/subdev/clock/nva3.c
> index 4f5a137..9fb5835 100644
> --- a/nvkm/subdev/clock/nva3.c
> +++ b/nvkm/subdev/clock/nva3.c
> @@ -302,7 +302,8 @@ nva3_clock_ctor(struct nouveau_object *parent, struct
nouveau_object *engine,
> struct nva3_clock_priv *priv;
> int ret;
>
> - ret = nouveau_clock_create(parent, engine, oclass, nva3_domain,
&priv);
> + ret = nouveau_clock_create(parent, engine, oclass, nva3_domain,
false,
> + &priv);
> *pobject = nv_object(priv);
> if (ret)
> return ret;
> diff --git a/nvkm/subdev/clock/nvaa.c b/nvkm/subdev/clock/nvaa.c
> index 7a723b4..6a65fc9 100644
> --- a/nvkm/subdev/clock/nvaa.c
> +++ b/nvkm/subdev/clock/nvaa.c
> @@ -421,7 +421,8 @@ nvaa_clock_ctor(struct nouveau_object *parent, struct
nouveau_object *engine,
> struct nvaa_clock_priv *priv;
> int ret;
>
> - ret = nouveau_clock_create(parent, engine, oclass, nvaa_domains,
&priv);
> + ret = nouveau_clock_create(parent, engine, oclass, nvaa_domains,
true,
> + &priv);
> *pobject = nv_object(priv);
> if (ret)
> return ret;
> diff --git a/nvkm/subdev/clock/nvc0.c b/nvkm/subdev/clock/nvc0.c
> index c310572..dbf8517 100644
> --- a/nvkm/subdev/clock/nvc0.c
> +++ b/nvkm/subdev/clock/nvc0.c
> @@ -437,7 +437,8 @@ nvc0_clock_ctor(struct nouveau_object *parent, struct
nouveau_object *engine,
> struct nvc0_clock_priv *priv;
> int ret;
>
> - ret = nouveau_clock_create(parent, engine, oclass, nvc0_domain,
&priv);
> + ret = nouveau_clock_create(parent, engine, oclass, nvc0_domain,
false,
> + &priv);
> *pobject = nv_object(priv);
> if (ret)
> return ret;
> diff --git a/nvkm/subdev/clock/nve0.c b/nvkm/subdev/clock/nve0.c
> index d3c37c9..860aa73 100644
> --- a/nvkm/subdev/clock/nve0.c
> +++ b/nvkm/subdev/clock/nve0.c
> @@ -473,7 +473,8 @@ nve0_clock_ctor(struct nouveau_object *parent, struct
nouveau_object *engine,
> struct nve0_clock_priv *priv;
> int ret;
>
> - ret = nouveau_clock_create(parent, engine, oclass, nve0_domain,
&priv);
> + ret = nouveau_clock_create(parent, engine, oclass, nve0_domain,
false,
> + &priv);
> *pobject = nv_object(priv);
> if (ret)
> return ret;
> --
> 1.8.5.5
>
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/nouveau
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/nouveau/attachments/20140517/8cefe9be/attachment.html>
More information about the Nouveau
mailing list