summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/rockchip
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2016-09-06 14:11:53 -0400
committerSean Paul <seanpaul@chromium.org>2016-09-21 06:55:49 -0700
commitbe91a983eaf272ed0a982e7c92b47e78d7ccc51a (patch)
treeaa77c44afc8752ea1320494c540b594e5bde9d84 /drivers/gpu/drm/rockchip
parentd2f12adc004dd83ce700ecaebabd4f802a586370 (diff)
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: Daniel Kurtz <djkurtz@chromium.org> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/rockchip')
-rw-r--r--drivers/gpu/drm/rockchip/rockchip_drm_psr.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
index 2cdd6eb359f2..a553e182ff53 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_psr.c
@@ -71,11 +71,13 @@ static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state)
if (state == psr->state || !psr->active)
return;
- psr->state = state;
-
/* 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;
+ }
+
+ psr->state = state;
/* Actually commit the state change to hardware */
switch (psr->state) {