From patchwork Wed May 11 18:02:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 777862 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4BI2O16001212 for ; Wed, 11 May 2011 18:02:46 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D1E509EC2B for ; Wed, 11 May 2011 11:02:23 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qy0-f177.google.com (mail-qy0-f177.google.com [209.85.216.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 4504F9E789 for ; Wed, 11 May 2011 11:02:15 -0700 (PDT) Received: by qyl38 with SMTP id 38so512462qyl.15 for ; Wed, 11 May 2011 11:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=TLzf9RNgZv8tBRYFeHOsT0t41ftyLz0XYMDGDk2+UPs=; b=sZiAUWHDBfYMXzpANOnWQDBXw0R5PCGnOfzpw+/tN0vZBpxcnh8YwAJHBI3SOrwpKO SisHG771tT4WuEckcYZPnDyBsHUk2L2ZG+FuZ0cJ0KAkzxIG84nema6Va8DolbY8iQXj zOzSTbXg3yM5gLyyuhQ9shNDfAkNNiVpFIzy8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=U0aQpJt3bq2G55+ZASMm55fOQcr/8UtzkqNd0YMuTsauuXf1i/5UEtuMdn7lVvF/sP dR+O5WY0eVsFlZ/gmwlc0buSNiuOIRhjbxWr0/lzA/BZG6j+fo5y/vwP3MKN2Q+2wlKB MCuB5+5jAchJHlNadiTrlAV7ltkgxg0+xSLBw= Received: by 10.224.90.17 with SMTP id g17mr7767285qam.30.1305136934559; Wed, 11 May 2011 11:02:14 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id c27sm234055qck.22.2011.05.11.11.02.13 (version=SSLv3 cipher=OTHER); Wed, 11 May 2011 11:02:13 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix extended lvds info parsing Date: Wed, 11 May 2011 14:02:07 -0400 Message-Id: <1305136927-11205-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 Cc: stable@kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 11 May 2011 18:02:46 +0000 (UTC) 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 Cc: stable@kernel.org Reviewed-by: Jerome Glisse --- 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 7615aaa..fd6f4f3 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -1585,9 +1585,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: