Commit be91a983 authored by Sean Paul's avatar Sean Paul

drm/rockchip: Fix up bug in psr state machine

The ->set() callback would always be called when transitioning
from FLUSH->DISABLE since we assign state to psr->state right
above the skip condition.
Reported-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Reviewed-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
parent d2f12adc
...@@ -71,11 +71,13 @@ static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state) ...@@ -71,11 +71,13 @@ static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state)
if (state == psr->state || !psr->active) if (state == psr->state || !psr->active)
return; return;
psr->state = state;
/* Already disabled in flush, change the state, but not the hardware */ /* Already disabled in flush, change the state, but not the hardware */
if (state == PSR_DISABLE && psr->state == PSR_FLUSH) if (state == PSR_DISABLE && psr->state == PSR_FLUSH) {
psr->state = state;
return; return;
}
psr->state = state;
/* Actually commit the state change to hardware */ /* Actually commit the state change to hardware */
switch (psr->state) { switch (psr->state) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment