]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
viafb: update fix before calculating depth
authorFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Tue, 13 Jul 2010 17:58:06 +0000 (17:58 +0000)
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Fri, 23 Jul 2010 14:41:06 +0000 (14:41 +0000)
viafb: update fix before calculating depth

As the depth calculation depends on information in fix it is saner to
do the update first.
No runtime change expected as the value visual in fix used never
changes to MONO.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Joseph Chan <JosephChan@via.com.tw>
drivers/video/via/viafbdev.c

index 1082541358f01aaa4799f4c287b700c7cd8eafee..ab395526455930a4a4dffb13ad133fa8d7eb1b69 100644 (file)
@@ -234,6 +234,7 @@ static int viafb_set_par(struct fb_info *info)
        struct VideoModeTable *vmode_entry, *vmode_entry1 = NULL;
        DEBUG_MSG(KERN_INFO "viafb_set_par!\n");
 
        struct VideoModeTable *vmode_entry, *vmode_entry1 = NULL;
        DEBUG_MSG(KERN_INFO "viafb_set_par!\n");
 
+       viafb_update_fix(info);
        viapar->depth = fb_get_color_depth(&info->var, &info->fix);
        viafb_update_device_setting(viafbinfo->var.xres, viafbinfo->var.yres,
                viafbinfo->var.bits_per_pixel, viafb_refresh, 0);
        viapar->depth = fb_get_color_depth(&info->var, &info->fix);
        viafb_update_device_setting(viafbinfo->var.xres, viafbinfo->var.yres,
                viafbinfo->var.bits_per_pixel, viafb_refresh, 0);
@@ -257,7 +258,6 @@ static int viafb_set_par(struct fb_info *info)
        }
 
        if (vmode_entry) {
        }
 
        if (vmode_entry) {
-               viafb_update_fix(info);
                if (viafb_dual_fb && viapar->iga_path == IGA2)
                        viafb_bpp1 = info->var.bits_per_pixel;
                else
                if (viafb_dual_fb && viapar->iga_path == IGA2)
                        viafb_bpp1 = info->var.bits_per_pixel;
                else