diff options
author | Wei Ni <wni@nvidia.com> | 2015-06-16 17:35:12 +0800 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-07-28 17:22:39 +1000 |
commit | ebabfb8404e3a8953c61dc01483a5bdfdf33b5b4 (patch) | |
tree | b688e7c7e9dc5605427a196de4fcf44431f9119e | |
parent | a6a7fddf0bb389433763cc34e612da8e81849e4c (diff) | |
download | nouveau-ebabfb8404e3a8953c61dc01483a5bdfdf33b5b4.tar.gz |
drm/nouveau/clk: fix tstate to pstate calculation
According to the tstate calculation in nvkm_clk_tstate(),
the range of tstate is from -(clk->state_nr - 1) to 0,
it mean the tstate is negative value. But in nvkm_pstate_work(),
it use (clk->state_nr - 1 - clk->tstate) to limit pstate,
it's not correct.
This patch fix it to use (clk->state_nr - 1 + clk->tstate) to
limit pstate.
Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drm/nouveau/nvkm/subdev/clk/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/nouveau/nvkm/subdev/clk/base.c b/drm/nouveau/nvkm/subdev/clk/base.c index 39a83d82e..77a0ab5ca 100644 --- a/drm/nouveau/nvkm/subdev/clk/base.c +++ b/drm/nouveau/nvkm/subdev/clk/base.c @@ -214,7 +214,7 @@ nvkm_pstate_work(struct work_struct *work) pstate = clk->pwrsrc ? clk->ustate_ac : clk->ustate_dc; if (clk->state_nr && pstate != -1) { pstate = (pstate < 0) ? clk->astate : pstate; - pstate = min(pstate, clk->state_nr - 1 - clk->tstate); + pstate = min(pstate, clk->state_nr - 1 + clk->tstate); pstate = max(pstate, clk->dstate); } else { pstate = clk->pstate = -1; |