diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-05-11 14:02:07 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-13 16:16:33 +1000 |
| commit | 05fa7ea7d23980de0014417a0e0af2048a0f9fc1 (patch) | |
| tree | 7b8d2727e7b142dd5e097a80ef7334a07b68a402 | |
| parent | d9282fca8a763be574a2fc20b2edcc6e132cbf90 (diff) | |
| download | linux-3.10-05fa7ea7d23980de0014417a0e0af2048a0f9fc1.tar.gz linux-3.10-05fa7ea7d23980de0014417a0e0af2048a0f9fc1.tar.bz2 linux-3.10-05fa7ea7d23980de0014417a0e0af2048a0f9fc1.zip | |
drm/radeon/kms: fix extended lvds info parsing
On rev <= 1.1 tables, the offset is absolute,
on newer tables, it's relative.
Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=700326
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_atombios.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index dd881d035f0..90dfb2b8cf0 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -1574,9 +1574,17 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct ATOM_FAKE_EDID_PATCH_RECORD *fake_edid_record; ATOM_PANEL_RESOLUTION_PATCH_RECORD *panel_res_record; bool bad_record = false; - u8 *record = (u8 *)(mode_info->atom_context->bios + - data_offset + - le16_to_cpu(lvds_info->info.usModePatchTableOffset)); + u8 *record; + + if ((frev == 1) && (crev < 2)) + /* absolute */ + record = (u8 *)(mode_info->atom_context->bios + + le16_to_cpu(lvds_info->info.usModePatchTableOffset)); + else + /* relative */ + record = (u8 *)(mode_info->atom_context->bios + + data_offset + + le16_to_cpu(lvds_info->info.usModePatchTableOffset)); while (*record != ATOM_RECORD_END_TYPE) { switch (*record) { case LCD_MODE_PATCH_RECORD_MODE_TYPE: |