Merge branch 'gpu-switcher' of /ssd/git//linux-2.6 into drm-next-stage

[safe/jmp/linux-2.6] / drivers / gpu / drm / radeon / radeon_bios.c

diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index a34b909..5572404 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -445,6 +445,12 @@ bool radeon_get_bios(struct radeon_device *rdev)
                goto free_bios;
        }
 
+       tmp = RBIOS16(0x18);
+       if (RBIOS8(tmp + 0x14) != 0x0) {
+               DRM_INFO("Not an x86 BIOS ROM, not using.\n");
+               goto free_bios;
+       }
+
        rdev->bios_header_start = RBIOS16(0x48);
        if (!rdev->bios_header_start) {
                goto free_bios;