leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ati_radeon: return with error when emulator fails

Browse Source 
Console was being switched to video even if emulator fails and
causing this hang:

               Scanning PCI bus 04
        04  00  1095  3132  0104  00
    PCIE3 on bus 03 - 04
Video: ATI Radeon video card (1002, 5b60) found @(2:0:0)
videoboot: Booting PCI video card bus 2, function 0, device 0
videoboot: Video ROM failed to map!
640x480x8 31kHz 59Hz
radeonfb: FIFO Timeout !

Signed-off-by: Ed Swarthout <Ed.Swarthout@freescale.com>
Tested-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Ed Swarthout 2010-03-31 09:54:28 -05:00 committed by Anatolij Gustschin
parent d5011762f5
commit 9624f6d9eb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/bios_emulator/atibios.c
View File

@ -315,7 +315,8 @@ int BootVideoCardBIOS(pci_dev_t pcidev, BE_VGAInfo ** pVGAInfo, int cleanUp)
BE_init(0, 65536, VGAInfo, 0);
/*Post all the display controller BIOS'es*/
PCI_postController(pcidev, VGAInfo);
if (!PCI_postController(pcidev, VGAInfo))
return false;
/*Cleanup and exit the emulator if requested. If the BIOS emulator
is needed after booting the card, we will not call BE_exit and

3
drivers/video/ati_radeon_fb.c
View File

@ -597,7 +597,8 @@ int radeon_probe(struct radeonfb_info *rinfo)
rinfo->fb_local_base = INREG(MC_FB_LOCATION) << 16;
DPRINT("rinfo->fb_local_base = 0x%x\n",rinfo->fb_local_base);
/* PostBIOS with x86 emulater */
BootVideoCardBIOS(pdev, NULL, 0);
if (!BootVideoCardBIOS(pdev, NULL, 0))
return -1;
/*
* Check for errata