Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb4d29df authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/nouveau/clk: support for non-BIOS pstates 



Make nouveau_clock_create() take new two optional arguments: an array
of pstates and its size. When these are specified,
nouveau_clock_create() will use the provided pstates instead of
probing them using the BIOS.

This is useful for platforms which do not provide a BIOS, like Tegra.

Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 2cfd22f4

drivers/gpu/drm/nouveau/core/include/subdev/clock.h

+5 −3
Original line number Diff line number Diff line
@@ -115,8 +115,9 @@ struct nouveau_clocks { 
	int mdiv;

};



#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_create(p,e,o,i,r,s,n,d)                                  \

	nouveau_clock_create_((p), (e), (o), (i), (r), (s), (n), sizeof(**d),  \

			      (void **)d)

#define nouveau_clock_destroy(p) ({                                            \

	struct nouveau_clock *clk = (p);                                       \

	_nouveau_clock_dtor(nv_object(clk));                                   \
@@ -132,7 +133,8 @@ struct nouveau_clocks { 


int  nouveau_clock_create_(struct nouveau_object *, struct nouveau_object *,

			   struct nouveau_oclass *,

			   struct nouveau_clocks *, bool, int, void **);

			   struct nouveau_clocks *, struct nouveau_pstate *,

			   int, bool, int, void **);

void _nouveau_clock_dtor(struct nouveau_object *);

int  _nouveau_clock_init(struct nouveau_object *);

int  _nouveau_clock_fini(struct nouveau_object *, bool);

drivers/gpu/drm/nouveau/core/subdev/clock/base.c

+12 −4
Original line number Diff line number Diff line
@@ -534,6 +534,7 @@ nouveau_clock_create_(struct nouveau_object *parent, 
		      struct nouveau_object *engine,

		      struct nouveau_oclass *oclass,

		      struct nouveau_clocks *clocks,

		      struct nouveau_pstate *pstates, int nb_pstates,

		      bool allow_reclock,

		      int length, void **object)

{
@@ -557,10 +558,17 @@ nouveau_clock_create_(struct nouveau_object *parent, 
	init_waitqueue_head(&clk->wait);

	atomic_set(&clk->waiting, 0);



	/* If no pstates are provided, try and fetch them from the BIOS */

	if (!pstates) {

		idx = 0;

		do {

			ret = nouveau_pstate_new(clk, idx++);

		} while (ret == 0);

	} else {

		for (idx = 0; idx < nb_pstates; idx++)

			list_add_tail(&pstates[idx].head, &clk->states);

		clk->state_nr = nb_pstates;

	}



	clk->allow_reclock = allow_reclock;

drivers/gpu/drm/nouveau/core/subdev/clock/nv04.c

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +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, false,

				   &priv);

	ret = nouveau_clock_create(parent, engine, oclass, nv04_domain, NULL, 0,

				   false, &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/core/subdev/clock/nv40.c

+2 −2
Original line number Diff line number Diff line
@@ -213,8 +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, true,

				   &priv);

	ret = nouveau_clock_create(parent, engine, oclass, nv40_domain, NULL, 0,

				   true, &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;

drivers/gpu/drm/nouveau/core/subdev/clock/nv50.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

				   false, &priv);

				   NULL, 0, false, &priv);

	*pobject = nv_object(priv);

	if (ret)

		return ret;