Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83583
b: refs/heads/master
c: 40488db
h: refs/heads/master
i:
  83581: 417782b
  83579: b4bd51a
  83575: 224ae45
  83567: 7ec3302
  83551: 7f955f3
  83519: ecb7806
  83455: f3ddd42
v: v3
  • Loading branch information
Ben Dooks authored and Linus Torvalds committed Feb 6, 2008
1 parent 54c3930 commit 255167b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bc9c6a175fa8123587668c38959a105e3ccb6bbd
refs/heads/master: 40488db20e3f43e65f10747f9026fba7d59d29a3
15 changes: 9 additions & 6 deletions trunk/drivers/video/sm501fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1698,6 +1698,15 @@ static int sm501fb_suspend_fb(struct sm501fb_info *info,
if (par->screen.size == 0)
return 0;

/* blank the relevant interface to ensure unit power minimised */
(par->ops.fb_blank)(FB_BLANK_POWERDOWN, fbi);

/* tell console/fb driver we are suspending */

acquire_console_sem();
fb_set_suspend(fbi, 1);
release_console_sem();

/* backup copies in case chip is powered down over suspend */

par->store_fb = vmalloc(par->screen.size);
Expand All @@ -1717,12 +1726,6 @@ static int sm501fb_suspend_fb(struct sm501fb_info *info,

memcpy_fromio(par->store_fb, par->screen.k_addr, par->screen.size);
memcpy_fromio(par->store_cursor, par->cursor.k_addr, par->cursor.size);
/* blank the relevant interface to ensure unit power minimised */
(par->ops.fb_blank)(FB_BLANK_POWERDOWN, fbi);

acquire_console_sem();
fb_set_suspend(fbi, 1);
release_console_sem();

return 0;

Expand Down

0 comments on commit 255167b

Please sign in to comment.