renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-26 19:44:21 +08:00
Code

AUO-K190x: add runtime-pm calls to controller init functions

Browse Source 
The controller init may be called from a context where the device
is runtime suspended, leading to a deadlock, as the controllers only
accepts the wakeup command when suspended.

Signed-off-by: Heiko Stübner <heiko@sntech.de>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Heiko Stübner 2013-03-22 15:13:37 +01:00 committed by Tomi Valkeinen
parent a1655100dd
commit 70f1e28e65
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/video/auo_k1900fb.c
View File

@ -60,9 +60,12 @@
static void auok1900_init(struct auok190xfb_par *par) static void auok1900_init(struct auok190xfb_par *par)
{ {
struct device *dev = par->info->device;
struct auok190x_board *board = par->board; struct auok190x_board *board = par->board;
u16 init_param = 0; u16 init_param = 0;
pm_runtime_get_sync(dev);
init_param |= AUOK1900_INIT_TEMP_AVERAGE; init_param |= AUOK1900_INIT_TEMP_AVERAGE;
init_param |= AUOK1900_INIT_ROTATE(par->rotation); init_param |= AUOK1900_INIT_ROTATE(par->rotation);
init_param |= AUOK190X_INIT_INVERSE_WHITE; init_param |= AUOK190X_INIT_INVERSE_WHITE;
@ -74,6 +77,9 @@ static void auok1900_init(struct auok190xfb_par *par)
/* let the controller finish */ /* let the controller finish */
board->wait_for_rdy(par); board->wait_for_rdy(par);
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev);
} }
static void auok1900_update_region(struct auok190xfb_par *par, int mode, static void auok1900_update_region(struct auok190xfb_par *par, int mode,

6
drivers/video/auo_k1901fb.c
View File

@ -101,9 +101,12 @@
static void auok1901_init(struct auok190xfb_par *par) static void auok1901_init(struct auok190xfb_par *par)
{ {
struct device *dev = par->info->device;
struct auok190x_board *board = par->board; struct auok190x_board *board = par->board;
u16 init_param = 0; u16 init_param = 0;
pm_runtime_get_sync(dev);
init_param |= AUOK190X_INIT_INVERSE_WHITE; init_param |= AUOK190X_INIT_INVERSE_WHITE;
init_param |= AUOK190X_INIT_FORMAT0; init_param |= AUOK190X_INIT_FORMAT0;
init_param |= AUOK1901_INIT_RESOLUTION(par->resolution); init_param |= AUOK1901_INIT_RESOLUTION(par->resolution);
@ -113,6 +116,9 @@ static void auok1901_init(struct auok190xfb_par *par)
/* let the controller finish */ /* let the controller finish */
board->wait_for_rdy(par); board->wait_for_rdy(par);
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev);
} }
static void auok1901_update_region(struct auok190xfb_par *par, int mode, static void auok1901_update_region(struct auok190xfb_par *par, int mode,