CVS commit: [netbsd-5] src/sys/external/bsd/drm/dist

[Soren Jacobsen <snj%netbsd.org@localhost>]

Module Name:    src
Committed By:   snj
Date:           Sat Jun 20 23:37:03 UTC 2009

Modified Files:
        src/sys/external/bsd/drm/dist [netbsd-5]: Makefile.am README
            configure.ac
        src/sys/external/bsd/drm/dist/bsd-core [netbsd-5]: Makefile
            ati_pcigart.c 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_linux_list.h drm_lock.c
            drm_memory.c drm_pci.c drm_pciids.h drm_scatter.c drm_sysctl.c
            drm_vm.c i915_drv.c mach64_drv.c mga_drv.c r128_drv.c radeon_drv.c
            savage_drv.c sis_drv.c tdfx_drv.c via_drv.c
        src/sys/external/bsd/drm/dist/bsd-core/drm [netbsd-5]: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/i915 [netbsd-5]: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/mach64 [netbsd-5]: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/mga [netbsd-5]: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/r128 [netbsd-5]: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/radeon [netbsd-5]: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/savage [netbsd-5]: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/sis [netbsd-5]: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/tdfx [netbsd-5]: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/via [netbsd-5]: Makefile
        src/sys/external/bsd/drm/dist/libdrm [netbsd-5]: Makefile.am xf86drm.c
            xf86drm.h xf86mm.h
        src/sys/external/bsd/drm/dist/shared-core [netbsd-5]: Makefile.am drm.h
            drm_pciids.txt i915_dma.c i915_drm.h i915_drv.h i915_irq.c
            i915_suspend.c mach64_dma.c mach64_drv.h mach64_irq.c mga_dma.c
            mga_irq.c nouveau_dma.c nouveau_drm.h nouveau_drv.h nouveau_fifo.c
            nouveau_irq.c nouveau_mem.c nouveau_object.c nouveau_reg.h
            nouveau_state.c nv04_fifo.c nv04_instmem.c nv20_graph.c
            nv40_graph.c nv40_mc.c nv50_fifo.c nv50_graph.c nv50_instmem.c
            r128_drv.h r128_irq.c r300_cmdbuf.c r600_microcode.h radeon_cp.c
            radeon_drm.h radeon_drv.h radeon_irq.c radeon_state.c savage_bci.c
            savage_state.c sis_ds.c via_irq.c via_map.c
        src/sys/external/bsd/drm/dist/tests [netbsd-5]: Makefile.am dristat.c
            drmtest.c drmtest.h getversion.c setversion.c updatedraw.c

