Please pull the 'drm-fixes' branch from
This contains a bug fix for hangs in the r300 3D system due to a really
badly defined hardware wait interface, I've had to do some workarounds as
its a userspace exposed interface and I want to fix it for old and new
users. I've also included an oops fixer, a sparse cleanup, and patch to
support non-coherent DMA for powerpc that I was going to hold but since
I'm pushing stuff it may as well go now..
drivers/char/drm/ati_pcigart.c | 6 ++++
drivers/char/drm/drm_scatter.c | 11 +++++++-
drivers/char/drm/drm_vm.c | 20 +++++++++++---
drivers/char/drm/i915_dma.c | 3 ++
drivers/char/drm/r300_cmdbuf.c | 54 +++++++++++++++++++++++++++++++---------
drivers/char/drm/radeon_drm.h | 12 +++++++++
drivers/char/drm/radeon_mem.c | 8 +++---
7 files changed, 92 insertions(+), 22 deletions(-)
Author: Benjamin Herrenschmidt <email@example.com>
Date: Fri Mar 28 14:23:07 2008 -0700
drm: fix for non-coherent DMA PowerPC
This patch fixes bits of the DRM so to make the radeon DRI work on
non-cache coherent PCI DMA variants of the PowerPC processors.
It moves the few places that needs change to wrappers to that
other architectures with similar issues can easily add their
own changes to those wrappers, at least until we have more useful
generic kernel API.
Signed-off-by: Benjamin Herrenschmidt <firstname.lastname@example.org>
Cc: "David S. Miller" <email@example.com>
Cc: "Luck, Tony" <firstname.lastname@example.org>
Signed-off-by: Andrew Morton <email@example.com>
Signed-off-by: Dave Airlie <firstname.lastname@example.org>
Author: Harvey Harrison <email@example.com>
Date: Fri Mar 28 14:23:06 2008 -0700
drm: radeon: fix sparse integer as NULL pointer ...