merge the changes from drm 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c
commit2d019004196d8ae6b67618b29f2cbfbab6ae9efa
authormatthew green <mrg@NetBSD.org>
Fri, 19 Jun 2009 03:50:05 +0000 (19 03:50 +0000)
committermatthew green <mrg@NetBSD.org>
Fri, 19 Jun 2009 03:50:05 +0000 (19 03:50 +0000)
tree26afcfbb002e673cae961323840cd9c496f0f109
parentcdc1a8a8b2a99294ac5fe6636e3810a30e80917b
merge the changes from drm 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c
with our changes and the work recently done by Arto Huusko
<arto.huusko@pp2.inet.fi> and FUKAUMI Naoki <fun@naobsd.org>.

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
54 files changed:
sys/external/bsd/drm/dist/bsd-core/Makefile
sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c
sys/external/bsd/drm/dist/bsd-core/drm/Makefile
sys/external/bsd/drm/dist/bsd-core/drmP.h
sys/external/bsd/drm/dist/bsd-core/drm_agpsupport.c
sys/external/bsd/drm/dist/bsd-core/drm_atomic.h
sys/external/bsd/drm/dist/bsd-core/drm_auth.c
sys/external/bsd/drm/dist/bsd-core/drm_bufs.c
sys/external/bsd/drm/dist/bsd-core/drm_dma.c
sys/external/bsd/drm/dist/bsd-core/drm_drawable.c
sys/external/bsd/drm/dist/bsd-core/drm_drv.c
sys/external/bsd/drm/dist/bsd-core/drm_fops.c
sys/external/bsd/drm/dist/bsd-core/drm_ioctl.c
sys/external/bsd/drm/dist/bsd-core/drm_irq.c
sys/external/bsd/drm/dist/bsd-core/drm_lock.c
sys/external/bsd/drm/dist/bsd-core/drm_memory.c
sys/external/bsd/drm/dist/bsd-core/drm_pci.c
sys/external/bsd/drm/dist/bsd-core/drm_pciids.h [deleted file]
sys/external/bsd/drm/dist/bsd-core/drm_scatter.c
sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c
sys/external/bsd/drm/dist/bsd-core/drm_vm.c
sys/external/bsd/drm/dist/bsd-core/i915/Makefile
sys/external/bsd/drm/dist/bsd-core/i915_drv.c
sys/external/bsd/drm/dist/bsd-core/mach64/Makefile
sys/external/bsd/drm/dist/bsd-core/mach64_drv.c
sys/external/bsd/drm/dist/bsd-core/mga/Makefile
sys/external/bsd/drm/dist/bsd-core/mga_drv.c
sys/external/bsd/drm/dist/bsd-core/r128/Makefile
sys/external/bsd/drm/dist/bsd-core/r128_drv.c
sys/external/bsd/drm/dist/bsd-core/radeon/Makefile
sys/external/bsd/drm/dist/bsd-core/radeon_drv.c
sys/external/bsd/drm/dist/bsd-core/savage/Makefile
sys/external/bsd/drm/dist/bsd-core/savage_drv.c
sys/external/bsd/drm/dist/bsd-core/sis/Makefile
sys/external/bsd/drm/dist/bsd-core/sis_drv.c
sys/external/bsd/drm/dist/bsd-core/tdfx/Makefile
sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c
sys/external/bsd/drm/dist/bsd-core/via/Makefile
sys/external/bsd/drm/dist/bsd-core/via_drv.c
sys/external/bsd/drm/dist/shared-core/drm_pciids.txt
sys/external/bsd/drm/dist/shared-core/i915_irq.c
sys/external/bsd/drm/dist/shared-core/i915_suspend.c
sys/external/bsd/drm/dist/shared-core/mach64_drv.h
sys/external/bsd/drm/dist/shared-core/nv_drv.h [deleted file]
sys/external/bsd/drm/dist/shared-core/r600_cp.c [new file with mode: 0644]
sys/external/bsd/drm/dist/shared-core/r600_microcode.h
sys/external/bsd/drm/dist/shared-core/radeon_cp.c
sys/external/bsd/drm/dist/shared-core/radeon_drm.h
sys/external/bsd/drm/dist/shared-core/radeon_drv.h
sys/external/bsd/drm/dist/shared-core/radeon_irq.c
sys/external/bsd/drm/dist/shared-core/radeon_state.c
sys/external/bsd/drm/dist/shared-core/savage_bci.c
sys/external/bsd/drm/dist/shared-core/savage_state.c
sys/external/bsd/drm/dist/shared-core/sis_ds.c