From owner-cvs-src-old@FreeBSD.ORG Thu Apr 22 18:21:45 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 375711065802 for ; Thu, 22 Apr 2010 18:21:45 +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 085DF8FC21 for ; Thu, 22 Apr 2010 18:21:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3MILimH052558 for ; Thu, 22 Apr 2010 18:21:44 GMT (envelope-from rnoland@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3MILimM052557 for cvs-src-old@freebsd.org; Thu, 22 Apr 2010 18:21:44 GMT (envelope-from rnoland@repoman.freebsd.org) Message-Id: <201004221821.o3MILimM052557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rnoland@repoman.freebsd.org using -f From: Robert Noland Date: Thu, 22 Apr 2010 18:21:25 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/drm drmP.h drm_bufs.c drm_context.c drm_drv.c drm_memory.c drm_scatter.c drm_sysctl.c drm_vm.c i915_dma.c mach64_dma.c mga_dma.c mga_warp.c r128_cce.c r128_state.c r600_blit.c r600_cp.c radeon_cp.c radeon_cs.c ... X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2010 18:21:45 -0000 rnoland 2010-04-22 18:21:25 UTC FreeBSD src repository Modified files: sys/dev/drm drmP.h drm_bufs.c drm_context.c drm_drv.c drm_memory.c drm_scatter.c drm_sysctl.c drm_vm.c i915_dma.c mach64_dma.c mga_dma.c mga_warp.c r128_cce.c r128_state.c r600_blit.c r600_cp.c radeon_cp.c radeon_cs.c radeon_state.c savage_bci.c via_dma.c via_map.c via_mm.c Log: SVN rev 207066 on 2010-04-22 18:21:25Z by rnoland Rework how drm maps are handled. * On 32 bit platforms we steal the upper 4 bits of the map handle to store a unique map id. * On 64 bit platforms we steal the upper 24 bits. Resolves issues where the offsets that are handed to mmap may overlap the VRAM on some cards. Tested on: radeon, intel, mga, and via. This will break nouveau. I will spin new patches shortly. Revision Changes Path 1.43 +23 -19 src/sys/dev/drm/drmP.h 1.15 +21 -16 src/sys/dev/drm/drm_bufs.c 1.7 +1 -1 src/sys/dev/drm/drm_context.c 1.32 +7 -0 src/sys/dev/drm/drm_drv.c 1.7 +1 -1 src/sys/dev/drm/drm_memory.c 1.13 +5 -2 src/sys/dev/drm/drm_scatter.c 1.9 +6 -4 src/sys/dev/drm/drm_sysctl.c 1.9 +24 -19 src/sys/dev/drm/drm_vm.c 1.21 +7 -7 src/sys/dev/drm/i915_dma.c 1.5 +4 -4 src/sys/dev/drm/mach64_dma.c 1.16 +11 -11 src/sys/dev/drm/mga_dma.c 1.10 +2 -2 src/sys/dev/drm/mga_warp.c 1.16 +10 -9 src/sys/dev/drm/r128_cce.c 1.15 +2 -2 src/sys/dev/drm/r128_state.c 1.6 +8 -9 src/sys/dev/drm/r600_blit.c 1.11 +21 -19 src/sys/dev/drm/r600_cp.c 1.37 +18 -18 src/sys/dev/drm/radeon_cp.c 1.3 +1 -1 src/sys/dev/drm/radeon_cs.c 1.28 +4 -4 src/sys/dev/drm/radeon_state.c 1.5 +14 -14 src/sys/dev/drm/savage_bci.c 1.2 +10 -3 src/sys/dev/drm/via_dma.c 1.2 +1 -1 src/sys/dev/drm/via_map.c 1.2 +0 -2 src/sys/dev/drm/via_mm.c