Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760458AbZFIKXZ (ORCPT ); Tue, 9 Jun 2009 06:23:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760279AbZFIKS5 (ORCPT ); Tue, 9 Jun 2009 06:18:57 -0400 Received: from kroah.org ([198.145.64.141]:54670 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758845AbZFIKSz (ORCPT ); Tue, 9 Jun 2009 06:18:55 -0400 X-Mailbox-Line: From greg@blue.kroah.org Tue Jun 9 02:40:58 2009 Message-Id: <20090609094058.773848825@blue.kroah.org> User-Agent: quilt/0.48-1 Date: Tue, 09 Jun 2009 02:39:17 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Dave Airlie , Venkatesh Pallipadi , Greg Kroah-Hartman Subject: [patch 29/87] drm/r128: fix r128 ioremaps to use ioremap_wc. References: <20090609093848.204935043@blue.kroah.org> Content-Disposition: inline; filename=drm-r128-fix-r128-ioremaps-to-use-ioremap_wc.patch In-Reply-To: <20090609094451.GA26439@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1383 Lines: 32 2.6.29-stable review patch. If anyone has any objections, please let us know. ------------------ From: Dave Airlie commit 42beefc0093725ec0f8cea340cc54c36ccaceea0 upstream. This should allow r128 to start working again since PAT changes. taken from F-11 kernel. Signed-off-by: Dave Airlie Cc: Venkatesh Pallipadi Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/r128/r128_cce.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c @@ -511,9 +511,9 @@ static int r128_do_init_cce(struct drm_d #if __OS_HAS_AGP if (!dev_priv->is_pci) { - drm_core_ioremap(dev_priv->cce_ring, dev); - drm_core_ioremap(dev_priv->ring_rptr, dev); - drm_core_ioremap(dev->agp_buffer_map, dev); + drm_core_ioremap_wc(dev_priv->cce_ring, dev); + drm_core_ioremap_wc(dev_priv->ring_rptr, dev); + drm_core_ioremap_wc(dev->agp_buffer_map, dev); if (!dev_priv->cce_ring->handle || !dev_priv->ring_rptr->handle || !dev->agp_buffer_map->handle) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/