diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-01 14:06:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-02 11:37:17 +1000 |
| commit | 72542d77058bd45ccafd1e15ed3c70349fe3277b (patch) | |
| tree | 11390360e6c0f250915a2bc202f94a2fb86a3958 /drivers/gpu/drm/radeon/r420.c | |
| parent | 4b30b87042aa71ed8682e4df622a10456796fccd (diff) | |
| download | blackbird-obmc-linux-72542d77058bd45ccafd1e15ed3c70349fe3277b.tar.gz blackbird-obmc-linux-72542d77058bd45ccafd1e15ed3c70349fe3277b.zip | |
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) RREG32(R_0007C0_CP_STAT)); } /* check if cards are posted or not */ - if (!radeon_card_posted(rdev) && rdev->bios) { - DRM_INFO("GPU not posted. posting now...\n"); - if (rdev->is_atom_bios) { - atom_asic_init(rdev->mode_info.atom_context); - } else { - radeon_combios_asic_init(rdev->ddev); - } - } + if (radeon_boot_test_post_card(rdev) == false) + return -EINVAL; + /* Initialize clocks */ radeon_get_clock_info(rdev->ddev); /* Initialize power management */ |
