Received: by mail.netbsd.org (Postfix, from userid 605) id A405619D147; Sun, 9 Jan 2011 20:25:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8DDA619D144 for ; Sun, 9 Jan 2011 20:25:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id gg-2xi-dEl8J for ; Sun, 9 Jan 2011 20:25:47 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 024BA19D140 for ; Sun, 9 Jan 2011 20:25:46 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id D3425175DD; Sun, 9 Jan 2011 20:25:46 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Sun, 9 Jan 2011 15:25:46 -0500 From: "Christos Zoulas" Subject: CVS commit: xsrc/external/mit/xf86-video-intel/dist/src To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20110109202546.D3425175DD@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Christos Zoulas" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: xsrc Committed By: christos Date: Sun Jan 9 20:25:46 UTC 2011 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src: i830_display.c Log Message: Revert previous hack and fix this properly. We need dpms to be turned on to be able to load the colormap, since dpms off turns off the channel. Guard against the lut being loaded with dpms off, and move the call to load the lut after the dmps on one. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/i830_display.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.