浏览代码

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>
Sean Paul 9 年之前
父节点
当前提交
be91a983ea
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      drivers/gpu/drm/rockchip/rockchip_drm_psr.c

+ 5 - 3
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) {