diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-01 05:06:31 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-02 02:37:17 +0100 |
| commit | 72542d77058bd45ccafd1e15ed3c70349fe3277b (patch) | |
| tree | 11390360e6c0f250915a2bc202f94a2fb86a3958 /drivers/gpu/drm/radeon/r300.c | |
| parent | drm/radeon/kms: fix divide by 0 in clocks code (diff) | |
| download | linux-72542d77058bd45ccafd1e15ed3c70349fe3277b.tar.xz 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/r300.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r300.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 9a5798544b42..430fc2a984b2 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -1309,10 +1309,8 @@ int r300_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"); - radeon_combios_asic_init(rdev->ddev); - } + if (radeon_boot_test_post_card(rdev) == false) + return -EINVAL; /* Set asic errata */ r300_errata(rdev); /* Initialize clocks */ |