From: Dave Airlie <airlied@gmail.com> To: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.sf.net, linux-kernel@vger.kernel.org, Dave Airlie <airlied@redhat.com> Subject: [PATCH 3/3] fbcon: fix situation where fbcon gets deinitialised and can't reinit. Date: Tue, 21 Dec 2010 11:41:17 +1000 [thread overview] Message-ID: <1292895677-4242-4-git-send-email-airlied@gmail.com> (raw) In-Reply-To: <1292895677-4242-1-git-send-email-airlied@gmail.com> From: Dave Airlie <airlied@redhat.com> Situation as follow: 2 GPUs + vesafb + kms. GPU 1 is primary, vesafb binds to it as fb0 radeon loads GPU 0 loads as fb1 GPU 1 loads, vesafb gets kicked off which causes fb0 to unbind console, which causes the dummy console to rebind. this means fbcon_deinit gets called, which calls fbcon_exit since the console isn't bound anymore and we set fbcon_has_exited. GPU 1 creates a new fb0 which is primary and we want to be console. fbcon_fb_registered gets called sets the primary up and calls set_con2fb_map, however as fbcon_has_exited is set nothing further ever happens. This patch bypasses the fbcon_has_exited and checks if the console is unbound, if its unbound it calls the fbcon_takeover which calls the vt layer to call the fbcon_startup method and everthing works. Signed-off-by: Dave Airlie <airlied@redhat.com> --- drivers/video/console/fbcon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 7ccc967..6662687 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -823,10 +823,10 @@ static int set_con2fb_map(int unit, int newidx, int user) if (oldidx == newidx) return 0; - if (!info || fbcon_has_exited) + if (!info) return -EINVAL; - if (!err && !search_for_mapped_con()) { + if (!search_for_mapped_con() || !con_is_bound(&fb_con)) { info_idx = newidx; return fbcon_takeover(0); } -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Dave Airlie <airlied@gmail.com> To: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.sf.net, linux-kernel@vger.kernel.org, Dave Airlie <airlied@redhat.com> Subject: [PATCH 3/3] fbcon: fix situation where fbcon gets deinitialised and can't reinit. Date: Tue, 21 Dec 2010 01:41:17 +0000 [thread overview] Message-ID: <1292895677-4242-4-git-send-email-airlied@gmail.com> (raw) In-Reply-To: <1292895677-4242-1-git-send-email-airlied@gmail.com> From: Dave Airlie <airlied@redhat.com> Situation as follow: 2 GPUs + vesafb + kms. GPU 1 is primary, vesafb binds to it as fb0 radeon loads GPU 0 loads as fb1 GPU 1 loads, vesafb gets kicked off which causes fb0 to unbind console, which causes the dummy console to rebind. this means fbcon_deinit gets called, which calls fbcon_exit since the console isn't bound anymore and we set fbcon_has_exited. GPU 1 creates a new fb0 which is primary and we want to be console. fbcon_fb_registered gets called sets the primary up and calls set_con2fb_map, however as fbcon_has_exited is set nothing further ever happens. This patch bypasses the fbcon_has_exited and checks if the console is unbound, if its unbound it calls the fbcon_takeover which calls the vt layer to call the fbcon_startup method and everthing works. Signed-off-by: Dave Airlie <airlied@redhat.com> --- drivers/video/console/fbcon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 7ccc967..6662687 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -823,10 +823,10 @@ static int set_con2fb_map(int unit, int newidx, int user) if (oldidx = newidx) return 0; - if (!info || fbcon_has_exited) + if (!info) return -EINVAL; - if (!err && !search_for_mapped_con()) { + if (!search_for_mapped_con() || !con_is_bound(&fb_con)) { info_idx = newidx; return fbcon_takeover(0); } -- 1.7.1
next prev parent reply other threads:[~2010-12-21 1:41 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-12-21 1:41 vt/fbcon binding and handover fixes Dave Airlie 2010-12-21 1:41 ` Dave Airlie 2010-12-21 1:41 ` [PATCH 1/3] fb: fix overlapping test off-by-one Dave Airlie 2010-12-21 1:41 ` Dave Airlie 2010-12-21 1:41 ` Dave Airlie 2010-12-21 1:41 ` Dave Airlie 2010-12-21 7:29 ` Michel Dänzer 2010-12-21 7:29 ` Michel Dänzer 2010-12-21 7:29 ` Michel Dänzer 2010-12-21 7:29 ` Michel Dänzer 2010-12-24 3:28 ` Paul Mundt 2010-12-24 3:28 ` Paul Mundt 2010-12-24 3:28 ` Paul Mundt 2010-12-24 3:28 ` Paul Mundt 2010-12-23 16:40 ` [PATCH] Update fbdev fb_fix_screeninfo James Simmons 2010-12-21 1:41 ` [PATCH 2/3] vt: fix issue when fbcon wants to takeover a second time Dave Airlie 2010-12-21 1:41 ` Dave Airlie 2010-12-21 1:41 ` Dave Airlie 2010-12-21 1:41 ` Dave Airlie 2011-01-06 23:57 ` Dave Airlie 2011-01-07 0:50 ` Greg KH 2011-01-07 0:52 ` Dave Airlie 2010-12-21 1:41 ` [PATCH 3/3] fbcon: fix situation where fbcon gets deinitialised and can't reinit Dave Airlie 2010-12-21 1:41 ` Dave Airlie [this message] 2010-12-21 1:41 ` Dave Airlie 2010-12-24 3:30 ` Paul Mundt 2010-12-24 3:30 ` Paul Mundt 2010-12-24 3:30 ` Paul Mundt 2010-12-24 3:30 ` Paul Mundt 2010-12-21 1:41 ` Dave Airlie
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1292895677-4242-4-git-send-email-airlied@gmail.com \ --to=airlied@gmail.com \ --cc=airlied@redhat.com \ --cc=dri-devel@lists.sf.net \ --cc=linux-fbdev@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.