summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2011-12-21 11:58:17 -0500
committerDave Airlie <airlied@redhat.com>2011-12-22 12:28:01 +0000
commit77e00f2ea94abee1ad13bdfde19cf7aa25992b0e (patch)
tree50e78e51501effeb8f7a474d08d65d3d9fabe78c /drivers
parentb9e26dfdad5a4f9cbdaacafac6998614cc9c41bc (diff)
downloadlinux-3.10-77e00f2ea94abee1ad13bdfde19cf7aa25992b0e.tar.gz
linux-3.10-77e00f2ea94abee1ad13bdfde19cf7aa25992b0e.tar.bz2
linux-3.10-77e00f2ea94abee1ad13bdfde19cf7aa25992b0e.zip
drm/radeon/kms: bail on BTC parts if MC ucode is missing
We already do this for cayman, need to also do it for BTC parts. The default memory and voltage setup is not adequate for advanced operation. Continuing will result in an unusable display. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@kernel.org Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/evergreen.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 5e00d1670aa..92c9628c572 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -3276,6 +3276,18 @@ int evergreen_init(struct radeon_device *rdev)
rdev->accel_working = false;
}
}
+
+ /* Don't start up if the MC ucode is missing on BTC parts.
+ * The default clocks and voltages before the MC ucode
+ * is loaded are not suffient for advanced operations.
+ */
+ if (ASIC_IS_DCE5(rdev)) {
+ if (!rdev->mc_fw && !(rdev->flags & RADEON_IS_IGP)) {
+ DRM_ERROR("radeon: MC ucode required for NI+.\n");
+ return -EINVAL;
+ }
+ }
+
return 0;
}