Log Message:
Apply patch (requested by mrg in ticket #823):
import mesa-drm git from version 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c.
--
merge the changes from drm 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c
with our changes and the work recently done by Arto Huusko and FUKAUMI
Naoki.

it includes all the changes arto provided from both mesa-drm and
the r6xx-r7xx-support branch.  it does not yet include code to
handle the (deleted) drm_pciids.h file, but i'll probably just
check in a generated one for now.

i have not yet merged the changes from outside this dir.

from arto's messages to tech-x11:

The important change that was needed is that drm_scatter.c was
fixed to return pointer to all allocated pages, not just the
beginning of the allocated segments.

Other changes:

  - drm_scatter maps COHERENT memory
  - drm_drawable: drawable handle allocation is done
    inside lock
  - drm_memory: when mapping "agp" memory, store offset
    of mapped area, so that new requests to same offset
    return the same area instead of trying to remap
    and fail
  - drm_vm: use bus_space_mmap for frame buffer and registers

  - r600_cp.c: ioremapfree allocated gart range
  - radeon_cp.c: use mtsleep
  - some memset calls I had added had their args swapped,
    and no memory was cleared
--
add a freshly generated drm_pciids.h
--
some minor clean up:
- reduce diffs to mesa-drm where possible
- fix various formatting issues
- netbsd uses major 180 for drm (XXX)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \
    src/sys/external/bsd/drm/dist/Makefile.am \
    src/sys/external/bsd/drm/dist/README \
    src/sys/external/bsd/drm/dist/configure.ac
cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/external/bsd/drm/dist/bsd-core/Makefile \
    src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_agpsupport.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_auth.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_dma.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_ioctl.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c \
    src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c \
    src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c \
    src/sys/external/bsd/drm/dist/bsd-core/r128_drv.c \
    src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c \
    src/sys/external/bsd/drm/dist/bsd-core/savage_drv.c \
    src/sys/external/bsd/drm/dist/bsd-core/sis_drv.c \
    src/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c \
    src/sys/external/bsd/drm/dist/bsd-core/via_drv.c
cvs rdiff -u -r1.9 -r1.9.10.1 src/sys/external/bsd/drm/dist/bsd-core/drmP.h
cvs rdiff -u -r1.3 -r1.3.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/drm_atomic.h \
    src/sys/external/bsd/drm/dist/bsd-core/drm_drawable.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_lock.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c \
    src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/drm_context.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_linux_list.h \
    src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h \
    src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c
cvs rdiff -u -r1.10 -r1.10.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c
cvs rdiff -u -r1.7 -r1.7.8.1 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c
cvs rdiff -u -r1.4 -r1.4.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/drm_pci.c
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/drm/Makefile
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/i915/Makefile
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/mach64/Makefile
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/mga/Makefile
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/r128/Makefile
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/radeon/Makefile
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/savage/Makefile
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/sis/Makefile
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/tdfx/Makefile
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/bsd-core/via/Makefile
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \
    src/sys/external/bsd/drm/dist/libdrm/Makefile.am \
    src/sys/external/bsd/drm/dist/libdrm/xf86drm.c \
    src/sys/external/bsd/drm/dist/libdrm/xf86drm.h \
    src/sys/external/bsd/drm/dist/libdrm/xf86mm.h
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \
    src/sys/external/bsd/drm/dist/shared-core/Makefile.am \
    src/sys/external/bsd/drm/dist/shared-core/drm.h \
    src/sys/external/bsd/drm/dist/shared-core/i915_drm.h \
    src/sys/external/bsd/drm/dist/shared-core/mach64_dma.c \
    src/sys/external/bsd/drm/dist/shared-core/mach64_irq.c \
    src/sys/external/bsd/drm/dist/shared-core/mga_dma.c \
    src/sys/external/bsd/drm/dist/shared-core/mga_irq.c \
    src/sys/external/bsd/drm/dist/shared-core/nouveau_dma.c \
    src/sys/external/bsd/drm/dist/shared-core/nouveau_irq.c \
    src/sys/external/bsd/drm/dist/shared-core/nouveau_object.c \
    src/sys/external/bsd/drm/dist/shared-core/nouveau_reg.h \
    src/sys/external/bsd/drm/dist/shared-core/nouveau_state.c \
    src/sys/external/bsd/drm/dist/shared-core/nv04_fifo.c \
    src/sys/external/bsd/drm/dist/shared-core/nv04_instmem.c \
    src/sys/external/bsd/drm/dist/shared-core/nv20_graph.c \
    src/sys/external/bsd/drm/dist/shared-core/nv40_graph.c \
    src/sys/external/bsd/drm/dist/shared-core/nv40_mc.c \
    src/sys/external/bsd/drm/dist/shared-core/nv50_fifo.c \
    src/sys/external/bsd/drm/dist/shared-core/nv50_graph.c \
    src/sys/external/bsd/drm/dist/shared-core/nv50_instmem.c \
    src/sys/external/bsd/drm/dist/shared-core/r128_drv.h \
    src/sys/external/bsd/drm/dist/shared-core/r128_irq.c \
    src/sys/external/bsd/drm/dist/shared-core/r300_cmdbuf.c \
    src/sys/external/bsd/drm/dist/shared-core/r600_microcode.h \
    src/sys/external/bsd/drm/dist/shared-core/radeon_drm.h \
    src/sys/external/bsd/drm/dist/shared-core/via_irq.c \
    src/sys/external/bsd/drm/dist/shared-core/via_map.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \
    src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt \
    src/sys/external/bsd/drm/dist/shared-core/nouveau_drm.h \
    src/sys/external/bsd/drm/dist/shared-core/nouveau_drv.h \
    src/sys/external/bsd/drm/dist/shared-core/nouveau_fifo.c \
    src/sys/external/bsd/drm/dist/shared-core/nouveau_mem.c \
    src/sys/external/bsd/drm/dist/shared-core/radeon_irq.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
    src/sys/external/bsd/drm/dist/shared-core/i915_dma.c \
    src/sys/external/bsd/drm/dist/shared-core/i915_drv.h
cvs rdiff -u -r1.2 -r1.2.6.1 \
    src/sys/external/bsd/drm/dist/shared-core/i915_irq.c
cvs rdiff -u -r1.3 -r1.3.10.1 \
    src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c \
    src/sys/external/bsd/drm/dist/shared-core/radeon_state.c
cvs rdiff -u -r1.2 -r1.2.10.1 \
    src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h \
    src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c \
    src/sys/external/bsd/drm/dist/shared-core/savage_bci.c \
    src/sys/external/bsd/drm/dist/shared-core/savage_state.c \
    src/sys/external/bsd/drm/dist/shared-core/sis_ds.c
cvs rdiff -u -r1.4 -r1.4.10.1 \
    src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \
    src/sys/external/bsd/drm/dist/tests/Makefile.am \
    src/sys/external/bsd/drm/dist/tests/dristat.c \
    src/sys/external/bsd/drm/dist/tests/drmtest.c \
    src/sys/external/bsd/drm/dist/tests/drmtest.h \
    src/sys/external/bsd/drm/dist/tests/getversion.c \
    src/sys/external/bsd/drm/dist/tests/setversion.c \
    src/sys/external/bsd/drm/dist/tests/updatedraw.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.