1. 15 1月, 2010 9 次提交
  2. 14 1月, 2010 16 次提交
  3. 13 1月, 2010 8 次提交
  4. 11 1月, 2010 7 次提交
    • D
      Merge branch 'for-airlied' of /ssd/git/drm-nouveau-next into drm-linus · f22d6dda
      Dave Airlie 提交于
      * '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
    • D
      Merge remote branch 'korg/drm-radeon-next' into drm-linus · 0c9d2c41
      Dave Airlie 提交于
      * korg/drm-radeon-next:
        drm/radeon/kms: add additional safe regs for r4xx/rs6xx and r5xx
        drm/radeon/kms: Don't try to enable IRQ if we have no handler installed
        drm: Avoid calling vblank function is vblank wasn't initialized
        drm/radeon: mkregtable.c: close a file before exit
        drm/radeon/kms: Make sure we release AGP device if we acquired it
        drm/radeon/kms: Schedule host path read cache flush through the ring V2
        drm/radeon/kms: Workaround RV410/R420 CP errata (V3)
        drm/radeon/kms: detect sideport memory on IGP chips
        drm/radeon: fix a couple of array index errors
        drm/radeon/kms: add support for eDP (embedded DisplayPort)
        drm: Add eDP connector type
        drm/radeon/kms: pull in the latest upstream ObjectID.h changes
        drm/radeon/kms: whitespace changes to ObjectID.h
        drm/radeon/kms: fix typo in atom connector type handling
      0c9d2c41
    • M
      drm/nv04: Fix set_operation software method. · 40c2298b
      Marcin Kościelnicki 提交于
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      40c2298b
    • B
      c63834e1
    • B
      drm/nouveau: use dma.max rather than pushbuf size for checking GET validity · 400f14ac
      Ben Skeggs 提交于
      Some upcoming G80 DMA changes will depend on this, but it's split out for
      bisectibility just in case it causes some unexpected issues.
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      400f14ac
    • B
      drm/nv04: differentiate between nv04/nv05 · cc6e4965
      Ben Skeggs 提交于
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      cc6e4965
    • L
      drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence · d6126c5c
      Luca Barbieri 提交于
      Currently Nouveau will unvalidate all buffers if it is forced to wait on
      one, and then start revalidating from the beginning.  While doing so, it
      destroys the operation fence, causing nouveau_fence_emit to crash.
      
      This patch fixes this bug by taking the fence object out of validate_op
      and creating it just before emit.  The fence pointer is initialized to 0
      and unref'ed unconditionally.
      
      In addition to fixing the bug, this prevents its reintroduction and
      simplifies the code.
      Signed-off-by: NLuca Barbieri <luca@luca-barbieri.com>
      Signed-off-by: NBen Skeggs <bskeggs@redhat.com>
      d6126c5c