• Linus Torvalds's avatar
    Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 44040f10
    Linus Torvalds authored
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (133 commits)
      drm/vgaarb: add VGA arbitration support to the drm and kms.
      drm/radeon: some r420s have a CP race with the DMA engine.
      drm/radeon/r600/kms: rv670 is not DCE3
      drm/radeon/kms: r420 idle after programming GA_ENHANCE
      drm/radeon/kms: more fixes to rv770 suspend/resume path.
      drm/radeon/kms: more alignment for rv770.c with r600.c
      drm/radeon/kms: rv770 blit init called too late.
      drm/radeon/kms: move around new init path code to avoid posting at init
      drm/radeon/r600: fix some issues with suspend/resume.
      drm/radeon/kms: disable VGA rendering engine before taking over VRAM
      drm/radeon/kms: Move radeon_get_clock_info() call out of radeon_clocks_init().
      drm/radeon/kms: add initial connector properties
      drm/radeon/kms: Use surfaces for scanout / cursor byte swapping on big endian.
      drm/radeon/kms: don't fail if we fail to init GPU acceleration
      drm/r600/kms: fixup number of loops per blit calculation.
      drm/radeon/kms: reprogram format in set base.
      drm/radeon: avivo chips have no separate int bit for display
      drm/radeon/r600: don't do interrupts
      drm: fix _DRM_GEM addmap error message
      drm: update crtc x/y when only fb changes
    Fixed up trivial conflicts in firmware/Makefile due to network driver
    (cxgb3) and drm (mga/r128/radeon) firmware being listed next to each
Makefile 11.4 KB