From owner-cvs-src@FreeBSD.ORG Fri Oct 3 16:59:28 2008 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7304F1065705; Fri, 3 Oct 2008 16:59:28 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5D8EF8FC1E; Fri, 3 Oct 2008 16:59:28 +0000 (UTC) (envelope-from rnoland@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m93GxSse050939; Fri, 3 Oct 2008 16:59:28 GMT (envelope-from rnoland@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m93GxSl9050938; Fri, 3 Oct 2008 16:59:28 GMT (envelope-from rnoland@repoman.freebsd.org) Message-Id: <200810031659.m93GxSl9050938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rnoland@repoman.freebsd.org using -f From: Robert Noland Date: Fri, 3 Oct 2008 16:59:11 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/dev/drm drm.h drmP.h drm_agpsupport.c drm_atomic.h drm_auth.c drm_bufs.c drm_context.c drm_dma.c drm_drawable.c drm_drv.c drm_fops.c drm_ioctl.c drm_irq.c drm_lock.c drm_memory.c drm_pci.c drm_scatter.c drm_sysctl.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: Fri, 03 Oct 2008 16:59:28 -0000 rnoland 2008-10-03 16:59:11 UTC FreeBSD src repository Modified files: sys/dev/drm drm.h drmP.h drm_agpsupport.c drm_atomic.h drm_auth.c drm_bufs.c drm_context.c drm_dma.c drm_drawable.c drm_drv.c drm_fops.c drm_ioctl.c drm_irq.c drm_lock.c drm_memory.c drm_pci.c drm_scatter.c drm_sysctl.c drm_vm.c i915_dma.c i915_drm.h i915_drv.c i915_drv.h i915_irq.c i915_suspend.c mach64_drv.c mga_drv.c r128_drv.c radeon_cp.c radeon_drv.c savage_drv.c sis_drv.c tdfx_drv.c Log: SVN rev 183573 on 2008-10-03 16:59:11Z by rnoland resync to git master This reverts a private patch which is causing issues with many Intel chipsets. I will review that patch and see what we need to do to fix it up later, but for the time being, we will just get these chips working again. This update contains a lot of code cleanup and is post gem merge (no, we don't have gem support). It should prove much easier to read the code now. A lot of thanks goes to vehemens for that work. I have adapted the code to use cdevpriv for tracking per open file data. That alleviates the old ugly hack that we used to try and accomplish the task and helped to clean up the open / close behavior a good bit. This also replaces the hack that was put in place a year or so ago to prevent radeons from locking up with AIGLX enabled. I have had a couple of radeon testers report that it still works as expected, though I no longer have radeon hardware to test with myself. Other various fixes from the linux crew and Intel, many of which are muddled in with the gem merge. Approved by: jhb (mentor) Obtained from: mesa/drm git master MFC after: 2 weeks Revision Changes Path 1.14 +31 -2 src/sys/dev/drm/drm.h 1.21 +64 -193 src/sys/dev/drm/drmP.h 1.9 +21 -28 src/sys/dev/drm/drm_agpsupport.c 1.3 +0 -53 src/sys/dev/drm/drm_atomic.h 1.4 +8 -7 src/sys/dev/drm/drm_auth.c 1.6 +115 -137 src/sys/dev/drm/drm_bufs.c 1.4 +53 -53 src/sys/dev/drm/drm_context.c 1.4 +10 -9 src/sys/dev/drm/drm_dma.c 1.4 +2 -2 src/sys/dev/drm/drm_drawable.c 1.12 +86 -317 src/sys/dev/drm/drm_drv.c 1.5 +33 -58 src/sys/dev/drm/drm_fops.c 1.4 +20 -22 src/sys/dev/drm/drm_ioctl.c 1.5 +35 -55 src/sys/dev/drm/drm_irq.c 1.5 +82 -88 src/sys/dev/drm/drm_lock.c 1.4 +6 -44 src/sys/dev/drm/drm_memory.c 1.5 +2 -25 src/sys/dev/drm/drm_pci.c 1.5 +11 -11 src/sys/dev/drm/drm_scatter.c 1.4 +3 -3 src/sys/dev/drm/drm_sysctl.c 1.4 +11 -26 src/sys/dev/drm/drm_vm.c 1.10 +216 -149 src/sys/dev/drm/i915_dma.c 1.6 +321 -0 src/sys/dev/drm/i915_drm.h 1.7 +45 -37 src/sys/dev/drm/i915_drv.c 1.6 +299 -28 src/sys/dev/drm/i915_drv.h 1.6 +89 -26 src/sys/dev/drm/i915_irq.c 1.2 +3 -1 src/sys/dev/drm/i915_suspend.c 1.5 +41 -33 src/sys/dev/drm/mach64_drv.c 1.14 +45 -44 src/sys/dev/drm/mga_drv.c 1.13 +42 -40 src/sys/dev/drm/r128_drv.c 1.21 +3 -3 src/sys/dev/drm/radeon_cp.c 1.16 +47 -46 src/sys/dev/drm/radeon_drv.c 1.5 +38 -28 src/sys/dev/drm/savage_drv.c 1.9 +32 -26 src/sys/dev/drm/sis_drv.c 1.12 +27 -20 src/sys/dev/drm/tdfx_drv.c