]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge remote branch 'korg/drm-radeon-testing' into drm-linus
authorDave Airlie <airlied@redhat.com>
Fri, 15 Jan 2010 05:40:39 +0000 (15:40 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 15 Jan 2010 05:40:39 +0000 (15:40 +1000)
* 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.


Trivial merge