aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r300.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-11-30 23:06:31 -0500
committerDave Airlie <airlied@redhat.com>2009-12-01 20:37:17 -0500
commit72542d77058bd45ccafd1e15ed3c70349fe3277b (patch)
tree11390360e6c0f250915a2bc202f94a2fb86a3958 /drivers/gpu/drm/radeon/r300.c
parent4b30b87042aa71ed8682e4df622a10456796fccd (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/r300.c')
-rw-r--r--drivers/gpu/drm/radeon/r300.c6
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)
1309 RREG32(R_0007C0_CP_STAT)); 1309 RREG32(R_0007C0_CP_STAT));
1310 } 1310 }
1311 /* check if cards are posted or not */ 1311 /* check if cards are posted or not */
1312 if (!radeon_card_posted(rdev) && rdev->bios) { 1312 if (radeon_boot_test_post_card(rdev) == false)
1313 DRM_INFO("GPU not posted. posting now...\n"); 1313 return -EINVAL;
1314 radeon_combios_asic_init(rdev->ddev);
1315 }
1316 /* Set asic errata */ 1314 /* Set asic errata */
1317 r300_errata(rdev); 1315 r300_errata(rdev);
1318 /* Initialize clocks */ 1316 /* Initialize clocks */