CVS commit: src/sys/external/bsd/drm/dist

[matthew green <mrg%netbsd.org@localhost>]

Module Name:    src
Committed By:   mrg
Date:           Fri Jun 19 03:50:05 UTC 2009

Modified Files:
        src/sys/external/bsd/drm/dist/bsd-core: Makefile ati_pcigart.c drmP.h
            drm_agpsupport.c drm_atomic.h drm_auth.c drm_bufs.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_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: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/i915: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/mach64: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/mga: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/r128: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/radeon: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/savage: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/sis: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/tdfx: Makefile
        src/sys/external/bsd/drm/dist/bsd-core/via: Makefile
        src/sys/external/bsd/drm/dist/shared-core: drm_pciids.txt i915_irq.c
            i915_suspend.c mach64_drv.h 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
Added Files:
        src/sys/external/bsd/drm/dist/shared-core: r600_cp.c
Removed Files:
        src/sys/external/bsd/drm/dist/bsd-core: drm_pciids.h
        src/sys/external/bsd/drm/dist/shared-core: nv_drv.h

Log Message:
merge the changes from drm 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c
with our changes and the work recently done by Arto Huusko
<arto.huusko%pp2.inet.fi@localhost> and FUKAUMI Naoki 
<fun%naobsd.org@localhost>.

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


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 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_dma.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/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.10 -r1.11 src/sys/external/bsd/drm/dist/bsd-core/drmP.h
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/bsd-core/drm_atomic.h \
    src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_drawable.c \
    src/sys/external/bsd/drm/dist/bsd-core/drm_fops.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/drm_vm.c \
    src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c \
    src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm/dist/bsd-core/drm_pci.c
cvs rdiff -u -r1.1.1.1 -r0 \
    src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h
cvs rdiff -u -r1.1.1.2 -r1.2 \
    src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/bsd-core/drm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/bsd-core/i915/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm/dist/bsd-core/mach64/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/bsd-core/mga/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/bsd-core/r128/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm/dist/bsd-core/radeon/Makefile
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm/dist/bsd-core/savage/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/bsd-core/sis/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/bsd-core/tdfx/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/bsd-core/via/Makefile
cvs rdiff -u -r1.1.1.3 -r1.2 \
    src/sys/external/bsd/drm/dist/shared-core/drm_pciids.txt \
    src/sys/external/bsd/drm/dist/shared-core/radeon_irq.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm/dist/shared-core/i915_irq.c \
    src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h \
    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.3 -r1.4 \
    src/sys/external/bsd/drm/dist/shared-core/i915_suspend.c \
    src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c \
    src/sys/external/bsd/drm/dist/shared-core/radeon_state.c
cvs rdiff -u -r1.1.1.1 -r0 src/sys/external/bsd/drm/dist/shared-core/nv_drv.h
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm/dist/shared-core/r600_cp.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/sys/external/bsd/drm/dist/shared-core/r600_microcode.h \
    src/sys/external/bsd/drm/dist/shared-core/radeon_drm.h
cvs rdiff -u -r1.4 -r1.5 \
    src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h

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