From owner-svn-src-head@FreeBSD.ORG Thu Apr 22 18:47:30 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7D4551065670; Thu, 22 Apr 2010 18:47:30 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 517CB8FC08; Thu, 22 Apr 2010 18:47:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3MIlUEp060478; Thu, 22 Apr 2010 18:47:30 GMT (envelope-from rnoland@svn.freebsd.org) Received: (from rnoland@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3MIlUFr060475; Thu, 22 Apr 2010 18:47:30 GMT (envelope-from rnoland@svn.freebsd.org) Message-Id: <201004221847.o3MIlUFr060475@svn.freebsd.org> From: Robert Noland Date: Thu, 22 Apr 2010 18:47:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r207069 - head/sys/dev/drm X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2010 18:47:30 -0000 Author: rnoland Date: Thu Apr 22 18:47:30 2010 New Revision: 207069 URL: http://svn.freebsd.org/changeset/base/207069 Log: Now that we properly set write-combining on the pages that back the GART, disable snooping on radeons. MFC after: 2 weeks Modified: head/sys/dev/drm/ati_pcigart.c head/sys/dev/drm/r600_cp.c Modified: head/sys/dev/drm/ati_pcigart.c ============================================================================== --- head/sys/dev/drm/ati_pcigart.c Thu Apr 22 18:47:23 2010 (r207068) +++ head/sys/dev/drm/ati_pcigart.c Thu Apr 22 18:47:30 2010 (r207069) @@ -39,8 +39,9 @@ __FBSDID("$FreeBSD$"); #define ATI_PCIGART_PAGE_SIZE 4096 /* PCI GART page size */ #define ATI_PCIGART_PAGE_MASK (~(ATI_PCIGART_PAGE_SIZE-1)) -#define ATI_PCIE_WRITE 0x4 -#define ATI_PCIE_READ 0x8 +#define ATI_GART_NOSNOOP 0x1 +#define ATI_GART_WRITE 0x4 +#define ATI_GART_READ 0x8 static void drm_ati_alloc_pcigart_table_cb(void *arg, bus_dma_segment_t *segs, @@ -196,13 +197,15 @@ drm_ati_pcigart_init(struct drm_device * case DRM_ATI_GART_IGP: page_base |= (upper_32_bits(entry_addr) & 0xff) << 4; - page_base |= 0xc; + page_base |= ATI_GART_READ | ATI_GART_WRITE; + page_base |= ATI_GART_NOSNOOP; break; case DRM_ATI_GART_PCIE: page_base >>= 8; page_base |= (upper_32_bits(entry_addr) & 0xff) << 24; - page_base |= ATI_PCIE_READ | ATI_PCIE_WRITE; + page_base |= ATI_GART_READ | ATI_GART_WRITE; + page_base |= ATI_GART_NOSNOOP; break; default: case DRM_ATI_GART_PCI: Modified: head/sys/dev/drm/r600_cp.c ============================================================================== --- head/sys/dev/drm/r600_cp.c Thu Apr 22 18:47:23 2010 (r207068) +++ head/sys/dev/drm/r600_cp.c Thu Apr 22 18:47:30 2010 (r207069) @@ -180,7 +180,7 @@ int r600_page_table_init(struct drm_devi entry_addr = entry->busaddr[i]; for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) { page_base = (u64) entry_addr & ATI_PCIGART_PAGE_MASK; - page_base |= R600_PTE_VALID | R600_PTE_SYSTEM | R600_PTE_SNOOPED; + page_base |= R600_PTE_VALID | R600_PTE_SYSTEM; page_base |= R600_PTE_READABLE | R600_PTE_WRITEABLE; *pci_gart = page_base;