From patchwork Wed Jan 30 05:28:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Chiluk X-Patchwork-Id: 216787 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 441B12C0091 for ; Wed, 30 Jan 2013 20:13:46 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1U0TjX-0005YL-FF; Wed, 30 Jan 2013 09:13:31 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1U0QE4-0004lg-6B for kernel-team@lists.ubuntu.com; Wed, 30 Jan 2013 05:28:48 +0000 Received: from cpe-70-124-70-187.austin.res.rr.com ([70.124.70.187] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1U0QE3-0001aM-TS for kernel-team@lists.ubuntu.com; Wed, 30 Jan 2013 05:28:48 +0000 From: Dave Chiluk To: kernel-team@lists.ubuntu.com Subject: [PATCH 06/10] drm/edid: Add a workaround for 1366x768 HD panel Date: Tue, 29 Jan 2013 23:28:27 -0600 Message-Id: <1359523711-5875-7-git-send-email-chiluk@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359523711-5875-1-git-send-email-chiluk@canonical.com> References: <1359523711-5875-1-git-send-email-chiluk@canonical.com> X-Mailman-Approved-At: Wed, 30 Jan 2013 09:13:30 +0000 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Takashi Iwai BugLink: http://bugs.launchpad.net/bugs/1109112 HD panel (1366x768) found most commonly on laptops can't be represented exactly in CVT/DMT expression, which leads to 1368x768 instead, because 1366 can't be divided by 8. Add a hack to convert to 1366x768 manually as an exception. Signed-off-by: Takashi Iwai Acked-by: Adam Jackson Signed-off-by: Dave Airlie (cherry picked from commit c09dedb7a50e23f0166e0bbae61c75c7ec23cf7f) Signed-off-by: David Chiluk --- drivers/gpu/drm/drm_edid.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index b30fa70..8b72d9e 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1052,6 +1052,19 @@ drm_dmt_modes_for_range(struct drm_connector *connector, struct edid *edid, return modes; } +/* fix up 1366x768 mode from 1368x768; + * GFT/CVT can't express 1366 width which isn't dividable by 8 + */ +static void fixup_mode_1366x768(struct drm_display_mode *mode) +{ + if (mode->hdisplay == 1368 && mode->vdisplay == 768) { + mode->hdisplay = 1366; + mode->hsync_start--; + mode->hsync_end--; + drm_mode_set_name(mode); + } +} + static int drm_gtf_modes_for_range(struct drm_connector *connector, struct edid *edid, struct detailed_timing *timing) @@ -1064,6 +1077,7 @@ drm_gtf_modes_for_range(struct drm_connector *connector, struct edid *edid, const struct minimode *m = &extra_modes[i]; newmode = drm_gtf_mode(dev, m->w, m->h, m->r, 0, 0); + fixup_mode_1366x768(newmode); if (!mode_in_range(newmode, edid, timing)) { drm_mode_destroy(dev, newmode); continue; @@ -1089,6 +1103,7 @@ drm_cvt_modes_for_range(struct drm_connector *connector, struct edid *edid, const struct minimode *m = &extra_modes[i]; newmode = drm_cvt_mode(dev, m->w, m->h, m->r, rb, 0, 0); + fixup_mode_1366x768(newmode); if (!mode_in_range(newmode, edid, timing)) { drm_mode_destroy(dev, newmode); continue;