Commit 9a31f0f7 authored by Krzysztof Helt's avatar Krzysztof Helt Committed by Linus Torvalds

pm2fb: memclock setting corrections

This patch disables a memory clock setting if a board has been initialized by
BIOS.  This allows using the memory clock set by manufacturer of the board.

This patch also sets default clock for 3dlabs Permedia 2V reference board's
clock to 75MHz (BIOS setting for EONtronic Permedia 2Vboard), because the
default 83MHz can be too high.
Signed-off-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAntonino Daplas <adaplas@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 76c7d3ff
...@@ -1141,10 +1141,10 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, ...@@ -1141,10 +1141,10 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
default_par->mem_control, default_par->boot_address, default_par->mem_control, default_par->boot_address,
default_par->mem_config); default_par->mem_config);
default_par->memclock = CVPPC_MEMCLOCK;
if(default_par->mem_control == 0 && if(default_par->mem_control == 0 &&
default_par->boot_address == 0x31 && default_par->boot_address == 0x31 &&
default_par->mem_config == 0x259fffff) { default_par->mem_config == 0x259fffff) {
default_par->memclock = CVPPC_MEMCLOCK;
default_par->mem_control=0; default_par->mem_control=0;
default_par->boot_address=0x20; default_par->boot_address=0x20;
default_par->mem_config=0xe6002021; default_par->mem_config=0xe6002021;
...@@ -1164,7 +1164,7 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev, ...@@ -1164,7 +1164,7 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
DPRINTK("We have not been initialized by VGA BIOS " DPRINTK("We have not been initialized by VGA BIOS "
"and are running on an 3dlabs reference board\n"); "and are running on an 3dlabs reference board\n");
DPRINTK("Initializing card timings manually...\n"); DPRINTK("Initializing card timings manually...\n");
default_par->memclock=70000; default_par->memclock=74894;
} }
} }
......
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