From c59fa08ee2cab8e5d88eecefa6178c53b802df48 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Sat, 15 May 2010 19:53:47 +0000 Subject: [PATCH] drm/edid: Fix 1024x768@85Hz Repored-by: Julien Cristau svn path=/dists/sid/linux-2.6/; revision=15687 --- debian/changelog | 1 + .../all/drm-edid-Fix-1024x768@85Hz.patch | 123 ++++++++++++++++++ debian/patches/series/13 | 1 + 3 files changed, 125 insertions(+) create mode 100644 debian/patches/bugfix/all/drm-edid-Fix-1024x768@85Hz.patch diff --git a/debian/changelog b/debian/changelog index d596ec561..2ec45727f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ linux-2.6 (2.6.32-13) UNRELEASED; urgency=low - r8169: fix broken register writes (Closes: #407217, #573007) - V4L/DVB: budget: Fix crash in case of failure to attach frontend (Closes: #575207) + * drm/edid: Fix 1024x768@85Hz. [ Ben Hutchings ] * linux-base: Fix typo in disk relabelling code (Closes: #580467) diff --git a/debian/patches/bugfix/all/drm-edid-Fix-1024x768@85Hz.patch b/debian/patches/bugfix/all/drm-edid-Fix-1024x768@85Hz.patch new file mode 100644 index 000000000..aae1fafbb --- /dev/null +++ b/debian/patches/bugfix/all/drm-edid-Fix-1024x768@85Hz.patch @@ -0,0 +1,123 @@ +Return-Path: +X-Original-To: maks@dual +Delivered-To: maks@dual +Received: from dual (localhost.localdomain [127.0.0.1]) + by dual (Postfix) with ESMTP id 6E49C240C6 + for ; Sat, 15 May 2010 21:45:52 +0200 (CEST) +X-Original-To: maks@stro.at +Delivered-To: maks@stro.at +Received: from baikonur.stro.at [213.239.196.228] + by dual with POP3 (fetchmail-6.3.16) + for (single-drop); Sat, 15 May 2010 21:45:52 +0200 (CEST) +Received: from master.debian.org (master.debian.org [70.103.162.29]) + by baikonur.stro.at (Postfix) with ESMTP id 430795C00A + for ; Sat, 15 May 2010 21:30:11 +0200 (CEST) +Received: from coloquinte.cristau.org ([91.121.16.100]) + by master.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) + (Exim 4.69) + (envelope-from ) + id 1ODNBm-0004tk-80 + for maks@stro.at; Sat, 15 May 2010 19:38:22 +0000 +Received: from radis.liafa.jussieu.fr (unknown [IPv6:2a01:e35:139e:7980:221:6aff:fe12:9638]) + (using TLSv1 with cipher AES256-SHA (256/256 bits)) + (No client certificate requested) + by coloquinte.cristau.org (Postfix) with ESMTPSA id 32F94BBA0 + for ; Sat, 15 May 2010 21:38:19 +0200 (CEST) +Received: from julien by radis.liafa.jussieu.fr with local (Exim 4.71) + (envelope-from ) + id 1ODNBi-0000CW-Da + for maks@debian.org; Sat, 15 May 2010 21:38:18 +0200 +Resent-From: Julien Cristau +Resent-Date: Sat, 15 May 2010 21:38:18 +0200 +Resent-Message-ID: <20100515193818.GY7781@radis.liafa.jussieu.fr> +Resent-To: maks@debian.org +X-Original-To: julien@cristau.org +Received: from coloquinte.cristau.org (localhost.localdomain [127.0.0.1]) + by coloquinte.cristau.org (Postfix) with ESMTP id 7BD26BBD5 + for ; Thu, 13 May 2010 20:56:14 +0200 (CEST) +Received: from toccata.ens-lyon.org (toccata.ens-lyon.org [140.77.166.68]) + (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by coloquinte.cristau.org (Postfix) with ESMTPS id AEC83BADD + for ; Thu, 13 May 2010 20:56:08 +0200 (CEST) +X-Virus-Scanned: Debian amavisd-new at toccata.ens-lyon.org +Received: from toccata.ens-lyon.org ([127.0.0.1]) + by localhost (toccata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id ZXs+ATNCvAZE for ; + Thu, 13 May 2010 20:55:56 +0200 (CEST) +Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) + by toccata.ens-lyon.org (Postfix) with ESMTP id 23FE2840B6 + for ; Thu, 13 May 2010 20:55:46 +0200 (CEST) +Received: from gabe.freedesktop.org (localhost [127.0.0.1]) + by gabe.freedesktop.org (Postfix) with ESMTP id 5FE809E84B + for ; Thu, 13 May 2010 11:55:45 -0700 (PDT) +X-Original-To: dri-devel@lists.freedesktop.org +Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) + by gabe.freedesktop.org (Postfix) with ESMTP id 5BF2C9E773 + for ; + Thu, 13 May 2010 11:55:30 -0700 (PDT) +Received: from int-mx08.intmail.prod.int.phx2.redhat.com + (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) + by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4DItTL9031581 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) + for ; Thu, 13 May 2010 14:55:30 -0400 +Received: from localhost.localdomain (ihatethathostname.lab.bos.redhat.com + [10.16.43.238]) + by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP + id o4DItSJc014462 + for ; Thu, 13 May 2010 14:55:28 -0400 +From: Adam Jackson +To: dri-devel@lists.freedesktop.org +Subject: [PATCH] drm/edid: Fix 1024x768@85Hz +Date: Thu, 13 May 2010 14:55:28 -0400 +Message-Id: <1273776928-16924-1-git-send-email-ajax@redhat.com> +X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 +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 +Content-Type: text/plain; charset="us-ascii" +Content-Transfer-Encoding: 7bit +Sender: dri-devel-bounces+julien.cristau=ens-lyon.org@lists.freedesktop.org +Errors-To: dri-devel-bounces+julien.cristau=ens-lyon.org@lists.freedesktop.org +X-Virus-Scanned: ClamAV using ClamSMTP +Content-Length: 1025 +Lines: 28 + +Having hsync both start and end on pixel 1072 ain't gonna work very +well. Matches the X server's list. + +Signed-off-by: Adam Jackson +--- + drivers/gpu/drm/drm_edid.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c +index 18f41d7..10348d3 100644 +--- a/drivers/gpu/drm/drm_edid.c ++++ b/drivers/gpu/drm/drm_edid.c +@@ -335,7 +335,7 @@ static struct drm_display_mode drm_dmt_modes[] = { + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, + /* 1024x768@85Hz */ + { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 94500, 1024, 1072, +- 1072, 1376, 0, 768, 769, 772, 808, 0, ++ 1168, 1376, 0, 768, 769, 772, 808, 0, + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, + /* 1152x864@75Hz */ + { DRM_MODE("1152x864", DRM_MODE_TYPE_DRIVER, 108000, 1152, 1216, +-- +1.7.0.1 + +_______________________________________________ +dri-devel mailing list +dri-devel@lists.freedesktop.org +http://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/debian/patches/series/13 b/debian/patches/series/13 index e8ca3f618..19d0bc4cb 100644 --- a/debian/patches/series/13 +++ b/debian/patches/series/13 @@ -30,3 +30,4 @@ + bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch + bugfix/all/libata-implement-on-demand-HPA-unlocking.patch + bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch ++ bugfix/all/drm-edid-Fix-1024x768@85Hz.patch