Reviewed-by: Pierre Moreau <[email protected]>
On 2017-09-15 — 17:11, Karol Herbst wrote: > The idea is to clear out the saved state, because after a resume we can't > know what the GPU is clocked to. The reclock is triggered by the call to > nvkm_clk_update later in nvkm_clk_init. > > v2: convert to C style comments > > Signed-off-by: Karol Herbst <[email protected]> > Reviewed-by: Martin Peres <[email protected]> > --- > drm/nouveau/nvkm/subdev/clk/base.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drm/nouveau/nvkm/subdev/clk/base.c > b/drm/nouveau/nvkm/subdev/clk/base.c > index 1d71bf09..54188d2b 100644 > --- a/drm/nouveau/nvkm/subdev/clk/base.c > +++ b/drm/nouveau/nvkm/subdev/clk/base.c > @@ -625,11 +625,10 @@ nvkm_clk_init(struct nvkm_subdev *subdev) > if (clk->func->init) > return clk->func->init(clk); > > - clk->astate = NVKM_CLK_PSTATE_DEFAULT; > + /* after a resume we have no idea what clocks are set, reset the state > + */ > clk->pstate = NULL; > - clk->exp_cstateid = NVKM_CLK_CSTATE_DEFAULT; > clk->cstate = NULL; > - clk->temp = 90; /* reasonable default value */ > nvkm_clk_update(clk, true); > return 0; > } > @@ -683,8 +682,13 @@ nvkm_clk_ctor(const struct nvkm_clk_func *func, struct > nvkm_device *device, > clk->func = func; > INIT_LIST_HEAD(&clk->states); > clk->domains = func->domains; > + > + clk->astate = NVKM_CLK_PSTATE_DEFAULT; > clk->ustate_ac = -1; > clk->ustate_dc = -1; > + clk->exp_cstateid = NVKM_CLK_CSTATE_DEFAULT; > + clk->temp = 90; /* reasonable default value */ > + > clk->allow_reclock = allow_reclock; > > INIT_WORK(&clk->work, nvkm_clk_update_work); > -- > 2.14.1 > > _______________________________________________ > Nouveau mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/nouveau
signature.asc
Description: PGP signature
_______________________________________________ Nouveau mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/nouveau
