1. 01 Mar, 2010 2 commits
    • Dave Airlie's avatar
      Merge remote branch 'nouveau/for-airlied' into drm-next-stage · aa71fa3c
      Dave Airlie authored
      * nouveau/for-airlied: (25 commits)
        drm/nouveau: use ALIGN instead of open coding it
        drm/nouveau: report unknown connector state if lid closed
        drm/nouveau: support version 0x20 displayport tables
        drm/nouveau: Fix noaccel/nofbaccel option descriptions.
        drm/nv50: Implement ctxprog/state generation.
        drm/nouveau: use dcb connector types throughout the driver
        drm/nv50: enable hpd on any connector we know the gpio line for
        drm/nouveau: use dcb connector table for creating drm connectors
        drm/nouveau: construct a connector table for cards that lack a real one
        drm/nouveau: check for known dcb connector types
        drm/nouveau: parse dcb gpio/connector tables after encoders
        drm/nouveau: reorganise bios header, add dcb connector type enums
        drm/nouveau: merge nvbios and nouveau_bios_info
        drm/nouveau: merge parsed_dcb and bios_parsed_dcb into dcb_table
        drm/nouveau: rename parsed_dcb_gpio to dcb_gpio_table
        drm/nouveau: allow retrieval of vbios image from debugfs
        drm/nouveau: fix missing spin_unlock in failure path
        drm/nouveau: fix i2ctable bounds checking
        drm/nouveau: fix nouveau_i2c_find bounds checking
        drm/nouveau: fix pramdac_table range checking
        ...
      
      Conflicts:
      	drivers/gpu/drm/nouveau/nouveau_gem.c
      aa71fa3c
    • Dave Airlie's avatar
      Merge remote branch 'korg/drm-core-next' into drm-next-stage · 79fa9eb7
      Dave Airlie authored
      * korg/drm-core-next:
        drm/ttm: handle OOM in ttm_tt_swapout
        drm/radeon/kms/atom: fix shr/shl ops
        drm/kms: fix spelling of "CLOCK"
        drm/kms: fix fb_changed = true else statement
        drivers/gpu/drm/drm_fb_helper.c: don't use private implementation of atoi()
        drm: switch all GEM/KMS ioctls to unlocked ioctl status.
        Use drm_gem_object_[handle_]unreference_unlocked where possible
        drm: introduce drm_gem_object_[handle_]unreference_unlocked
      79fa9eb7
  2. 25 Feb, 2010 27 commits
  3. 24 Feb, 2010 11 commits