---
- branch: netbsd-5
  date: Sat Jun 20 23:42:54 UTC 2009
  files:
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/Makefile
    pathrev: src/sys/external/bsd/drm/Makefile@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/Makefile.am
    pathrev: src/sys/external/bsd/drm/Makefile.am@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/intel_bufmgr.c
    pathrev: src/sys/external/bsd/drm/intel_bufmgr.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/intel_bufmgr.h
    pathrev: src/sys/external/bsd/drm/intel_bufmgr.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/intel_bufmgr_fake.c
    pathrev: src/sys/external/bsd/drm/intel_bufmgr_fake.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/intel_bufmgr_gem.c
    pathrev: src/sys/external/bsd/drm/intel_bufmgr_gem.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/intel_bufmgr_priv.h
    pathrev: src/sys/external/bsd/drm/intel_bufmgr_priv.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/intel_chipset.h
    pathrev: src/sys/external/bsd/drm/intel_chipset.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/libdrm_nouveau.pc.in
    pathrev: src/sys/external/bsd/drm/libdrm_nouveau.pc.in@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/mm.c
    pathrev: src/sys/external/bsd/drm/mm.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/mm.h
    pathrev: src/sys/external/bsd/drm/mm.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/modeprint.c
    pathrev: src/sys/external/bsd/drm/modeprint.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/modetest.c
    pathrev: src/sys/external/bsd/drm/modetest.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_bo.c
    pathrev: src/sys/external/bsd/drm/nouveau_bo.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_bo.h
    pathrev: src/sys/external/bsd/drm/nouveau_bo.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_channel.c
    pathrev: src/sys/external/bsd/drm/nouveau_channel.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_channel.h
    pathrev: src/sys/external/bsd/drm/nouveau_channel.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_class.h
    pathrev: src/sys/external/bsd/drm/nouveau_class.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_device.c
    pathrev: src/sys/external/bsd/drm/nouveau_device.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_device.h
    pathrev: src/sys/external/bsd/drm/nouveau_device.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_dma.c
    pathrev: src/sys/external/bsd/drm/nouveau_dma.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_dma.h
    pathrev: src/sys/external/bsd/drm/nouveau_dma.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_drmif.h
    pathrev: src/sys/external/bsd/drm/nouveau_drmif.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_fence.c
    pathrev: src/sys/external/bsd/drm/nouveau_fence.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_grobj.c
    pathrev: src/sys/external/bsd/drm/nouveau_grobj.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_grobj.h
    pathrev: src/sys/external/bsd/drm/nouveau_grobj.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_notifier.c
    pathrev: src/sys/external/bsd/drm/nouveau_notifier.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_notifier.h
    pathrev: src/sys/external/bsd/drm/nouveau_notifier.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_private.h
    pathrev: src/sys/external/bsd/drm/nouveau_private.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_pushbuf.c
    pathrev: src/sys/external/bsd/drm/nouveau_pushbuf.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_pushbuf.h
    pathrev: src/sys/external/bsd/drm/nouveau_pushbuf.h@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_resource.c
    pathrev: src/sys/external/bsd/drm/nouveau_resource.c@1.1.2.1
    type: added
  - new: 1.1.2.1
    old: '0'
    path: src/sys/external/bsd/drm/nouveau_resource.h
    pathrev: src/sys/external/bsd/drm/nouveau_resource.h@1.1.2.1
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/libdrm_intel.pc.in
    pathrev: src/sys/external/bsd/drm/dist/libdrm_intel.pc.in@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/bsd-core/nouveau_drv.c
    pathrev: src/sys/external/bsd/drm/dist/bsd-core/nouveau_drv.c@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/bsd-core/nouveau_sgdma.c
    pathrev: src/sys/external/bsd/drm/dist/bsd-core/nouveau_sgdma.c@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/libdrm/libdrm_lists.h
    pathrev: src/sys/external/bsd/drm/dist/libdrm/libdrm_lists.h@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.c
    pathrev: src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.c@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.h
    pathrev: src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.h@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/scripts/create_lk_gpu.sh
    pathrev: src/sys/external/bsd/drm/dist/scripts/create_lk_gpu.sh@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/shared-core/drm_mode.h
    pathrev: src/sys/external/bsd/drm/dist/shared-core/drm_mode.h@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/shared-core/i915_reg.h
    pathrev: src/sys/external/bsd/drm/dist/shared-core/i915_reg.h@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/shared-core/nv50_grctx.h
    pathrev: src/sys/external/bsd/drm/dist/shared-core/nv50_grctx.h@1.1.1.1.2.2
    type: added
  - new: 1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/shared-core/r600_cp.c
    pathrev: src/sys/external/bsd/drm/dist/shared-core/r600_cp.c@1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/tests/gem_basic.c
    pathrev: src/sys/external/bsd/drm/dist/tests/gem_basic.c@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/tests/gem_flink.c
    pathrev: src/sys/external/bsd/drm/dist/tests/gem_flink.c@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/tests/gem_mmap.c
    pathrev: src/sys/external/bsd/drm/dist/tests/gem_mmap.c@1.1.1.1.2.2
    type: added
  - new: 1.1.1.1.2.2
    old: '0'
    path: src/sys/external/bsd/drm/dist/tests/gem_readwrite.c
    pathrev: src/sys/external/bsd/drm/dist/tests/gem_readwrite.c@1.1.1.1.2.2
    type: added
  id: 20090620T234254Z.13b35329f057b979632f5139c358962a291d6189
  log: |
    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)
  module: src
  subject: 'CVS commit: [netbsd-5] src/sys/external/bsd/drm'
  unixtime: '1245541374'
  user: snj