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 ...

[Eric Anholt]

On Wed, 2006-05-17 at 07:40 +0000, Eric Anholt wrote:
> 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.  

This was a fast MFC of the last two fixes, but they were the things I
was blocking the merge on.  I'll be disappearing from the internet in a
week (for 3 weeks), and wanted to get this done before then.  My time
before I leave is likely to be quite limited, so I took this chance
tonight while I had it.

-- 
Eric Anholt                             anholt at FreeBSD.org
eric at anholt.net                         eric.anholt at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: This is a digitally signed message part
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20060517/eb754533/attachment.pgp