We want to unbind fbcon, but only fbcon and only if it's there. This was broken by the recent patch in 3.16-rc to kick out the vgacon driver. I've forgotten to push out the relevant fix from the machine used to create the kick vgacon patches.
Reported-by: Damien Lespiau <[email protected]> Cc: Damien Lespiau <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> --- tests/drv_module_reload | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/drv_module_reload b/tests/drv_module_reload index 66cd6bbb4545..5cbff891c2e9 100755 --- a/tests/drv_module_reload +++ b/tests/drv_module_reload @@ -10,13 +10,13 @@ SOURCE_DIR="$( dirname "${BASH_SOURCE[0]}" )" # no other drm service should be running, so we can just unbind -# vtcon0 is vga, vtcon1 fbcon and let's pray that won't change due to boot load -# time changes -if ! echo 0 > /sys/class/vtconsole/vtcon1/bind ; then - echo -e "no kms unload support" - echo "please enable CONFIG_VT_HW_CONSOLE_BINDING in the kernel" - exit 77 -fi +# we must kick away fbcon (but only fbcon) +for vtcon in /sys/class/vtconsole/vtcon*/ ; do + if grep "frame buffer device" $vtcon/name > /dev/null ; then + echo unbinding $vtcon: `cat $vtcon/name` + echo 0 > $vtcon/bind + fi +done # The sound driver uses our power well pkill alsactl -- 1.9.3 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
