Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9a31f0f7679aeaf79c613feaa3f4170741ccb218
Commit:     9a31f0f7679aeaf79c613feaa3f4170741ccb218
Parent:     76c7d3ffe3acddf5619bd796e0b8fa5dc6ecdb39
Author:     Krzysztof Helt <[EMAIL PROTECTED]>
AuthorDate: Tue May 8 00:39:57 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue May 8 11:15:33 2007 -0700

    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: Krzysztof Helt <[EMAIL PROTECTED]>
    Signed-off-by: Antonino Daplas <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/video/pm2fb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 33f17a9..5395419 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -1141,10 +1141,10 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
                default_par->mem_control, default_par->boot_address,
                default_par->mem_config);
 
-       default_par->memclock = CVPPC_MEMCLOCK;
        if(default_par->mem_control == 0 &&
                default_par->boot_address == 0x31 &&
                default_par->mem_config == 0x259fffff) {
+               default_par->memclock = CVPPC_MEMCLOCK;
                default_par->mem_control=0;
                default_par->boot_address=0x20;
                default_par->mem_config=0xe6002021;
@@ -1164,7 +1164,7 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
                        DPRINTK("We have not been initialized by VGA BIOS "
                                "and are running on an 3dlabs reference 
board\n");
                        DPRINTK("Initializing card timings manually...\n");
-                       default_par->memclock=70000;
+                       default_par->memclock=74894;
                }
        }
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to