1. 15 Jan, 2010 3 commits
    • Dave Airlie's avatar
      Merge remote branch 'korg/drm-radeon-testing' into drm-linus · 8471a26b
      Dave Airlie authored
      * korg/drm-radeon-testing:
        drm/radeon/kms: Use radeon_agp_disable when disabling AGP
        drm/radeon/kms: Disable AGP is aperture size < 32M
        drm/radeon/kms: Fix r600 blit cleanup path
        drm/radeon/kms: Do not unpin buffer in fb destruction
        drm/radeon/kms: fix displayport->dvi connector DDC.
      8471a26b
    • Jerome Glisse's avatar
      drm: EDID accept separate sync video mode · 79b7dcb2
      Jerome Glisse authored
      X is accepting such video mode, do the same. Pointed out by Joshua Roys
      on IRC. Fix https://bugzilla.redhat.com/show_bug.cgi?id=540024
      
      [fix printf to use composite not integrated :- airlied]
      Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      79b7dcb2
    • Dave Airlie's avatar
      Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-linus · 1c974dc2
      Dave Airlie authored
      * 'nouveau/for-airlied' of ../drm-nouveau-next: (44 commits)
        drm/nouveau: check pushbuffer bounds in ioctl
        drm/nouveau: reserve VGA area for the moment
        drm/nouveau: Unset the EDID connector property when the EDID block goes away.
        drm/nouveau: Fallback to analog load detection when the EDID block is invalid.
        drm/nouveau: fix edid memleak in nouveau_connector
        drm/nouveau: Break some long lines.
        drm/nouveau: add NV18 device id to call_lvds_manufacturer_script
        drm/nv50: Fix typo in PGRAPH initialisation.
        drm/nouveau: less magic DCB 1.5 parsing
        drm/nouveau: assume no nv04 board has a DCB table
        drm/nouveau: remove PRIV0 check in nouveau_mem_close()
        drm/nouveau: wait on fence after bo move if validating for another channel
        drm/nouveau: trust init table registers are safe
        drm/nv50: wait for pgraph to idle before unloading the context
      1c974dc2
  2. 14 Jan, 2010 28 commits
  3. 13 Jan, 2010 8 commits
  4. 11 Jan, 2010 1 commit
    • Dave Airlie's avatar
      Merge branch 'for-airlied' of /ssd/git/drm-nouveau-next into drm-linus · f22d6dda
      Dave Airlie authored
      * 'for-airlied' of /ssd/git/drm-nouveau-next: (28 commits)
        drm/nv04: Fix set_operation software method.
        drm/nouveau: initialise DMA tracking parameters earlier
        drm/nouveau: use dma.max rather than pushbuf size for checking GET validity
        drm/nv04: differentiate between nv04/nv05
        drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence
        drm/nv50: prevent a possible ctxprog hang
        drm/nouveau: have ttm's fault handler called directly
        drm/nv50: restore correct cache1 get/put address on fifoctx load
        drm/nouveau: create function for "dealing" with gpu lockup
        drm/nouveau: remove unused nouveau_channel_idle() function
        drm/nouveau: fix handling of fbcon colours in 8bpp
        drm/nv04: Context switching fixes.
        drm/nouveau: Use the software object for fencing.
        drm/nouveau: Allocate a per-channel instance of NV_SW.
        drm/nv50: make the blocksize depend on vram size
        drm/nouveau: better alignment of bo sizes and use roundup instead of ALIGN
        drm/nouveau: Don't skip card take down on nv0x.
        drm/nouveau: Implement nv42-nv43 TV load detection.
        drm/nouveau: Clean up the nv17-nv4x load detection code a bit.
        drm/nv50: fix fillrect color
        ...
      f22d6dda