Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 288089

Summary: fbcondecor patch failes on linux-2.6.31.2
Product: Gentoo Linux Reporter: Mike Pagano <mpagano>
Component: New packagesAssignee: Michal Januszewski (RETIRED) <spock>
Status: RESOLVED FIXED    
Severity: normal CC: kernel
Priority: High    
Version: unspecified   
Hardware: All   
OS: Linux   
Whiteboard:
Package list:
Runtime testing required: ---
Bug Depends on:    
Bug Blocks: 288018    
Attachments: patch for linux-2.6.31.2

Description Mike Pagano gentoo-dev 2009-10-07 18:10:32 UTC
Changes in drivers/video/console/fbcon.c in 2.6.31.2 prevent fbcondecor patch from applying

***************
*** 543,553 ****
    err = take_over_console(&fb_con, first_fb_vc, last_fb_vc,
                fbcon_is_default);

    if (err) {a
        for (i = first_fb_vc; i <= last_fb_vc; i++) {
            con2fb_map[i] = -1;
        }
        info_idx = -1;
    }

    return err;
--- 546,562 ----
    err = take_over_console(&fb_con, first_fb_vc, last_fb_vc,
                fbcon_is_default);

+   info = registered_fb[info_idx];
+
    if (err) {
        for (i = first_fb_vc; i <= last_fb_vc; i++) {
            con2fb_map[i] = -1;
        }
        info_idx = -1;
+   } else {
+       unlock_fb_info(info);
+       fbcon_decor_init();
+       lock_fb_info(info);
    }

    return err;
Comment 1 Mike Pagano gentoo-dev 2009-10-08 00:33:18 UTC
Created attachment 206394 [details, diff]
patch for linux-2.6.31.2
Comment 2 Michal Januszewski (RETIRED) gentoo-dev 2009-10-09 08:46:33 UTC
Thanks for the patch, it looks OK to me.  I have also just put up an updated patch on my website (just including this fix, so no need to update anything for gentoo-sources).