commit
054430e773c9a1e26f38e30156eff02dedfffc17 upstream.
Okay so Alan's patch handled the case where there was no registered fbcon,
however the other path entered in set_con2fb_map pit.
In there we called fbcon_takeover, but we also took the console lock in a couple
of places. So push the console lock out to the callers of set_con2fb_map,
this means fbmem and switcheroo needed to take the lock around the fb notifier
entry points that lead to this.
This should fix the efifb regression seen by Maarten.
Tested-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Tested-by: Lu Hua <huax.lu@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
#include <linux/fb.h>
#include <linux/pci.h>
#include <linux/fb.h>
#include <linux/pci.h>
+#include <linux/console.h>
#include <linux/vga_switcheroo.h>
#include <linux/vgaarb.h>
#include <linux/vga_switcheroo.h>
#include <linux/vgaarb.h>
if (new_client->fb_info) {
struct fb_event event;
if (new_client->fb_info) {
struct fb_event event;
event.info = new_client->fb_info;
fb_notifier_call_chain(FB_EVENT_REMAP_ALL_CONSOLE, &event);
event.info = new_client->fb_info;
fb_notifier_call_chain(FB_EVENT_REMAP_ALL_CONSOLE, &event);
}
ret = vgasr_priv.handler->switchto(new_client->id);
}
ret = vgasr_priv.handler->switchto(new_client->id);
*
* Maps a virtual console @unit to a frame buffer device
* @newidx.
*
* Maps a virtual console @unit to a frame buffer device
* @newidx.
+ *
+ * This should be called with the console lock held.
*/
static int set_con2fb_map(int unit, int newidx, int user)
{
*/
static int set_con2fb_map(int unit, int newidx, int user)
{
if (!search_for_mapped_con() || !con_is_bound(&fb_con)) {
info_idx = newidx;
if (!search_for_mapped_con() || !con_is_bound(&fb_con)) {
info_idx = newidx;
- return fbcon_takeover(0);
+ return do_fbcon_takeover(0);
found = search_fb_in_map(newidx);
found = search_fb_in_map(newidx);
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);
if (!search_fb_in_map(info_idx))
info_idx = newidx;
if (!search_fb_in_map(info_idx))
info_idx = newidx;
}
#endif /* CONFIG_VT_HW_CONSOLE_BINDING */
}
#endif /* CONFIG_VT_HW_CONSOLE_BINDING */
+/* called with console_lock held */
static int fbcon_fb_unbind(int idx)
{
int i, new_idx = -1, ret = 0;
static int fbcon_fb_unbind(int idx)
{
int i, new_idx = -1, ret = 0;
+/* called with console_lock held */
static int fbcon_fb_unregistered(struct fb_info *info)
{
int i, idx;
static int fbcon_fb_unregistered(struct fb_info *info)
{
int i, idx;
+/* called with console_lock held */
static void fbcon_remap_all(int idx)
{
int i;
static void fbcon_remap_all(int idx)
{
int i;
}
#endif /* CONFIG_FRAMEBUFFER_DETECT_PRIMARY */
}
#endif /* CONFIG_FRAMEBUFFER_DETECT_PRIMARY */
+/* called with console_lock held */
static int fbcon_fb_registered(struct fb_info *info)
{
int ret = 0, i, idx;
static int fbcon_fb_registered(struct fb_info *info)
{
int ret = 0, i, idx;
ret = fbcon_fb_unregistered(info);
break;
case FB_EVENT_SET_CONSOLE_MAP:
ret = fbcon_fb_unregistered(info);
break;
case FB_EVENT_SET_CONSOLE_MAP:
+ /* called with console lock held */
con2fb = event->data;
ret = set_con2fb_map(con2fb->console - 1,
con2fb->framebuffer, 1);
con2fb = event->data;
ret = set_con2fb_map(con2fb->console - 1,
con2fb->framebuffer, 1);
event.data = &con2fb;
if (!lock_fb_info(info))
return -ENODEV;
event.data = &con2fb;
if (!lock_fb_info(info))
return -ENODEV;
event.info = info;
ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
event.info = info;
ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
unlock_fb_info(info);
break;
case FBIOBLANK:
unlock_fb_info(info);
break;
case FBIOBLANK: