From patchwork Tue Aug 31 15:28:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Jackson X-Patchwork-Id: 145091 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 o7VFT3vC001077 for ; Tue, 31 Aug 2010 15:29:39 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 58C3D9EB16 for ; Tue, 31 Aug 2010 08:29:03 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id 824629E776 for ; Tue, 31 Aug 2010 08:28:42 -0700 (PDT) Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7VFSf6E011789 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 31 Aug 2010 11:28:41 -0400 Received: from [10.16.60.54] (atropine.boston.devel.redhat.com [10.16.60.54]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7VFSeGj025412; Tue, 31 Aug 2010 11:28:41 -0400 From: Adam Jackson To: The Fungi In-Reply-To: <20100831141931.GK2241@yuggoth.org> References: <000001cb4853$19b1cfc0$4d156f40$@dmglobal.net> <134503733.55272.1283186689422.JavaMail.root@sz0115a.westchester.pa.mail.comcast.net> <20100830171421.GH2241@yuggoth.org> <1283192363.7791.5609.camel@atropine> <20100830184722.GI2241@yuggoth.org> <1283194586.7791.5649.camel@atropine> <20100831011204.GJ2241@yuggoth.org> <1283262593.7791.6797.camel@atropine> <20100831141931.GK2241@yuggoth.org> Date: Tue, 31 Aug 2010 11:28:40 -0400 Message-ID: <1283268520.7791.7018.camel@atropine> Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Cc: intel-gfx@lists.freedesktop.org Subject: Re: [Intel-gfx] Intel 965 and Custom Resolutions X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 31 Aug 2010 15:29:39 +0000 (UTC) diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 6f7e5f1..886c58f 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -731,6 +731,7 @@ drmmode_output_get_modes(xf86OutputPtr output) drmModePropertyPtr props; struct fixed_panel_lvds *p_lvds; drmModeModeInfo *mode_ptr; + xf86MonPtr mon = NULL; /* look for an EDID property */ for (i = 0; i < koutput->count_props; i++) { @@ -751,14 +752,13 @@ drmmode_output_get_modes(xf86OutputPtr output) drmModeFreeProperty(props); } - if (drmmode_output->edid_blob) - xf86OutputSetEDID(output, - xf86InterpretEDID(output->scrn->scrnIndex, - drmmode_output->edid_blob->data)); - else - xf86OutputSetEDID(output, - xf86InterpretEDID(output->scrn->scrnIndex, - NULL)); + if (drmmode_output->edid_blob) { + mon = xf86InterpretEDID(output->scrn->scrnIndex, + drmmode_output->edid_blob->data); + if (drmmode->edid_blob->length > 128) + mon->flags |= MONITOR_EDID_COMPLETE_RAWDATA; + } + xf86OutputSetEDID(output, mon); /* modes should already be available */ for (i = 0; i < koutput->count_modes; i++) {