1. 15 Jan, 2010 1 commit
    • 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 23 commits
  3. 13 Jan, 2010 8 commits
  4. 11 Jan, 2010 8 commits
    • 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
    • Dave Airlie's avatar
      Merge remote branch 'korg/drm-radeon-next' into drm-linus · 0c9d2c41
      Dave Airlie authored
      * 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
    • Marcin Kościelnicki's avatar
      40c2298b
    • Ben Skeggs's avatar
      c63834e1
    • Ben Skeggs's avatar
      drm/nouveau: use dma.max rather than pushbuf size for checking GET validity · 400f14ac
      Ben Skeggs authored
      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: default avatarBen Skeggs <bskeggs@redhat.com>
      400f14ac
    • Ben Skeggs's avatar
      drm/nv04: differentiate between nv04/nv05 · cc6e4965
      Ben Skeggs authored
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      cc6e4965
    • Luca Barbieri's avatar
      drm/nouveau: Fix null deref in nouveau_fence_emit due to deleted fence · d6126c5c
      Luca Barbieri authored
      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: default avatarLuca Barbieri <luca@luca-barbieri.com>
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      d6126c5c
    • Ben Skeggs's avatar
      drm/nv50: prevent a possible ctxprog hang · dc8d76ca
      Ben Skeggs authored
      The below is mainly an educated guess at what's going on, docs would
      sure be handy...  NVIDIA? :P
      
      It appears it's possible for a ctxprog to run even while a GPU exception
      is pending.  The GF8 and up ctxprogs appear to have a small snippet of
      code which detects this, and stalls the ctxprog until it's been handled,
      which essentially looks like:
      
      	if (r2 & 0x00008000) {
      		r0 |= 0x80000000;
      		while (r0 & 0x80000000) {}
      	}
      
      I don't know of any way that flag would get cleared unless the driver
      intervenes (and indeed, in the cases I've seen the hang, nothing steps
      in to automagically clear it for us).  This patch causes the driver to
      clear the flag during the PGRAPH IRQ handler.
      Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
      dc8d76ca