diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2013-07-29 13:49:25 +1000 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-08-12 10:46:52 +1000 |
| commit | 3d0bb5702c40c4ec0d2e32d4fa79731d8f266117 (patch) | |
| tree | c8144450479c25a27875ea7bbcaaa5fab1c35913 | |
| parent | 604781339b1dfdc0924c650d4c8c18dd7042d859 (diff) | |
match linux and don't error on igp_read_bios_from_vram failure
and a bit of cleanup while here
| -rw-r--r-- | sys/dev/pci/drm/radeon/radeon_bios.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/pci/drm/radeon/radeon_bios.c b/sys/dev/pci/drm/radeon/radeon_bios.c index af7d5d75461..248346c61dc 100644 --- a/sys/dev/pci/drm/radeon/radeon_bios.c +++ b/sys/dev/pci/drm/radeon/radeon_bios.c @@ -92,7 +92,6 @@ radeon_read_platform_bios(struct radeon_device *rdev) static bool igp_read_bios_from_vram(struct radeon_device *rdev) { uint8_t __iomem *bios; - bus_addr_t vram_base; bus_size_t size = 256 * 1024; /* ??? */ bus_space_handle_t bsh; bus_space_tag_t bst = rdev->memt; @@ -101,11 +100,9 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev) if (!radeon_card_posted(rdev)) return false; - vram_base = pci_conf_read(rdev->pc, rdev->pa_tag, PCI_MAPREG_START); - rdev->bios = NULL; - if (bus_space_map(bst, vram_base, size, BUS_SPACE_MAP_LINEAR, &bsh) != 0) + if (bus_space_map(bst, rdev->fb_aper_offset, size, BUS_SPACE_MAP_LINEAR, &bsh) != 0) return false; bios = bus_space_vaddr(rdev->memt, bsh); @@ -114,7 +111,6 @@ static bool igp_read_bios_from_vram(struct radeon_device *rdev) return false; } if (size == 0 || bios[0] != 0x55 || bios[1] != 0xaa) { - DRM_ERROR("bios size zero or checksum mismatch\n"); bus_space_unmap(bst, bsh, size); return false; } |