[git pull] drm fixes

Dave Airlie
2011-05-09T04:41:18Z

Hi Linus,

One regression fix in the debugfs output, a couple of radeon fixes, and a
nouveau unload fix. I've got a dirty fix for the DMA_ERROR_CODE dependency
breaking drm on alpha but waiting for a bit more before you get it, its
just a workaround until proper fix can happen in 2.6.40 hopefully

Dave.

The following changes since commit 8aeb96f80232e9a701b5c4715504f4c9173978bd:

drm/radeon/kms: fix gart setup on fusion parts (v2) (2011-05-04 10:16:40 +1000)

are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-fixes

Alex Deucher (2):
drm/radeon/kms: ATPX switcheroo fixes
drm/radeon/kms: add pci id to acer travelmate quirk for 5730

Daniel Vetter (1):
drm: mm: fix debug output

Dave Airlie (1):
Merge remote branch 'nouveau/drm-nouveau-fixes' of /ssd/git/drm-nouveau-next into drm-fixes

Ilija Hadzic (1):
drm/radeon: fix order of doing things in radeon_crtc_cursor_set

Jimmy Rentz (1):
drm/nouveau: Fix a crash at card takedown for NV40 and older cards

drivers/gpu/drm/drm_mm.c | 6 ++--
drivers/gpu/drm/nouveau/nouveau_mem.c | 2 -
drivers/gpu/drm/nouveau/nouveau_state.c | 5 ++++
drivers/gpu/drm/radeon/radeon_atombios.c | 4 +-
drivers/gpu/drm/radeon/radeon_atpx_handler.c | 29 ++++++++++++++++++++++++-
drivers/gpu/drm/radeon/radeon_cursor.c | 6 ++--
include/drm/drm_mm.h | 2 +-
7 files changed, 41 insertions(+), 13 deletions(-)