From patchwork Wed Dec 29 21:53:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 440861 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 oBUMU8gM014045 for ; Thu, 30 Dec 2010 22:30:35 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BBD659E9CA for ; Wed, 29 Dec 2010 13:53:29 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from cpoproxy1-pub.bluehost.com (cpoproxy1-pub.bluehost.com [69.89.21.11]) by gabe.freedesktop.org (Postfix) with SMTP id BC2199E738 for ; Wed, 29 Dec 2010 13:53:18 -0800 (PST) Received: (qmail 28888 invoked by uid 0); 29 Dec 2010 21:53:18 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by cpoproxy1.bluehost.com with SMTP; 29 Dec 2010 21:53:18 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type:Content-Transfer-Encoding:X-Identified-User; b=UA1hkFu/xWpC5PK3Rgb0Q0INgEd237HyyH3E73Mqhi6VuXBWZnvK7GWwJGQpiwUE44Cp/VCXNJhIhD7p7+bRUw5VxscORNgIDsM2qQSiGwhoPhf2eiZzw3TM9jMYybjB; Received: from c-67-174-193-198.hsd1.ca.comcast.net ([67.174.193.198] helo=jbarnes-desktop) by box514.bluehost.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1PY3xN-0007xR-FY; Wed, 29 Dec 2010 14:53:17 -0700 Date: Wed, 29 Dec 2010 13:53:15 -0800 From: Jesse Barnes To: Alex Riesen Subject: Re: Linux 2.6.37-rc8 (no fb) Message-ID: <20101229135315.5fe5c4e5@jbarnes-desktop> In-Reply-To: <20101229131852.0792aac0@jbarnes-desktop> References: <20101229102127.06c0e505.randy.dunlap@oracle.com> <20101229121601.179983b7@jbarnes-desktop> <20101229131852.0792aac0@jbarnes-desktop> X-Mailer: Claws Mail 3.7.6 (GTK+ 2.18.9; x86_64-redhat-linux-gnu) Mime-Version: 1.0 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.174.193.198 authed with jbarnes@virtuousgeek.org} Cc: Randy Dunlap , Jeff Chua , Linus Torvalds , Linux Kernel Mailing List , dri-devel@lists.freedesktop.org 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: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=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]); Thu, 30 Dec 2010 22:30:35 +0000 (UTC) diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index aa23070..830e3b0 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -82,8 +82,6 @@ static void intel_lvds_enable(struct intel_lvds *intel_lvds) lvds_reg = LVDS; } - I915_WRITE(lvds_reg, I915_READ(lvds_reg) | LVDS_PORT_EN); - if (intel_lvds->pfit_dirty) { /* * Enable automatic panel scaling so that non-native modes @@ -104,7 +102,7 @@ static void intel_lvds_enable(struct intel_lvds *intel_lvds) } I915_WRITE(ctl_reg, I915_READ(ctl_reg) | POWER_TARGET_ON); - POSTING_READ(lvds_reg); + POSTING_READ(ctl_reg); intel_panel_set_backlight(dev, dev_priv->backlight_level); } @@ -136,8 +134,7 @@ static void intel_lvds_disable(struct intel_lvds *intel_lvds) intel_lvds->pfit_dirty = true; } - I915_WRITE(lvds_reg, I915_READ(lvds_reg) & ~LVDS_PORT_EN); - POSTING_READ(lvds_reg); + POSTING_READ(ctl_reg); } static void intel_lvds_dpms(struct drm_encoder *encoder, int mode)