diff --git a/[refs] b/[refs] index 0dc8a3f4cec7..a6a4549bfb6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03047cdf724d8de9fbfd38b53d768c190225290f +refs/heads/master: e34398952e056bbd99f9099fae77be26e5c6aa78 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_bios.c b/trunk/drivers/gpu/drm/radeon/radeon_bios.c index 906921740c60..26856ed8d972 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_bios.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_bios.c @@ -411,6 +411,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;