diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2007-11-20 08:19:56 -0700 |
| commit | f92edbd8a0ef16a2b9127cbb564c09685728e4b0 (patch) | |
| tree | ae33aacff092561e2c64eabc11a8adc5e2acea6b /drivers/ati_radeon_fb.c | |
| parent | efe33035acd5f7c13963a4d52e5aac1b68612ae4 (diff) | |
| parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
| download | u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.zip u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.gz u-boot-imx-f92edbd8a0ef16a2b9127cbb564c09685728e4b0.tar.bz2 | |
Merge branch 'origin' into kconfig-for-1.3.1
Diffstat (limited to 'drivers/ati_radeon_fb.c')
| -rw-r--r-- | drivers/ati_radeon_fb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/ati_radeon_fb.c b/drivers/ati_radeon_fb.c index c174f37..9613d80 100644 --- a/drivers/ati_radeon_fb.c +++ b/drivers/ati_radeon_fb.c @@ -300,7 +300,7 @@ typedef struct { u32 val; } reg_val; - +#if 0 /* unused ? -> scheduled for removal */ /* these common regs are cleared before mode setting so they do not * interfere with anything */ @@ -316,11 +316,10 @@ static reg_val common_regs[] = { { CAP0_TRIG_CNTL, 0 }, { CAP1_TRIG_CNTL, 0 }, }; - +#endif /* 0 */ void radeon_setmode(void) { - int i; struct radeon_regs *mode = malloc(sizeof(struct radeon_regs)); mode->crtc_gen_cntl = 0x03000200; @@ -351,6 +350,9 @@ void radeon_setmode(void) radeon_write_pll_regs(rinfo, mode); } +#include "bios_emulator/include/biosemu.h" +extern int BootVideoCardBIOS(pci_dev_t pcidev, BE_VGAInfo ** pVGAInfo, int cleanUp); + int radeon_probe(struct radeonfb_info *rinfo) { pci_dev_t pdev; |