Skip to contentSkip to conversation

ati_radeon: return error with when emulator fails

PATCH New Ed Swarthout 2 participants 3 messages Mar 31, 2010 – Apr 8, 2010 Framebuffer layer

lore
Share & tools
lore

Ed Swarthout

author
#0 lore raw

PATCH 1/1 ati_radeon: return error with when emulator fails

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 <[email protected]>

---

I consider this a bug fix. I'm also sending an independent patch that fixes the problem that caused this error.

 drivers/bios_emulator/atibios.c |    3 ++-
 drivers/video/ati_radeon_fb.c   |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/bios_emulator/atibios.c +2 -1
index 5f9bd10..2881449 100644
@@ -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
drivers/video/ati_radeon_fb.c +2 -1
index 9ebb0b0..529ddae 100644
@@ -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
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH 1/1 ati_radeon: return error with when emulator fails

Quoted 6 lines · On Wed, 31 Mar 2010 09:54:28 -0500 Ed Swarthout <[email protected]>…

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
Quoted 7 lines

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 <[email protected]>
Tested-by Anatolij Gustschin <[email protected]>
#2 lore raw

PATCH 1/1 ati_radeon: return error with when emulator fails

In reply to Ed Swarthout
Quoted 13 lines · On Wed, 31 Mar 2010 09:54:28 -0500 Ed Swarthout <[email protected]>…

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 <[email protected]>
Quoted 8 lines

---

I consider this a bug fix. I'm also sending an independent patch that fixes the problem that caused this error.

 drivers/bios_emulator/atibios.c |    3 ++-
 drivers/video/ati_radeon_fb.c   |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Applied to u-boot-video/master. Thanks!

Anatolij