projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
console
/
fbcon.c
diff --git
a/drivers/video/console/fbcon.c
b/drivers/video/console/fbcon.c
index 7ccc967831f05bca5aba179bb88ff7880f55b92f..9c092b8d64e6a5d0a205a71002afa5f917adf20b 100644
(file)
--- a/
drivers/video/console/fbcon.c
+++ b/
drivers/video/console/fbcon.c
@@
-375,14
+375,14
@@
static void fb_flashcursor(struct work_struct *work)
int c;
int mode;
int c;
int mode;
-
acquire_console_sem
();
+
console_lock
();
if (ops && ops->currcon != -1)
vc = vc_cons[ops->currcon].d;
if (!vc || !CON_IS_VISIBLE(vc) ||
registered_fb[con2fb_map[vc->vc_num]] != info ||
vc->vc_deccm != 1) {
if (ops && ops->currcon != -1)
vc = vc_cons[ops->currcon].d;
if (!vc || !CON_IS_VISIBLE(vc) ||
registered_fb[con2fb_map[vc->vc_num]] != info ||
vc->vc_deccm != 1) {
-
release_console_sem
();
+
console_unlock
();
return;
}
return;
}
@@
-392,7
+392,7
@@
static void fb_flashcursor(struct work_struct *work)
CM_ERASE : CM_DRAW;
ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
get_color(vc, info, c, 0));
CM_ERASE : CM_DRAW;
ops->cursor(vc, info, mode, softback_lines, get_color(vc, info, c, 1),
get_color(vc, info, c, 0));
-
release_console_sem
();
+
console_unlock
();
}
static void cursor_timer_handler(unsigned long dev_addr)
}
static void cursor_timer_handler(unsigned long dev_addr)
@@
-836,7
+836,7
@@
static int set_con2fb_map(int unit, int newidx, int user)
found = search_fb_in_map(newidx);
found = search_fb_in_map(newidx);
-
acquire_console_sem
();
+
console_lock
();
con2fb_map[unit] = newidx;
if (!err && !found)
err = con2fb_acquire_newinfo(vc, info, unit, oldidx);
con2fb_map[unit] = newidx;
if (!err && !found)
err = con2fb_acquire_newinfo(vc, info, unit, oldidx);
@@
-863,7
+863,7
@@
static int set_con2fb_map(int unit, int newidx, int user)
if (!search_fb_in_map(info_idx))
info_idx = newidx;
if (!search_fb_in_map(info_idx))
info_idx = newidx;
-
release_console_sem
();
+
console_unlock
();
return err;
}
return err;
}
@@
-3321,7
+3321,7
@@
static ssize_t store_rotate(struct device *device,
if (fbcon_has_exited)
return count;
if (fbcon_has_exited)
return count;
-
acquire_console_sem
();
+
console_lock
();
idx = con2fb_map[fg_console];
if (idx == -1 || registered_fb[idx] == NULL)
idx = con2fb_map[fg_console];
if (idx == -1 || registered_fb[idx] == NULL)
@@
-3331,7
+3331,7
@@
static ssize_t store_rotate(struct device *device,
rotate = simple_strtoul(buf, last, 0);
fbcon_rotate(info, rotate);
err:
rotate = simple_strtoul(buf, last, 0);
fbcon_rotate(info, rotate);
err:
-
release_console_sem
();
+
console_unlock
();
return count;
}
return count;
}
@@
-3346,7
+3346,7
@@
static ssize_t store_rotate_all(struct device *device,
if (fbcon_has_exited)
return count;
if (fbcon_has_exited)
return count;
-
acquire_console_sem
();
+
console_lock
();
idx = con2fb_map[fg_console];
if (idx == -1 || registered_fb[idx] == NULL)
idx = con2fb_map[fg_console];
if (idx == -1 || registered_fb[idx] == NULL)
@@
-3356,7
+3356,7
@@
static ssize_t store_rotate_all(struct device *device,
rotate = simple_strtoul(buf, last, 0);
fbcon_rotate_all(info, rotate);
err:
rotate = simple_strtoul(buf, last, 0);
fbcon_rotate_all(info, rotate);
err:
-
release_console_sem
();
+
console_unlock
();
return count;
}
return count;
}
@@
-3369,7
+3369,7
@@
static ssize_t show_rotate(struct device *device,
if (fbcon_has_exited)
return 0;
if (fbcon_has_exited)
return 0;
-
acquire_console_sem
();
+
console_lock
();
idx = con2fb_map[fg_console];
if (idx == -1 || registered_fb[idx] == NULL)
idx = con2fb_map[fg_console];
if (idx == -1 || registered_fb[idx] == NULL)
@@
-3378,7
+3378,7
@@
static ssize_t show_rotate(struct device *device,
info = registered_fb[idx];
rotate = fbcon_get_rotate(info);
err:
info = registered_fb[idx];
rotate = fbcon_get_rotate(info);
err:
-
release_console_sem
();
+
console_unlock
();
return snprintf(buf, PAGE_SIZE, "%d\n", rotate);
}
return snprintf(buf, PAGE_SIZE, "%d\n", rotate);
}
@@
-3392,7
+3392,7
@@
static ssize_t show_cursor_blink(struct device *device,
if (fbcon_has_exited)
return 0;
if (fbcon_has_exited)
return 0;
-
acquire_console_sem
();
+
console_lock
();
idx = con2fb_map[fg_console];
if (idx == -1 || registered_fb[idx] == NULL)
idx = con2fb_map[fg_console];
if (idx == -1 || registered_fb[idx] == NULL)
@@
-3406,7
+3406,7
@@
static ssize_t show_cursor_blink(struct device *device,
blink = (ops->flags & FBCON_FLAGS_CURSOR_TIMER) ? 1 : 0;
err:
blink = (ops->flags & FBCON_FLAGS_CURSOR_TIMER) ? 1 : 0;
err:
-
release_console_sem
();
+
console_unlock
();
return snprintf(buf, PAGE_SIZE, "%d\n", blink);
}
return snprintf(buf, PAGE_SIZE, "%d\n", blink);
}
@@
-3421,7
+3421,7
@@
static ssize_t store_cursor_blink(struct device *device,
if (fbcon_has_exited)
return count;
if (fbcon_has_exited)
return count;
-
acquire_console_sem
();
+
console_lock
();
idx = con2fb_map[fg_console];
if (idx == -1 || registered_fb[idx] == NULL)
idx = con2fb_map[fg_console];
if (idx == -1 || registered_fb[idx] == NULL)
@@
-3443,7
+3443,7
@@
static ssize_t store_cursor_blink(struct device *device,
}
err:
}
err:
-
release_console_sem
();
+
console_unlock
();
return count;
}
return count;
}
@@
-3482,7
+3482,7
@@
static void fbcon_start(void)
if (num_registered_fb) {
int i;
if (num_registered_fb) {
int i;
-
acquire_console_sem
();
+
console_lock
();
for (i = 0; i < FB_MAX; i++) {
if (registered_fb[i] != NULL) {
for (i = 0; i < FB_MAX; i++) {
if (registered_fb[i] != NULL) {
@@
-3491,7
+3491,7
@@
static void fbcon_start(void)
}
}
}
}
-
release_console_sem
();
+
console_unlock
();
fbcon_takeover(0);
}
}
fbcon_takeover(0);
}
}
@@
-3552,7
+3552,7
@@
static int __init fb_console_init(void)
{
int i;
{
int i;
-
acquire_console_sem
();
+
console_lock
();
fb_register_client(&fbcon_event_notifier);
fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
"fbcon");
fb_register_client(&fbcon_event_notifier);
fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
"fbcon");
@@
-3568,7
+3568,7
@@
static int __init fb_console_init(void)
for (i = 0; i < MAX_NR_CONSOLES; i++)
con2fb_map[i] = -1;
for (i = 0; i < MAX_NR_CONSOLES; i++)
con2fb_map[i] = -1;
-
release_console_sem
();
+
console_unlock
();
fbcon_start();
return 0;
}
fbcon_start();
return 0;
}
@@
-3591,12
+3591,12
@@
static void __exit fbcon_deinit_device(void)
static void __exit fb_console_exit(void)
{
static void __exit fb_console_exit(void)
{
-
acquire_console_sem
();
+
console_lock
();
fb_unregister_client(&fbcon_event_notifier);
fbcon_deinit_device();
device_destroy(fb_class, MKDEV(0, 0));
fbcon_exit();
fb_unregister_client(&fbcon_event_notifier);
fbcon_deinit_device();
device_destroy(fb_class, MKDEV(0, 0));
fbcon_exit();
-
release_console_sem
();
+
console_unlock
();
unregister_con_driver(&fb_con);
}
unregister_con_driver(&fb_con);
}