viafb: reorder initialization for dual framebuffer mode
This patch reorders the initialization for dual framebuffer mode to not ignore the settings for the first mode. Previously they were overwritten with the settings for the second one before they were applied. This should have no effect on non dual framebuffer mode and do what the user intended (initalization to desired modes) in dual framebuffer mode. Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: Scott Fang <ScottFang@viatech.com.cn> Cc: Joseph Chan <JosephChan@via.com.tw> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
d8566b29e8
commit
7cf607923d
1 changed files with 3 additions and 3 deletions
|
@ -1960,6 +1960,9 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
|
|||
default_var.lower_margin = 4;
|
||||
default_var.hsync_len = default_var.left_margin;
|
||||
default_var.vsync_len = 4;
|
||||
viafb_setup_fixinfo(&viafbinfo->fix, viaparinfo);
|
||||
viafb_check_var(&default_var, viafbinfo);
|
||||
viafbinfo->var = default_var;
|
||||
|
||||
if (viafb_dual_fb) {
|
||||
viafbinfo1 = framebuffer_alloc(viafb_par_length, &pdev->dev);
|
||||
|
@ -2015,9 +2018,6 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
|
|||
&viafbinfo1->fix);
|
||||
}
|
||||
|
||||
viafb_setup_fixinfo(&viafbinfo->fix, viaparinfo);
|
||||
viafb_check_var(&default_var, viafbinfo);
|
||||
viafbinfo->var = default_var;
|
||||
viafb_update_fix(viafbinfo);
|
||||
viaparinfo->depth = fb_get_color_depth(&viafbinfo->var,
|
||||
&viafbinfo->fix);
|
||||
|
|
Loading…
Add table
Reference in a new issue