summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorqctecmdr <qctecmdr@localhost>2019-12-17 09:34:51 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-12-17 09:34:51 -0800
commitc4235f7fc14f349dde452ecb795523d083eb6bf6 (patch)
tree805d281a8c031f85c4072d45fcf72ff704329bb9
parent10465152384576d0051c1f0af6f9452a1883d03d (diff)
parentd804b9eb6a69aec4f6fd12cabdc248648bc9a38c (diff)
downloaddisplay-drivers-c4235f7fc14f349dde452ecb795523d083eb6bf6.tar.gz
Merge "disp: msm: sde: update last power event handled correctly"
-rw-r--r--msm/sde/sde_core_perf.c1
-rw-r--r--msm/sde_power_handle.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/msm/sde/sde_core_perf.c b/msm/sde/sde_core_perf.c
index d0b6291f..97318f65 100644
--- a/msm/sde/sde_core_perf.c
+++ b/msm/sde/sde_core_perf.c
@@ -1043,6 +1043,7 @@ static ssize_t _sde_core_perf_mode_write(struct file *file,
perf->max_core_clk_rate);
else
DRM_INFO("minimum performance mode\n");
+ SDE_EVT32(perf->max_core_clk_rate, ret);
} else if (perf_mode == SDE_PERF_MODE_NORMAL) {
/* reset the perf tune params to 0 */
perf->perf_tune.min_core_clk = 0;
diff --git a/msm/sde_power_handle.c b/msm/sde_power_handle.c
index 1f12e0b7..65d58076 100644
--- a/msm/sde_power_handle.c
+++ b/msm/sde_power_handle.c
@@ -42,10 +42,10 @@ static void sde_power_event_trigger_locked(struct sde_power_handle *phandle,
{
struct sde_power_event *event;
+ phandle->last_event_handled = event_type;
list_for_each_entry(event, &phandle->event_list, list) {
if (event->event_type & event_type) {
event->cb_fnc(event_type, event->usr);
- phandle->last_event_handled = event_type;
}
}
}
@@ -862,6 +862,7 @@ int sde_power_clk_set_rate(struct sde_power_handle *phandle, char *clock_name,
if (phandle->last_event_handled & SDE_POWER_EVENT_POST_DISABLE) {
pr_debug("invalid power state %u\n",
phandle->last_event_handled);
+ SDE_EVT32(phandle->last_event_handled, SDE_EVTLOG_ERROR);
mutex_unlock(&phandle->phandle_lock);
return -EINVAL;
}