From owner-cvs-src@FreeBSD.ORG Wed May 17 07:40:34 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6EA8616A484; Wed, 17 May 2006 07:40:34 +0000 (UTC) (envelope-from anholt@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19B7943D53; Wed, 17 May 2006 07:40:32 +0000 (GMT) (envelope-from anholt@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4H7eCuc059242; Wed, 17 May 2006 07:40:12 GMT (envelope-from anholt@repoman.freebsd.org) Received: (from anholt@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4H7eCfg059241; Wed, 17 May 2006 07:40:12 GMT (envelope-from anholt) Message-Id: <200605170740.k4H7eCfg059241@repoman.freebsd.org> From: Eric Anholt Date: Wed, 17 May 2006 07:40:12 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/dev/drm drm-preprocess.sh drm-subprocess.pl drm.h drmP.h drm_agpsupport.c drm_drv.c drm_pciids.h drm_scatter.c i915_dma.c i915_drm.h i915_drv.c i915_drv.h i915_irq.c i915_mem.c mach64_drv.c mga_drv.c mga_drv.h r128_drv.c r300_cmdbuf.c ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 May 2006 07:40:35 -0000 anholt 2006-05-17 07:40:12 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/dev/drm drm.h drmP.h drm_agpsupport.c drm_drv.c drm_pciids.h drm_scatter.c i915_dma.c i915_drm.h i915_drv.c i915_drv.h i915_irq.c i915_mem.c mach64_drv.c mga_drv.c mga_drv.h r128_drv.c r300_cmdbuf.c r300_reg.h radeon_cp.c radeon_drm.h radeon_drv.c radeon_drv.h radeon_state.c savage_bci.c savage_drv.c savage_state.c sis_drv.c sis_ds.c sis_ds.h sis_mm.c tdfx_drv.c sys/modules/drm/radeon Makefile Added files: (Branch: RELENG_6) sys/dev/drm drm-preprocess.sh drm-subprocess.pl Log: Merge DRM from -current, including: - i915 attachment and running fixed - i915 vblank support - Radeon's new memory map support, which should fix a host of stability issues when combined with new userland. - ATI PCI/PCIE GART fix. - r300 fixes Also adds a hack to the radeon module Makefile to quiet gcc's fatal warnings about inlines in this contrib code. Revision Changes Path 1.3.2.1 +36 -0 src/sys/dev/drm/drm-preprocess.sh (new) 1.1.2.1 +50 -0 src/sys/dev/drm/drm-subprocess.pl (new) 1.9.2.2 +3 -3 src/sys/dev/drm/drm.h 1.13.2.3 +2 -2 src/sys/dev/drm/drmP.h 1.1.2.3 +6 -11 src/sys/dev/drm/drm_agpsupport.c 1.1.2.2 +16 -3 src/sys/dev/drm/drm_drv.c 1.2.2.3 +97 -53 src/sys/dev/drm/drm_pciids.h 1.1.2.2 +1 -0 src/sys/dev/drm/drm_scatter.c 1.1.2.2 +34 -15 src/sys/dev/drm/i915_dma.c 1.1.2.2 +35 -0 src/sys/dev/drm/i915_drm.h 1.1.2.2 +11 -1 src/sys/dev/drm/i915_drv.c 1.1.2.2 +8 -2 src/sys/dev/drm/i915_drv.h 1.1.2.2 +42 -5 src/sys/dev/drm/i915_irq.c 1.1.2.2 +30 -0 src/sys/dev/drm/i915_mem.c 1.1.2.2 +4 -0 src/sys/dev/drm/mach64_drv.c 1.9.2.2 +15 -4 src/sys/dev/drm/mga_drv.c 1.9.2.2 +2 -2 src/sys/dev/drm/mga_drv.h 1.9.2.2 +4 -0 src/sys/dev/drm/r128_drv.c 1.2.2.3 +379 -238 src/sys/dev/drm/r300_cmdbuf.c 1.1.2.3 +33 -4 src/sys/dev/drm/r300_reg.h 1.15.2.3 +179 -95 src/sys/dev/drm/radeon_cp.c 1.10.2.3 +20 -8 src/sys/dev/drm/radeon_drm.h 1.12.2.2 +4 -0 src/sys/dev/drm/radeon_drv.c 1.12.2.3 +40 -17 src/sys/dev/drm/radeon_drv.h 1.15.2.3 +291 -244 src/sys/dev/drm/radeon_state.c 1.1.2.2 +25 -27 src/sys/dev/drm/savage_bci.c 1.1.2.2 +4 -0 src/sys/dev/drm/savage_drv.c 1.1.2.2 +40 -40 src/sys/dev/drm/savage_state.c 1.5.2.2 +4 -0 src/sys/dev/drm/sis_drv.c 1.3.2.2 +1 -1 src/sys/dev/drm/sis_ds.c 1.4.2.2 +1 -1 src/sys/dev/drm/sis_ds.h 1.7.2.2 +2 -2 src/sys/dev/drm/sis_mm.c 1.8.2.2 +4 -0 src/sys/dev/drm/tdfx_drv.c 1.5.8.2 +4 -0 src/sys/modules/drm/radeon/Makefile