From patchwork Thu Feb 17 21:24:56 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Oleksij Rempel <bug-track@fisher-privat.net>
X-Patchwork-Id: 572091
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 p1HLPVJZ028934
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Thu, 17 Feb 2011 21:25:52 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id 8E5EA9EB4F
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Thu, 17 Feb 2011 13:25:30 -0800 (PST)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.23])
	by gabe.freedesktop.org (Postfix) with SMTP id 049129E78C
	for <intel-gfx@lists.freedesktop.org>;
	Thu, 17 Feb 2011 13:24:59 -0800 (PST)
Received: (qmail invoked by alias); 17 Feb 2011 21:24:57 -0000
Received: from p4FDED8C6.dip.t-dialin.net (EHLO [192.168.0.150])
	[79.222.216.198]
	by mail.gmx.net (mp011) with SMTP; 17 Feb 2011 22:24:57 +0100
X-Authenticated: #23875046
X-Provags-ID: V01U2FsdGVkX1+Hb1QB3JqH79uByHMspuEuUssgnKRjflbt9MpLu7
	iFrqBKrvkyDJUf
From: Alexey Fisher <bug-track@fisher-privat.net>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
In-Reply-To: <20110217130927.1e36a163@jbarnes-desktop>
References: <1297457963.28522.12.camel@zwerg>
	<1297520176.10989.1.camel@zwerg>
	<b9dded$hu5fo8@orsmga002.jf.intel.com>
	<1297544556.16171.2.camel@zwerg>
	<20110216105745.034a4b29@jbarnes-desktop>
	<1297927580.3349.2.camel@mini>
	<20110217103259.4dd6caf6@jbarnes-desktop>
	<1297976063.2608.0.camel@mini>
	<20110217130927.1e36a163@jbarnes-desktop>
Date: Thu, 17 Feb 2011 22:24:56 +0100
Message-ID: <1297977896.900.1.camel@zwerg>
Mime-Version: 1.0
X-Mailer: Evolution 2.30.3 
X-Y-GMX-Trusted: 0
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [regression] drm/i915: cleanup per-pipe reg usage
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=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.6 (demeter1.kernel.org [140.211.167.41]);
	Thu, 17 Feb 2011 21:25:52 +0000 (UTC)


diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_d
index 0dc5c6f..7bab2ef 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5291,7 +5291,7 @@ static void i9xx_update_cursor(struct drm_crtc
*crtc, u32 
        bool visible = base != 0;
 
        if (intel_crtc->cursor_visible != visible) {
-               uint32_t cntl = CURCNTR(pipe);
+               uint32_t cntl = I915_READ(CURCNTR(pipe));
                if (base) {
                        cntl &= ~(CURSOR_MODE | MCURSOR_PIPE_SELECT);