diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-06-11 09:45:30 +1000 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-12 20:59:05 -0700 |
| commit | 8d5f7b4353dae4c7ee342c61303372fd996ca161 (patch) | |
| tree | 8e82ed5ca2d5934947ca13771300599151d2b882 /drivers/video/aty/radeon_base.c | |
| parent | [PATCH] M68k: Mark Sun-3 NCR5380 SCSI broken (diff) | |
| download | linux-dev-8d5f7b4353dae4c7ee342c61303372fd996ca161.tar.xz linux-dev-8d5f7b4353dae4c7ee342c61303372fd996ca161.zip | |
[PATCH] radeonfb: don't blow up VGA console on load
The current radeonfb memset's the framebuffer to 0 when loaded. This
removes occasional artifacts but has the nasty side effect that if you
load radeonfb without framebuffer console, you destroy the VGA text
buffer, font, etc... radeon must not touch the framebuffer content when
it doesn't "own" it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/video/aty/radeon_base.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c index ee25b9e8db60..47a6b12bc968 100644 --- a/drivers/video/aty/radeon_base.c +++ b/drivers/video/aty/radeon_base.c @@ -2374,10 +2374,9 @@ static int radeonfb_pci_register (struct pci_dev *pdev, } while ( rinfo->fb_base == 0 && ((rinfo->mapped_vram /=2) >= MIN_MAPPED_VRAM) ); - if (rinfo->fb_base) - memset_io(rinfo->fb_base, 0, rinfo->mapped_vram); - else { - printk (KERN_ERR "radeonfb (%s): cannot map FB\n", pci_name(rinfo->pdev)); + if (rinfo->fb_base == NULL) { + printk (KERN_ERR "radeonfb (%s): cannot map FB\n", + pci_name(rinfo->pdev)); ret = -EIO; goto err_unmap_rom; } |