Commit 7cf60792 authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat Committed by Linus Torvalds

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: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d8566b29
...@@ -1960,6 +1960,9 @@ static int __devinit via_pci_probe(struct pci_dev *pdev, ...@@ -1960,6 +1960,9 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
default_var.lower_margin = 4; default_var.lower_margin = 4;
default_var.hsync_len = default_var.left_margin; default_var.hsync_len = default_var.left_margin;
default_var.vsync_len = 4; 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) { if (viafb_dual_fb) {
viafbinfo1 = framebuffer_alloc(viafb_par_length, &pdev->dev); viafbinfo1 = framebuffer_alloc(viafb_par_length, &pdev->dev);
...@@ -2015,9 +2018,6 @@ static int __devinit via_pci_probe(struct pci_dev *pdev, ...@@ -2015,9 +2018,6 @@ static int __devinit via_pci_probe(struct pci_dev *pdev,
&viafbinfo1->fix); &viafbinfo1->fix);
} }
viafb_setup_fixinfo(&viafbinfo->fix, viaparinfo);
viafb_check_var(&default_var, viafbinfo);
viafbinfo->var = default_var;
viafb_update_fix(viafbinfo); viafb_update_fix(viafbinfo);
viaparinfo->depth = fb_get_color_depth(&viafbinfo->var, viaparinfo->depth = fb_get_color_depth(&viafbinfo->var,
&viafbinfo->fix); &viafbinfo->fix);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment