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/r100.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/r100.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 772bcd863741..0862fa4b746d 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
@@ -3257,10 +3257,8 @@ int r100_init(struct radeon_device *rdev) | |||
3257 | RREG32(R_0007C0_CP_STAT)); | 3257 | RREG32(R_0007C0_CP_STAT)); |
3258 | } | 3258 | } |
3259 | /* check if cards are posted or not */ | 3259 | /* check if cards are posted or not */ |
3260 | if (!radeon_card_posted(rdev) && rdev->bios) { | 3260 | if (radeon_boot_test_post_card(rdev) == false) |
3261 | DRM_INFO("GPU not posted. posting now...\n"); | 3261 | return -EINVAL; |
3262 | radeon_combios_asic_init(rdev->ddev); | ||
3263 | } | ||
3264 | /* Set asic errata */ | 3262 | /* Set asic errata */ |
3265 | r100_errata(rdev); | 3263 | r100_errata(rdev); |
3266 | /* Initialize clocks */ | 3264 | /* Initialize clocks */ |