diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-05-01 20:16:30 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-05-04 09:29:25 +1000 |
| commit | eaa4f5e1d0b816291a59a47917e569c0384f2b6f (patch) | |
| tree | befbb663805892aeccb458de70316d9d723abbc2 | |
| parent | e2c85d8e3974c9041ad7b080846b28d2243e771b (diff) | |
| download | linux-eaa4f5e1d0b816291a59a47917e569c0384f2b6f.tar.gz linux-eaa4f5e1d0b816291a59a47917e569c0384f2b6f.tar.bz2 linux-eaa4f5e1d0b816291a59a47917e569c0384f2b6f.zip | |
drm/radeon: fix regression on atom cards with hardcoded EDID record.
Since fafcf94e2b5732d1e13b440291c53115d2b172e9 introduced an edid size, it seems to have broken this path.
This manifest as oops on T500 Lenovo laptops with dual graphics primarily.
Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=33812
cc: stable@kernel.org
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_atombios.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index f5d12fb103fa..f116516bfef7 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -1599,9 +1599,10 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct memcpy((u8 *)edid, (u8 *)&fake_edid_record->ucFakeEDIDString[0], fake_edid_record->ucFakeEDIDLength); - if (drm_edid_is_valid(edid)) + if (drm_edid_is_valid(edid)) { rdev->mode_info.bios_hardcoded_edid = edid; - else + rdev->mode_info.bios_hardcoded_edid_size = edid_size; + } else kfree(edid); } } |