summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/r600.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-12-01 05:06:31 +0100
committerDave Airlie <airlied@redhat.com>2009-12-02 02:37:17 +0100
commit72542d77058bd45ccafd1e15ed3c70349fe3277b (patch)
tree11390360e6c0f250915a2bc202f94a2fb86a3958 /drivers/gpu/drm/radeon/r600.c
parentdrm/radeon/kms: fix divide by 0 in clocks code (diff)
downloadlinux-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/r600.c')
-rw-r--r--drivers/gpu/drm/radeon/r600.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 797a36f9a0f4..3dbd93e44345 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -1631,7 +1631,11 @@ int r600_init(struct radeon_device *rdev)
if (r)
return r;
/* Post card if necessary */
- if (!r600_card_posted(rdev) && rdev->bios) {
+ if (!r600_card_posted(rdev)) {
+ if (!rdev->bios) {
+ dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n");
+ return -EINVAL;
+ }
DRM_INFO("GPU not posted. posting now...\n");
atom_asic_init(rdev->mode_info.atom_context);
}