Re: [PATCH 3/3] fbcon: fix situation where fbcon gets deinitialised and can't reinit.

2010-12-23 Thread Paul Mundt 
On Tue, Dec 21, 2010 at 11:41:17AM +1000, Dave Airlie wrote:
 From: Dave Airlie airl...@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 airl...@redhat.com

This one looks fine, too. This does presumably depend on the change in
behaviour introduced by your 2/3 patch though. I'll hold off on applying
this until that one gets acked, then we can do this either for the next
-rc or for .38.

--
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and, 
should the need arise, upgrade to a full multi-node Oracle RAC database 
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel

[PATCH 3/3] fbcon: fix situation where fbcon gets deinitialised and can't reinit.

2010-12-20 Thread Dave Airlie 
From: Dave Airlie airl...@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 airl...@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


--
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
--
___
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel