[Bug,35502] Regression: black screen with Radeon KMS in 2.6.38 (2.6.37.4 worked fine)

Commit Message

[e-mail] March 22, 2011, 7:57 p.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c
b/drivers/gpu/drm/radeon/radeon_atombios.c
index a2dfe25..2525e86 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -679,7 +679,8 @@  bool
radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
                             ATOM_ENCODER_CAP_RECORD *cap_record;
                             u16 caps = 0;

-                            while (record->ucRecordType > 0 &&
+                            while (record->ucRecordSize > 0 &&
+                                   record->ucRecordType > 0 &&
                                    record->ucRecordType <=
ATOM_MAX_OBJECT_RECORD_NUMBER) {