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/r600.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/r600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 6 |
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) | |||
1631 | if (r) | 1631 | if (r) |
1632 | return r; | 1632 | return r; |
1633 | /* Post card if necessary */ | 1633 | /* Post card if necessary */ |
1634 | if (!r600_card_posted(rdev) && rdev->bios) { | 1634 | if (!r600_card_posted(rdev)) { |
1635 | if (!rdev->bios) { | ||
1636 | dev_err(rdev->dev, "Card not posted and no BIOS - ignoring\n"); | ||
1637 | return -EINVAL; | ||
1638 | } | ||
1635 | DRM_INFO("GPU not posted. posting now...\n"); | 1639 | DRM_INFO("GPU not posted. posting now...\n"); |
1636 | atom_asic_init(rdev->mode_info.atom_context); | 1640 | atom_asic_init(rdev->mode_info.atom_context); |
1637 | } | 1641 | } |