Merge "msm: msm_bus: Send WAKE/SLEEP TCS commands always for disp_rsc" (9f143329) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/soc/qcom/msm_bus/msm_bus_fabric_rpmh.c

+23 −18

Original line number	Diff line number	Diff line
		@@ -343,6 +343,7 @@ static int tcs_cmd_list_gen(int *n_active,
		continue;
		list_for_each_entry(cur_bcm, &cur_bcm_clist[i], link) {
		commit = false;
		if (cur_rsc->node_info->id != MSM_BUS_RSC_DISP) {
		if ((cur_bcm->node_vec[DUAL_CTX].vec_a ==
		cur_bcm->node_vec[ACTIVE_CTX].vec_a) &&
		(cur_bcm->node_vec[DUAL_CTX].vec_b ==
		@@ -354,12 +355,15 @@ static int tcs_cmd_list_gen(int *n_active,
		BCM_TCS_CMD_COMMIT_MASK;
		cmdlist_sleep[last_tcs].data \|=
		BCM_TCS_CMD_COMMIT_MASK;
		cmdlist_wake[last_tcs].wait = true;
		cmdlist_sleep[last_tcs].wait = true;
		cmdlist_wake[last_tcs].wait =
		true;
		cmdlist_sleep[last_tcs].wait =
		true;
		idx++;
		}
		continue;
		}
		}
		last_tcs = k;
		n_sleep[idx]++;
		n_wake[idx]++;
		@@ -649,14 +653,14 @@ int msm_bus_commit_data(struct list_head *clist)
		MSM_BUS_ERR("%s: error sending active/awake sets: %d\n",
		__func__, ret);
		}
		if (cnt_wake) {
		if (cnt_wake \|\| (cur_rsc->node_info->id == MSM_BUS_RSC_DISP)) {
		ret = rpmh_write_batch(cur_mbox, RPMH_WAKE_ONLY_STATE,
		cmdlist_wake, n_wake);
		if (ret)
		MSM_BUS_ERR("%s: error sending wake sets: %d\n",
		__func__, ret);
		}
		if (cnt_sleep) {
		if (cnt_sleep \|\| (cur_rsc->node_info->id == MSM_BUS_RSC_DISP)) {
		ret = rpmh_write_batch(cur_mbox, RPMH_SLEEP_STATE,
		cmdlist_sleep, n_sleep);
		if (ret)
		@@ -672,6 +676,7 @@ int msm_bus_commit_data(struct list_head *clist)

		exit_msm_bus_commit_data:
		list_for_each_entry_safe(node, node_tmp, clist, link) {
		if (cur_rsc->node_info->id != MSM_BUS_RSC_DISP)
		bcm_clist_clean(node);
		node->dirty = false;
		list_del_init(&node->link);