From patchwork Wed Jul 14 18:39:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Joachim X-Patchwork-Id: 112268 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6FGSx1E014654 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 15 Jul 2010 16:29:36 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OZRHz-00024f-Tv; Thu, 15 Jul 2010 16:27:59 +0000 Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.123] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OZ6rh-0002uk-96 for dri-devel@lists.sourceforge.net; Wed, 14 Jul 2010 18:39:29 +0000 Received-SPF: pass (sfi-mx-3.v28.ch3.sourceforge.com: domain of gmx.de designates 213.165.64.20 as permitted sender) client-ip=213.165.64.20; envelope-from=svenjoac@gmx.de; helo=mail.gmx.net; Received: from mail.gmx.net ([213.165.64.20]) by sfi-mx-3.v28.ch3.sourceforge.com with smtp (Exim 4.69) id 1OZ6rg-0003ke-65 for dri-devel@lists.sourceforge.net; Wed, 14 Jul 2010 18:39:29 +0000 Received: (qmail invoked by alias); 14 Jul 2010 18:39:21 -0000 Received: from p5486233C.dip.t-dialin.net (EHLO turtle.gmx.de) [84.134.35.60] by mail.gmx.net (mp008) with SMTP; 14 Jul 2010 20:39:21 +0200 X-Authenticated: #28250155 X-Provags-ID: V01U2FsdGVkX1+D7RgZzJaDuXfSizroerZBb/1xKvtbTG/JQFThSM O339Cib0yDC83C Received: by turtle.gmx.de (Postfix, from userid 1000) id DC7343F457; Wed, 14 Jul 2010 20:39:19 +0200 (CEST) From: Sven Joachim To: dri-devel@lists.sourceforge.net Subject: drm: refresh rate down to 60 Hz in 2.6.35-rc5 Date: Wed, 14 Jul 2010 20:39:19 +0200 Message-ID: <87vd8hkiw8.fsf@turtle.gmx.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2.50 (gnu/linux) MIME-Version: 1.0 X-Y-GMX-Trusted: 0 X-Spam-Score: -0.5 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record 1.0 AWL AWL: From: address is in the auto white-list X-Headers-End: 1OZ6rg-0003ke-65 X-Mailman-Approved-At: Thu, 15 Jul 2010 16:27:57 +0000 Cc: Dave Airlie , linux-kernel@vger.kernel.org X-BeenThere: dri-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 15 Jul 2010 16:29:36 +0000 (UTC) X-MIME-Autoconverted: from quoted-printable to 8bit by demeter.kernel.org id o6FGSx1E014654 diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 9c4717f..858fedc 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1377,10 +1377,24 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) quirks = edid_get_quirks(edid); - num_modes += add_established_modes(connector, edid); - num_modes += add_standard_modes(connector, edid); + /* + * EDID spec says modes should be preferred in this order: + * - preferred detailed mode + * - other detailed modes from base block + * - detailed modes from extension blocks + * - CVT 3-byte code modes + * - standard timing codes + * - established timing codes + * - modes inferred from GTF or CVT range information + * + * We don't quite implement this yet, but we're close. + * + * XXX order for additional mode types in extension blocks? + */ num_modes += add_detailed_info(connector, edid, quirks); num_modes += add_detailed_info_eedid(connector, edid, quirks); + num_modes += add_standard_modes(connector, edid); + num_modes += add_established_modes(connector, edid); if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75)) edid_fixup_preferred(connector, quirks);