Root/
Source at commit fd6b4ce created 12 years 7 months ago. By Xiangfu Liu, ben nanonote: forward patches to linux-3.0 | |
---|---|
1 | From c7700fa672bf0a171ceb9f4b092de33e3b306243 Mon Sep 17 00:00:00 2001 |
2 | From: Lars-Peter Clausen <lars@metafoo.de> |
3 | Date: Sat, 24 Apr 2010 12:23:28 +0200 |
4 | Subject: [PATCH 14/29] Framebuffer notifier: Call notifier callbacks prior to blanking the screen |
5 | |
6 | --- |
7 | drivers/video/fbmem.c | 8 ++++++-- |
8 | 1 files changed, 6 insertions(+), 2 deletions(-) |
9 | |
10 | diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c |
11 | index 5aac00e..b1beaa7 100644 |
12 | --- a/drivers/video/fbmem.c |
13 | +++ b/drivers/video/fbmem.c |
14 | @@ -1032,12 +1032,12 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) |
15 | int |
16 | fb_blank(struct fb_info *info, int blank) |
17 | { |
18 | - int ret = -EINVAL; |
19 | + int ret = 0; |
20 | |
21 | if (blank > FB_BLANK_POWERDOWN) |
22 | blank = FB_BLANK_POWERDOWN; |
23 | |
24 | - if (info->fbops->fb_blank) |
25 | + if (info->fbops->fb_blank && blank == FB_BLANK_UNBLANK) |
26 | ret = info->fbops->fb_blank(blank, info); |
27 | |
28 | if (!ret) { |
29 | @@ -1048,6 +1048,10 @@ fb_blank(struct fb_info *info, int blank) |
30 | fb_notifier_call_chain(FB_EVENT_BLANK, &event); |
31 | } |
32 | |
33 | + if (info->fbops->fb_blank && blank != FB_BLANK_UNBLANK) |
34 | + ret = info->fbops->fb_blank(blank, info); |
35 | + |
36 | + |
37 | return ret; |
38 | } |
39 | |
40 | -- |
41 | 1.7.4.1 |
42 | |
43 |