Attachment 44795 Details for Bug 35502 – Updated patch (#3)

[patch] Updated patch (#3)

radeon.diff (text/plain), 1.62 KB, created by John Lindgren on 2011-03-24 16:16:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Lindgren

Created: 2011-03-24 16:16:39 UTC

Size: 1.62 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
>index 02d5c41..99768d9 100644
>--- a/drivers/gpu/drm/radeon/radeon_atombios.c
>+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
>@@ -675,7 +675,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) {
> 								switch (record->ucRecordType) {
> 								case ATOM_ENCODER_CAP_RECORD_TYPE:
>@@ -720,7 +721,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
> 									break;
> 							}
> 
>-							while (record->ucRecordType > 0 &&
>+							while (record->ucRecordSize > 0 &&
>+							       record->ucRecordType > 0 &&
> 							       record->ucRecordType <= ATOM_MAX_OBJECT_RECORD_NUMBER) {
> 								switch (record->ucRecordType) {
> 								case ATOM_I2C_RECORD_TYPE:
>@@ -782,10 +784,9 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
> 						ATOM_HPD_INT_RECORD *hpd_record;
> 						ATOM_I2C_ID_CONFIG_ACCESS *i2c_config;
> 
>-						while (record->ucRecordType > 0
>-						       && record->
>-						       ucRecordType <=
>-						       ATOM_MAX_OBJECT_RECORD_NUMBER) {
>+						while (record->ucRecordSize > 0 &&
>+						       record->ucRecordType > 0 &&
>+						       record->ucRecordType <= ATOM_MAX_OBJECT_RECORD_NUMBER) {
> 							switch (record->ucRecordType) {
> 							case ATOM_I2C_RECORD_TYPE:
> 								i2c_record =

Actions: View | Splinter Review

Attachments on bug 35502: 44669 | 44725 | 44731 | 44795

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.