diff options
author | Dave Airlie <airlied@redhat.com> | 2009-11-30 23:06:31 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-01 20:37:17 -0500 |
commit | 72542d77058bd45ccafd1e15ed3c70349fe3277b (patch) | |
tree | 11390360e6c0f250915a2bc202f94a2fb86a3958 /drivers/gpu/drm/radeon/r420.c | |
parent | 4b30b87042aa71ed8682e4df622a10456796fccd (diff) |
drm/radeon/kms: ignore unposted GPUs with no BIOS.
If we find a GPU but we can't find its BIOS and it isn't posted,
then ignore it.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r420.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r420.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index e7e4f5a90ebe..e7c34776a013 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c | |||
@@ -301,14 +301,9 @@ int r420_init(struct radeon_device *rdev) | |||
301 | RREG32(R_0007C0_CP_STAT)); | 301 | RREG32(R_0007C0_CP_STAT)); |
302 | } | 302 | } |
303 | /* check if cards are posted or not */ | 303 | /* check if cards are posted or not */ |
304 | if (!radeon_card_posted(rdev) && rdev->bios) { | 304 | if (radeon_boot_test_post_card(rdev) == false) |
305 | DRM_INFO("GPU not posted. posting now...\n"); | 305 | return -EINVAL; |
306 | if (rdev->is_atom_bios) { | 306 | |
307 | atom_asic_init(rdev->mode_info.atom_context); | ||
308 | } else { | ||
309 | radeon_combios_asic_init(rdev->ddev); | ||
310 | } | ||
311 | } | ||
312 | /* Initialize clocks */ | 307 | /* Initialize clocks */ |
313 | radeon_get_clock_info(rdev->ddev); | 308 | radeon_get_clock_info(rdev->ddev); |
314 | /* Initialize power management */ | 309 | /* Initialize power management */ |