Commit 04581ea2 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

pmdomain: Merge branch fixes into next 



Merge the pmdomain fixes for v6.8-rc[n] into the next branch, to allow them
to get tested together with the new changes that are targeted for v6.9.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 71324087 2a93c6cb

drivers/pmdomain/qcom/rpmhpd.c

+5 −2
Original line number Diff line number Diff line
@@ -692,6 +692,7 @@ static int rpmhpd_aggregate_corner(struct rpmhpd *pd, unsigned int corner) 
	unsigned int active_corner, sleep_corner;

	unsigned int this_active_corner = 0, this_sleep_corner = 0;

	unsigned int peer_active_corner = 0, peer_sleep_corner = 0;

	unsigned int peer_enabled_corner;



	if (pd->state_synced) {

		to_active_sleep(pd, corner, &this_active_corner, &this_sleep_corner);
@@ -701,9 +702,11 @@ static int rpmhpd_aggregate_corner(struct rpmhpd *pd, unsigned int corner) 
		this_sleep_corner = pd->level_count - 1;

	}



	if (peer && peer->enabled)

		to_active_sleep(peer, peer->corner, &peer_active_corner,

	if (peer && peer->enabled) {

		peer_enabled_corner = max(peer->corner, peer->enable_corner);

		to_active_sleep(peer, peer_enabled_corner, &peer_active_corner,

				&peer_sleep_corner);

	}



	active_corner = max(this_active_corner, peer_active_corner);