[Nouveau] [PATCH v4 25/37] clk: remove dstate and tstate

[Martin Peres]

On 18/04/16 22:13, Karol Herbst wrote:
> we won't need them, because we will adjust the clocks depending on engine loads
> later on anyway. It also simplifies the clocking logic.

You can also say that the code was just mocked up anyway.

>
> Signed-off-by: Karol Herbst <nouveau at karolherbst.de>
> ---
>   drm/nouveau/include/nvkm/subdev/clk.h |  4 ----
>   drm/nouveau/nvkm/subdev/clk/base.c    | 28 ++--------------------------
>   2 files changed, 2 insertions(+), 30 deletions(-)
>
> diff --git a/drm/nouveau/include/nvkm/subdev/clk.h b/drm/nouveau/include/nvkm/subdev/clk.h
> index 77d94c1..db52e65 100644
> --- a/drm/nouveau/include/nvkm/subdev/clk.h
> +++ b/drm/nouveau/include/nvkm/subdev/clk.h
> @@ -95,8 +95,6 @@ struct nvkm_clk {
>   	int ustate_ac; /* user-requested (-1 disabled, -2 perfmon) */
>   	int ustate_dc; /* user-requested (-1 disabled, -2 perfmon) */
>   	int astate; /* perfmon adjustment (base) */
> -	int tstate; /* thermal adjustment (max-) */
> -	int dstate; /* display adjustment (min+) */
>   
>   	bool allow_reclock;
>   #define NVKM_CLK_BOOST_NONE 0x0
> @@ -118,8 +116,6 @@ struct nvkm_clk {
>   int nvkm_clk_read(struct nvkm_clk *, enum nv_clk_src);
>   int nvkm_clk_ustate(struct nvkm_clk *, int req, int pwr);
>   int nvkm_clk_astate(struct nvkm_clk *, int req, int rel, bool wait);
> -int nvkm_clk_dstate(struct nvkm_clk *, int req, int rel);
> -int nvkm_clk_tstate(struct nvkm_clk *, int req, int rel);
>   int nvkm_clk_update(struct nvkm_clk *, bool wait);
>   
>   int nv04_clk_new(struct nvkm_device *, int, struct nvkm_clk **);
> diff --git a/drm/nouveau/nvkm/subdev/clk/base.c b/drm/nouveau/nvkm/subdev/clk/base.c
> index bfc6a49..3867ab7 100644
> --- a/drm/nouveau/nvkm/subdev/clk/base.c
> +++ b/drm/nouveau/nvkm/subdev/clk/base.c
> @@ -317,15 +317,13 @@ nvkm_clk_update_work(struct work_struct *work)
>   		return;
>   	clk->pwrsrc = power_supply_is_system_supplied();
>   
> -	nvkm_trace(subdev, "P %d PWR %d U(AC) %d U(DC) %d A %d T %d D %d\n",
> +	nvkm_trace(subdev, "P %d PWR %d U(AC) %d U(DC) %d A %d\n",
>   		   clk->pstate, clk->pwrsrc, clk->ustate_ac, clk->ustate_dc,
> -		   clk->astate, clk->tstate, clk->dstate);
> +		   clk->astate);
>   
>   	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 = max(pstate, clk->dstate);
>   	} else {
>   		pstate = clk->pstate = -1;
>   	}
> @@ -554,26 +552,6 @@ nvkm_clk_astate(struct nvkm_clk *clk, int req, int rel, bool wait)
>   	return nvkm_clk_update(clk, wait);
>   }
>   
> -int
> -nvkm_clk_tstate(struct nvkm_clk *clk, int req, int rel)
> -{
> -	if (!rel) clk->tstate  = req;
> -	if ( rel) clk->tstate += rel;
> -	clk->tstate = min(clk->tstate, 0);
> -	clk->tstate = max(clk->tstate, -(clk->state_nr - 1));
> -	return nvkm_clk_update(clk, true);
> -}
> -
> -int
> -nvkm_clk_dstate(struct nvkm_clk *clk, int req, int rel)
> -{
> -	if (!rel) clk->dstate  = req;
> -	if ( rel) clk->dstate += rel;
> -	clk->dstate = min(clk->dstate, clk->state_nr - 1);
> -	clk->dstate = max(clk->dstate, 0);
> -	return nvkm_clk_update(clk, true);
> -}
> -
>   static int
>   nvkm_clk_pwrsrc(struct nvkm_notify *notify)
>   {
> @@ -631,8 +609,6 @@ nvkm_clk_init(struct nvkm_subdev *subdev)
>   		return clk->func->init(clk);
>   
>   	clk->astate = clk->state_nr - 1;
> -	clk->tstate = 0;
> -	clk->dstate = 0;
>   	clk->pstate = -1;
>   	nvkm_clk_update(clk, true);
>   	return 0;