openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/rockchip: A couple small fixes to psr 

A few things that need tidying up, no functional changes.

Reviewed-by: Yakir Yang <ykk@rock-chips.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
This commit is contained in:
Sean Paul 2016-08-16 17:47:17 -07:00
parent eec85347c7
commit 46bdc64984
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/rockchip/rockchip_drm_psr.c
View File

@ -62,27 +62,25 @@ static void psr_set_state_locked(struct psr_drv *psr, enum psr_state state)
* Allowed finite state machine:
*
* PSR_ENABLE < = = = = = > PSR_FLUSH
* | ^ |
* | | |
* v | |
* | ^ |
* | | |
* v | |
* PSR_DISABLE < - - - - - - - - -
*/
/* Forbid no state change */
if (state == psr->state)
return;
/* Forbid DISABLE change to FLUSH */
/* Requesting a flush when disabled is a noop */
if (state == PSR_FLUSH && psr->state == PSR_DISABLE)
return;
psr->state = state;
/* Allow but no need hardware change, just need assign the state */
/* Already disabled in flush, change the state, but not the hardware */
if (state == PSR_DISABLE && psr->state == PSR_FLUSH)
return;
/* Refact to hardware state change */
/* Actually commit the state change to hardware */
switch (psr->state) {
case PSR_ENABLE:
psr->set(psr->encoder, true);
@ -109,10 +107,7 @@ static void psr_flush_handler(unsigned long data)
struct psr_drv *psr = (struct psr_drv *)data;
unsigned long flags;
if (!psr)
return;
/* State changed between flush time, then keep it */
/* If the state has changed since we initiated the flush, do nothing */
spin_lock_irqsave(&psr->lock, flags);
if (psr->state == PSR_FLUSH)
psr_set_state_locked(psr, PSR_ENABLE);