diff options
| author | Florian Tobias Schandinat <[email protected]> | 2010-03-10 15:21:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-03-12 15:52:33 -0800 |
| commit | 7cf607923dee1898b9fc1e62568b79e7f785b995 (patch) | |
| tree | 86076119b2f2c92717d12851cd8a9454e01c620e | |
| parent | d8566b29e86ef3906dd6c0ea4a02c2a925748da5 (diff) | |
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 <[email protected]>
Cc: Scott Fang <[email protected]>
Cc: Joseph Chan <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
| -rw-r--r-- | drivers/video/via/viafbdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index 5f5b5e9ef500..4d955ca0a1d2 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c @@ -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); |